diff --git a/src/de/schildbach/pte/AvvProvider.java b/src/de/schildbach/pte/AvvProvider.java index 25e7d2c2..6069ff47 100644 --- a/src/de/schildbach/pte/AvvProvider.java +++ b/src/de/schildbach/pte/AvvProvider.java @@ -17,12 +17,6 @@ package de.schildbach.pte; -import java.io.IOException; -import java.util.List; - -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - /** * @author Andreas Schildbach */ @@ -50,10 +44,4 @@ public class AvvProvider extends AbstractEfaProvider return false; } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } } diff --git a/src/de/schildbach/pte/BayernProvider.java b/src/de/schildbach/pte/BayernProvider.java index 7afabf6a..a67144c7 100644 --- a/src/de/schildbach/pte/BayernProvider.java +++ b/src/de/schildbach/pte/BayernProvider.java @@ -17,12 +17,6 @@ package de.schildbach.pte; -import java.io.IOException; -import java.util.List; - -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - /** * @author Andreas Schildbach */ @@ -49,10 +43,4 @@ public class BayernProvider extends AbstractEfaProvider return false; } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } } diff --git a/src/de/schildbach/pte/DingProvider.java b/src/de/schildbach/pte/DingProvider.java index cd8c87d3..44645c39 100644 --- a/src/de/schildbach/pte/DingProvider.java +++ b/src/de/schildbach/pte/DingProvider.java @@ -17,12 +17,6 @@ package de.schildbach.pte; -import java.io.IOException; -import java.util.List; - -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - /** * @author Andreas Schildbach */ @@ -50,10 +44,4 @@ public class DingProvider extends AbstractEfaProvider return false; } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } } diff --git a/src/de/schildbach/pte/GvhProvider.java b/src/de/schildbach/pte/GvhProvider.java index 33a8c4c1..b37c77ba 100644 --- a/src/de/schildbach/pte/GvhProvider.java +++ b/src/de/schildbach/pte/GvhProvider.java @@ -17,13 +17,9 @@ package de.schildbach.pte; -import java.io.IOException; import java.util.HashMap; -import java.util.List; import java.util.Map; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.Style; /** @@ -54,12 +50,6 @@ public class GvhProvider extends AbstractEfaProvider return false; } - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } - private static final Map LINES = new HashMap(); static diff --git a/src/de/schildbach/pte/IvbProvider.java b/src/de/schildbach/pte/IvbProvider.java index 94abc837..7159dc06 100644 --- a/src/de/schildbach/pte/IvbProvider.java +++ b/src/de/schildbach/pte/IvbProvider.java @@ -17,12 +17,6 @@ package de.schildbach.pte; -import java.io.IOException; -import java.util.List; - -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - /** * @author Andreas Schildbach */ @@ -50,10 +44,4 @@ public class IvbProvider extends AbstractEfaProvider return false; } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } } diff --git a/src/de/schildbach/pte/NphProvider.java b/src/de/schildbach/pte/NphProvider.java index 7fec5d14..52173d69 100644 --- a/src/de/schildbach/pte/NphProvider.java +++ b/src/de/schildbach/pte/NphProvider.java @@ -17,12 +17,6 @@ package de.schildbach.pte; -import java.io.IOException; -import java.util.List; - -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - /** * @author Andreas Schildbach */ @@ -49,10 +43,4 @@ public class NphProvider extends AbstractEfaProvider return false; } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } } diff --git a/src/de/schildbach/pte/TflProvider.java b/src/de/schildbach/pte/TflProvider.java index c15d8e39..4798831e 100644 --- a/src/de/schildbach/pte/TflProvider.java +++ b/src/de/schildbach/pte/TflProvider.java @@ -17,14 +17,10 @@ package de.schildbach.pte; -import java.io.IOException; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.TimeZone; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.Style; /** @@ -61,12 +57,6 @@ public class TflProvider extends AbstractEfaProvider return false; } - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } - private static final Map LINES = new HashMap(); static diff --git a/src/de/schildbach/pte/VblProvider.java b/src/de/schildbach/pte/VblProvider.java index 5b273bc9..44541c71 100644 --- a/src/de/schildbach/pte/VblProvider.java +++ b/src/de/schildbach/pte/VblProvider.java @@ -17,12 +17,6 @@ package de.schildbach.pte; -import java.io.IOException; -import java.util.List; - -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - /** * @author Andreas Schildbach */ @@ -49,10 +43,4 @@ public class VblProvider extends AbstractEfaProvider return false; } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } } diff --git a/src/de/schildbach/pte/VmobilProvider.java b/src/de/schildbach/pte/VmobilProvider.java index dd0d8e77..3d62fe88 100644 --- a/src/de/schildbach/pte/VmobilProvider.java +++ b/src/de/schildbach/pte/VmobilProvider.java @@ -17,12 +17,6 @@ package de.schildbach.pte; -import java.io.IOException; -import java.util.List; - -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - /** * Verkehrsverbund Vorarlberg * @@ -51,10 +45,4 @@ public class VmobilProvider extends AbstractEfaProvider return false; } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } } diff --git a/src/de/schildbach/pte/VorProvider.java b/src/de/schildbach/pte/VorProvider.java index 590e1afd..65b3bfd8 100644 --- a/src/de/schildbach/pte/VorProvider.java +++ b/src/de/schildbach/pte/VorProvider.java @@ -17,12 +17,6 @@ package de.schildbach.pte; -import java.io.IOException; -import java.util.List; - -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - /** * @author Andreas Schildbach */ @@ -50,10 +44,4 @@ public class VorProvider extends AbstractEfaProvider return false; } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } } diff --git a/src/de/schildbach/pte/VrnProvider.java b/src/de/schildbach/pte/VrnProvider.java index 67e5c746..6119fff0 100644 --- a/src/de/schildbach/pte/VrnProvider.java +++ b/src/de/schildbach/pte/VrnProvider.java @@ -17,12 +17,6 @@ package de.schildbach.pte; -import java.io.IOException; -import java.util.List; - -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - /** * @author Andreas Schildbach */ @@ -50,10 +44,4 @@ public class VrnProvider extends AbstractEfaProvider return false; } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } } diff --git a/src/de/schildbach/pte/VvtProvider.java b/src/de/schildbach/pte/VvtProvider.java index f7d39eb7..682b67eb 100644 --- a/src/de/schildbach/pte/VvtProvider.java +++ b/src/de/schildbach/pte/VvtProvider.java @@ -17,12 +17,6 @@ package de.schildbach.pte; -import java.io.IOException; -import java.util.List; - -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - /** * @author Andreas Schildbach */ @@ -49,10 +43,4 @@ public class VvtProvider extends AbstractEfaProvider return false; } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } } diff --git a/test/de/schildbach/pte/live/DingProviderLiveTest.java b/test/de/schildbach/pte/live/DingProviderLiveTest.java index 36d1d8b3..cfe0f4e3 100644 --- a/test/de/schildbach/pte/live/DingProviderLiveTest.java +++ b/test/de/schildbach/pte/live/DingProviderLiveTest.java @@ -70,6 +70,14 @@ public class DingProviderLiveTest extends AbstractProviderLiveTest print(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + print(autocompletes); + } + @Test public void shortConnection() throws Exception { diff --git a/test/de/schildbach/pte/live/IvbProviderLiveTest.java b/test/de/schildbach/pte/live/IvbProviderLiveTest.java index f7501a00..9b8bcb26 100644 --- a/test/de/schildbach/pte/live/IvbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/IvbProviderLiveTest.java @@ -70,6 +70,14 @@ public class IvbProviderLiveTest extends AbstractProviderLiveTest print(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + print(autocompletes); + } + @Test public void shortConnection() throws Exception { diff --git a/test/de/schildbach/pte/live/NphProviderLiveTest.java b/test/de/schildbach/pte/live/NphProviderLiveTest.java index 1c90a395..1f678cd4 100644 --- a/test/de/schildbach/pte/live/NphProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NphProviderLiveTest.java @@ -70,6 +70,14 @@ public class NphProviderLiveTest extends AbstractProviderLiveTest print(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + print(autocompletes); + } + @Test public void shortConnection() throws Exception { diff --git a/test/de/schildbach/pte/live/VblProviderLiveTest.java b/test/de/schildbach/pte/live/VblProviderLiveTest.java index 53d11923..29f1a12e 100644 --- a/test/de/schildbach/pte/live/VblProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VblProviderLiveTest.java @@ -70,6 +70,14 @@ public class VblProviderLiveTest extends AbstractProviderLiveTest print(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + print(autocompletes); + } + @Test public void shortConnection() throws Exception { diff --git a/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/test/de/schildbach/pte/live/VrnProviderLiveTest.java index c7c126fb..8b766d4c 100644 --- a/test/de/schildbach/pte/live/VrnProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrnProviderLiveTest.java @@ -63,17 +63,17 @@ public class VrnProviderLiveTest extends AbstractProviderLiveTest } @Test - public void autocompleteWithUmlaut() throws Exception + public void autocompleteIncomplete() throws Exception { - final List autocompletes = provider.autocompleteStations("grün"); + final List autocompletes = provider.autocompleteStations("Kur"); print(autocompletes); } @Test - public void autocompleteIncomplete() throws Exception + public void autocompleteWithUmlaut() throws Exception { - final List autocompletes = provider.autocompleteStations("Kur"); + final List autocompletes = provider.autocompleteStations("grün"); print(autocompletes); } diff --git a/test/de/schildbach/pte/live/VvtProviderLiveTest.java b/test/de/schildbach/pte/live/VvtProviderLiveTest.java index c829ba6e..78f0c38d 100644 --- a/test/de/schildbach/pte/live/VvtProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvtProviderLiveTest.java @@ -70,6 +70,14 @@ public class VvtProviderLiveTest extends AbstractProviderLiveTest print(autocompletes); } + @Test + public void autocompleteWithUmlaut() throws Exception + { + final List autocompletes = provider.autocompleteStations("grün"); + + print(autocompletes); + } + @Test public void shortConnection() throws Exception {