diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index 3f6f0619..05a6459d 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -318,6 +318,14 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider return new Position(platformText); } + public List autocompleteStations(final CharSequence constraint) throws IOException + { + final StringBuilder uri = new StringBuilder(getStopEndpoint); + uri.append(jsonGetStopsParameters(constraint)); + + return jsonGetStops(uri.toString()); + } + protected StringBuilder jsonGetStopsParameters(final CharSequence constraint) { final StringBuilder parameters = new StringBuilder(); diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java index 51f469de..ef4d0735 100644 --- a/enabler/src/de/schildbach/pte/BahnProvider.java +++ b/enabler/src/de/schildbach/pte/BahnProvider.java @@ -19,7 +19,6 @@ package de.schildbach.pte; import java.io.IOException; import java.util.Collection; -import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -160,14 +159,6 @@ public final class BahnProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java index 3baf89b5..3195de93 100644 --- a/enabler/src/de/schildbach/pte/BvgProvider.java +++ b/enabler/src/de/schildbach/pte/BvgProvider.java @@ -508,14 +508,6 @@ public final class BvgProvider extends AbstractHafasProvider ParserUtils.parseEuropeanTime(calendar, m.group(2)); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override protected boolean isValidStationId(final String id) { diff --git a/enabler/src/de/schildbach/pte/DsbProvider.java b/enabler/src/de/schildbach/pte/DsbProvider.java index 44726214..741edca8 100644 --- a/enabler/src/de/schildbach/pte/DsbProvider.java +++ b/enabler/src/de/schildbach/pte/DsbProvider.java @@ -174,6 +174,7 @@ public class DsbProvider extends AbstractHafasProvider private static final String AUTOCOMPLETE_URI = "http://xmlopen.rejseplanen.dk/bin/rest.exe/location.name?input=%s"; + @Override public List autocompleteStations(final CharSequence constraint) throws IOException { final String uri = String.format(Locale.ENGLISH, AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ISO_8859_1)); diff --git a/enabler/src/de/schildbach/pte/EireannProvider.java b/enabler/src/de/schildbach/pte/EireannProvider.java index f8f1186e..a21d7cc3 100644 --- a/enabler/src/de/schildbach/pte/EireannProvider.java +++ b/enabler/src/de/schildbach/pte/EireannProvider.java @@ -20,7 +20,6 @@ package de.schildbach.pte; import java.io.IOException; import java.util.Collection; import java.util.Date; -import java.util.List; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -130,14 +129,6 @@ public class EireannProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri) { diff --git a/enabler/src/de/schildbach/pte/InvgProvider.java b/enabler/src/de/schildbach/pte/InvgProvider.java index 2c3f1295..750b2474 100644 --- a/enabler/src/de/schildbach/pte/InvgProvider.java +++ b/enabler/src/de/schildbach/pte/InvgProvider.java @@ -279,6 +279,7 @@ public class InvgProvider extends AbstractHafasProvider } } + @Override public List autocompleteStations(final CharSequence constraint) throws IOException { return xmlMLcReq(constraint); diff --git a/enabler/src/de/schildbach/pte/JetProvider.java b/enabler/src/de/schildbach/pte/JetProvider.java index 4258d9cd..6abd647a 100644 --- a/enabler/src/de/schildbach/pte/JetProvider.java +++ b/enabler/src/de/schildbach/pte/JetProvider.java @@ -18,7 +18,6 @@ package de.schildbach.pte; import java.io.IOException; -import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -139,14 +138,6 @@ public class JetProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - private static final Pattern P_NORMALIZE_BUS = Pattern.compile("([א]?\\d{1,3})#"); @Override diff --git a/enabler/src/de/schildbach/pte/LuProvider.java b/enabler/src/de/schildbach/pte/LuProvider.java index 17f62017..cc0d2995 100644 --- a/enabler/src/de/schildbach/pte/LuProvider.java +++ b/enabler/src/de/schildbach/pte/LuProvider.java @@ -169,6 +169,7 @@ public class LuProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } + @Override public List autocompleteStations(final CharSequence constraint) throws IOException { return xmlMLcReq(constraint); diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/enabler/src/de/schildbach/pte/NasaProvider.java index 336aaf24..4d6efea0 100644 --- a/enabler/src/de/schildbach/pte/NasaProvider.java +++ b/enabler/src/de/schildbach/pte/NasaProvider.java @@ -168,6 +168,7 @@ public class NasaProvider extends AbstractHafasProvider reader.replace("\"Florian Geyer\"", "Florian Geyer"); } + @Override public List autocompleteStations(final CharSequence constraint) throws IOException { return xmlMLcReq(constraint); diff --git a/enabler/src/de/schildbach/pte/NriProvider.java b/enabler/src/de/schildbach/pte/NriProvider.java index ec64c2aa..b5ae0f96 100644 --- a/enabler/src/de/schildbach/pte/NriProvider.java +++ b/enabler/src/de/schildbach/pte/NriProvider.java @@ -20,7 +20,6 @@ package de.schildbach.pte; import java.io.IOException; import java.util.Collection; import java.util.Date; -import java.util.List; import java.util.Set; import de.schildbach.pte.dto.Location; @@ -165,14 +164,6 @@ public class NriProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/NsProvider.java b/enabler/src/de/schildbach/pte/NsProvider.java index e2187a3b..3fcc29fb 100644 --- a/enabler/src/de/schildbach/pte/NsProvider.java +++ b/enabler/src/de/schildbach/pte/NsProvider.java @@ -19,7 +19,6 @@ package de.schildbach.pte; import java.io.IOException; import java.util.Collection; -import java.util.List; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -137,14 +136,6 @@ public class NsProvider extends AbstractHafasProvider throw new UnsupportedOperationException(); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/NvvProvider.java b/enabler/src/de/schildbach/pte/NvvProvider.java index b8b1d14a..9e10bae7 100644 --- a/enabler/src/de/schildbach/pte/NvvProvider.java +++ b/enabler/src/de/schildbach/pte/NvvProvider.java @@ -18,7 +18,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; @@ -192,14 +191,6 @@ public class NvvProvider extends AbstractHafasProvider reader.replace("Park&Ride", "Park&Ride"); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override protected char normalizeType(final String type) { diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/enabler/src/de/schildbach/pte/OebbProvider.java index ce2af3f9..cc113bdf 100644 --- a/enabler/src/de/schildbach/pte/OebbProvider.java +++ b/enabler/src/de/schildbach/pte/OebbProvider.java @@ -19,7 +19,6 @@ package de.schildbach.pte; import java.io.IOException; import java.util.Collection; -import java.util.List; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -172,14 +171,6 @@ public class OebbProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/PlProvider.java b/enabler/src/de/schildbach/pte/PlProvider.java index 67c79500..3d5fd0d9 100644 --- a/enabler/src/de/schildbach/pte/PlProvider.java +++ b/enabler/src/de/schildbach/pte/PlProvider.java @@ -173,6 +173,7 @@ public class PlProvider extends AbstractHafasProvider reader.replace("platform=\"K ", " "); // Poland } + @Override public List autocompleteStations(final CharSequence constraint) throws IOException { return xmlMLcReq(constraint); diff --git a/enabler/src/de/schildbach/pte/RtProvider.java b/enabler/src/de/schildbach/pte/RtProvider.java index de738677..d3a08c50 100644 --- a/enabler/src/de/schildbach/pte/RtProvider.java +++ b/enabler/src/de/schildbach/pte/RtProvider.java @@ -19,7 +19,6 @@ package de.schildbach.pte; import java.io.IOException; import java.util.Collection; -import java.util.List; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -130,14 +129,6 @@ public class RtProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/SbbProvider.java b/enabler/src/de/schildbach/pte/SbbProvider.java index 91e60b89..11bd3bf0 100644 --- a/enabler/src/de/schildbach/pte/SbbProvider.java +++ b/enabler/src/de/schildbach/pte/SbbProvider.java @@ -19,7 +19,6 @@ package de.schildbach.pte; import java.io.IOException; import java.util.Collection; -import java.util.List; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -151,15 +150,6 @@ public class SbbProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/SeProvider.java b/enabler/src/de/schildbach/pte/SeProvider.java index feaa5b08..9c3f2baf 100644 --- a/enabler/src/de/schildbach/pte/SeProvider.java +++ b/enabler/src/de/schildbach/pte/SeProvider.java @@ -19,7 +19,6 @@ package de.schildbach.pte; import java.io.IOException; import java.util.Collection; -import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -180,14 +179,6 @@ public class SeProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/SeptaProvider.java b/enabler/src/de/schildbach/pte/SeptaProvider.java index ba84aa02..153ad883 100644 --- a/enabler/src/de/schildbach/pte/SeptaProvider.java +++ b/enabler/src/de/schildbach/pte/SeptaProvider.java @@ -294,14 +294,6 @@ public class SeptaProvider extends AbstractHafasProvider } } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri) { diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/enabler/src/de/schildbach/pte/ShProvider.java index 55d3f6a3..a1b06b1d 100644 --- a/enabler/src/de/schildbach/pte/ShProvider.java +++ b/enabler/src/de/schildbach/pte/ShProvider.java @@ -278,6 +278,7 @@ public class ShProvider extends AbstractHafasProvider } } + @Override public List autocompleteStations(final CharSequence constraint) throws IOException { return xmlMLcReq(constraint); diff --git a/enabler/src/de/schildbach/pte/SncbProvider.java b/enabler/src/de/schildbach/pte/SncbProvider.java index 88877bbd..03bf258a 100644 --- a/enabler/src/de/schildbach/pte/SncbProvider.java +++ b/enabler/src/de/schildbach/pte/SncbProvider.java @@ -19,7 +19,6 @@ package de.schildbach.pte; import java.io.IOException; import java.util.Collection; -import java.util.List; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; @@ -156,14 +155,6 @@ public class SncbProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/StockholmProvider.java b/enabler/src/de/schildbach/pte/StockholmProvider.java index 7c101a4b..c3a9e336 100644 --- a/enabler/src/de/schildbach/pte/StockholmProvider.java +++ b/enabler/src/de/schildbach/pte/StockholmProvider.java @@ -19,7 +19,6 @@ package de.schildbach.pte; import java.io.IOException; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -168,14 +167,6 @@ public class StockholmProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override protected void appendCustomTripsQueryBinaryUri(final StringBuilder uri) { diff --git a/enabler/src/de/schildbach/pte/VbbProvider.java b/enabler/src/de/schildbach/pte/VbbProvider.java index 9da8488a..3c1cb4ff 100644 --- a/enabler/src/de/schildbach/pte/VbbProvider.java +++ b/enabler/src/de/schildbach/pte/VbbProvider.java @@ -20,7 +20,6 @@ package de.schildbach.pte; import java.io.IOException; import java.util.Collection; import java.util.HashSet; -import java.util.List; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -178,14 +177,6 @@ public class VbbProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java index bbcc08de..b45d17a0 100644 --- a/enabler/src/de/schildbach/pte/VbnProvider.java +++ b/enabler/src/de/schildbach/pte/VbnProvider.java @@ -18,7 +18,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; @@ -144,14 +143,6 @@ public class VbnProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } - @Override protected char normalizeType(final String type) { diff --git a/enabler/src/de/schildbach/pte/VgsProvider.java b/enabler/src/de/schildbach/pte/VgsProvider.java index 20dcef70..fcf1711f 100644 --- a/enabler/src/de/schildbach/pte/VgsProvider.java +++ b/enabler/src/de/schildbach/pte/VgsProvider.java @@ -18,7 +18,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; @@ -146,12 +145,4 @@ public class VgsProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } - - public List autocompleteStations(final CharSequence constraint) throws IOException - { - final StringBuilder uri = new StringBuilder(getStopEndpoint); - uri.append(jsonGetStopsParameters(constraint)); - - return jsonGetStops(uri.toString()); - } } diff --git a/enabler/src/de/schildbach/pte/ZvvProvider.java b/enabler/src/de/schildbach/pte/ZvvProvider.java index 07124523..14ec9960 100644 --- a/enabler/src/de/schildbach/pte/ZvvProvider.java +++ b/enabler/src/de/schildbach/pte/ZvvProvider.java @@ -192,6 +192,7 @@ public class ZvvProvider extends AbstractHafasProvider return xmlQueryDepartures(uri.toString(), stationId); } + @Override public List autocompleteStations(final CharSequence constraint) throws IOException { return xmlMLcReq(constraint);