diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index 2f506979..0791ae4c 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -349,7 +349,10 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider } } - public abstract List autocompleteStations(final CharSequence constraint) throws IOException; + public List autocompleteStations(final CharSequence constraint) throws IOException + { + return jsonStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); + } private String processItdOdvPlace(final XmlPullParser pp) throws XmlPullParserException, IOException { diff --git a/src/de/schildbach/pte/KvvProvider.java b/src/de/schildbach/pte/KvvProvider.java index 79671f4a..1d97aa3a 100644 --- a/src/de/schildbach/pte/KvvProvider.java +++ b/src/de/schildbach/pte/KvvProvider.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; import de.schildbach.pte.dto.Style.Shape; @@ -60,12 +56,6 @@ public class KvvProvider extends AbstractEfaProvider return false; } - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return jsonStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } - @Override protected String parseLine(final String mot, final String name, final String longName, final String noTrainName) { diff --git a/src/de/schildbach/pte/LinzProvider.java b/src/de/schildbach/pte/LinzProvider.java index 5cc217fb..3382a352 100644 --- a/src/de/schildbach/pte/LinzProvider.java +++ b/src/de/schildbach/pte/LinzProvider.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 LinzProvider extends AbstractEfaProvider return false; } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return jsonStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } } diff --git a/src/de/schildbach/pte/MetProvider.java b/src/de/schildbach/pte/MetProvider.java index 9034c3d8..c8f38779 100644 --- a/src/de/schildbach/pte/MetProvider.java +++ b/src/de/schildbach/pte/MetProvider.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; /** @@ -60,12 +56,6 @@ public class MetProvider extends AbstractEfaProvider return false; } - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return jsonStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } - private static final Map LINES = new HashMap(); static diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java index c7069690..5ee3d335 100644 --- a/src/de/schildbach/pte/MvvProvider.java +++ b/src/de/schildbach/pte/MvvProvider.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.Point; import de.schildbach.pte.dto.Style; @@ -55,12 +51,6 @@ public class MvvProvider extends AbstractEfaProvider return false; } - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return jsonStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } - private static final Map LINES = new HashMap(); static diff --git a/src/de/schildbach/pte/SfProvider.java b/src/de/schildbach/pte/SfProvider.java index dc866c82..7b81a658 100644 --- a/src/de/schildbach/pte/SfProvider.java +++ b/src/de/schildbach/pte/SfProvider.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; /** @@ -60,12 +56,6 @@ public class SfProvider extends AbstractEfaProvider return false; } - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return jsonStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } - @Override protected String normalizeLocationName(final String name) { diff --git a/src/de/schildbach/pte/SydneyProvider.java b/src/de/schildbach/pte/SydneyProvider.java index e0003cdc..3579f1d3 100644 --- a/src/de/schildbach/pte/SydneyProvider.java +++ b/src/de/schildbach/pte/SydneyProvider.java @@ -17,13 +17,8 @@ package de.schildbach.pte; -import java.io.IOException; -import java.util.List; import java.util.TimeZone; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - /** * @author Andreas Schildbach */ @@ -56,10 +51,4 @@ public class SydneyProvider extends AbstractEfaProvider return false; } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return jsonStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } } diff --git a/src/de/schildbach/pte/VgnProvider.java b/src/de/schildbach/pte/VgnProvider.java index d958b87d..6a1e20a1 100644 --- a/src/de/schildbach/pte/VgnProvider.java +++ b/src/de/schildbach/pte/VgnProvider.java @@ -17,12 +17,9 @@ package de.schildbach.pte; -import java.io.IOException; import java.util.Date; -import java.util.List; import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; /** * @author Andreas Schildbach @@ -30,14 +27,12 @@ import de.schildbach.pte.dto.LocationType; public class VgnProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.VGN; - private String apiBase; private static final String DEPARTURE_MONITOR_ENDPOINT = "XML_DM_REQUEST"; private static final String TRIP_ENDPOINT = "XML_TRIP_REQUEST2"; public VgnProvider(final String apiBase) { super(apiBase, DEPARTURE_MONITOR_ENDPOINT, TRIP_ENDPOINT, null, false, false); - this.apiBase = apiBase; } public NetworkId id() @@ -54,12 +49,6 @@ public class VgnProvider extends AbstractEfaProvider return false; } - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return jsonStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } - @Override protected String xsltTripRequest2Uri(final Location from, final Location via, final Location to, final Date date, final boolean dep, final String products, final WalkSpeed walkSpeed, final Accessibility accessibility) diff --git a/src/de/schildbach/pte/VvsProvider.java b/src/de/schildbach/pte/VvsProvider.java index 5493b267..62752b22 100644 --- a/src/de/schildbach/pte/VvsProvider.java +++ b/src/de/schildbach/pte/VvsProvider.java @@ -17,11 +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; import de.schildbach.pte.dto.Point; /** @@ -57,12 +52,6 @@ public class VvsProvider extends AbstractEfaProvider return false; } - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return jsonStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } - @Override public Point[] getArea() {