From fc91b8c7cb395e53d64e025b6d8eb33ba701916d Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 6 Aug 2014 22:48:36 +0200 Subject: [PATCH] Use common method for querying departures (Hafas). --- enabler/src/de/schildbach/pte/AbstractHafasProvider.java | 8 ++++++++ enabler/src/de/schildbach/pte/BahnProvider.java | 9 --------- enabler/src/de/schildbach/pte/BvgProvider.java | 1 + enabler/src/de/schildbach/pte/DsbProvider.java | 9 --------- enabler/src/de/schildbach/pte/EireannProvider.java | 9 --------- enabler/src/de/schildbach/pte/InvgProvider.java | 1 + enabler/src/de/schildbach/pte/JetProvider.java | 9 --------- enabler/src/de/schildbach/pte/LuProvider.java | 9 --------- enabler/src/de/schildbach/pte/NasaProvider.java | 9 --------- enabler/src/de/schildbach/pte/NriProvider.java | 9 --------- enabler/src/de/schildbach/pte/NsProvider.java | 1 + enabler/src/de/schildbach/pte/NvvProvider.java | 9 --------- enabler/src/de/schildbach/pte/OebbProvider.java | 9 --------- enabler/src/de/schildbach/pte/PlProvider.java | 9 --------- enabler/src/de/schildbach/pte/RtProvider.java | 9 --------- enabler/src/de/schildbach/pte/SbbProvider.java | 9 --------- enabler/src/de/schildbach/pte/SeProvider.java | 9 --------- enabler/src/de/schildbach/pte/SeptaProvider.java | 1 + enabler/src/de/schildbach/pte/ShProvider.java | 1 + enabler/src/de/schildbach/pte/SncbProvider.java | 9 --------- enabler/src/de/schildbach/pte/StockholmProvider.java | 9 --------- enabler/src/de/schildbach/pte/VbbProvider.java | 9 --------- enabler/src/de/schildbach/pte/VbnProvider.java | 9 --------- enabler/src/de/schildbach/pte/VgsProvider.java | 9 --------- enabler/src/de/schildbach/pte/VsnProvider.java | 9 --------- enabler/src/de/schildbach/pte/ZvvProvider.java | 9 --------- 26 files changed, 13 insertions(+), 180 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index a4a87719..c60c0ea1 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -415,6 +415,14 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider } } + public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + { + final StringBuilder uri = new StringBuilder(stationBoardEndpoint); + uri.append(xmlQueryDeparturesParameters(stationId)); + + return xmlQueryDepartures(uri.toString(), stationId); + } + protected StringBuilder xmlQueryDeparturesParameters(final String stationId) { final StringBuilder parameters = new StringBuilder(); diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java index 52d5b13a..65b97767 100644 --- a/enabler/src/de/schildbach/pte/BahnProvider.java +++ b/enabler/src/de/schildbach/pte/BahnProvider.java @@ -26,7 +26,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; /** * @author Andreas Schildbach @@ -151,14 +150,6 @@ public final class BahnProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java index 27fb780f..12075977 100644 --- a/enabler/src/de/schildbach/pte/BvgProvider.java +++ b/enabler/src/de/schildbach/pte/BvgProvider.java @@ -314,6 +314,7 @@ public final class BvgProvider extends AbstractHafasProvider private static final Pattern P_DEPARTURES_LIVE_ERRORS = Pattern.compile("(Haltestelle:)|(Wartungsgründen|nur eingeschränkt)", Pattern.CASE_INSENSITIVE); + @Override public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException { final ResultHeader header = new ResultHeader(SERVER_PRODUCT); diff --git a/enabler/src/de/schildbach/pte/DsbProvider.java b/enabler/src/de/schildbach/pte/DsbProvider.java index 48c75292..d5b31475 100644 --- a/enabler/src/de/schildbach/pte/DsbProvider.java +++ b/enabler/src/de/schildbach/pte/DsbProvider.java @@ -24,7 +24,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; /** * @author Andreas Schildbach @@ -154,14 +153,6 @@ public class DsbProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/EireannProvider.java b/enabler/src/de/schildbach/pte/EireannProvider.java index 53411328..da99bb9e 100644 --- a/enabler/src/de/schildbach/pte/EireannProvider.java +++ b/enabler/src/de/schildbach/pte/EireannProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.dto.QueryTripsContext; import de.schildbach.pte.dto.QueryTripsResult; @@ -121,14 +120,6 @@ public class EireannProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @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 c3f042ed..d0b6ed9a 100644 --- a/enabler/src/de/schildbach/pte/InvgProvider.java +++ b/enabler/src/de/schildbach/pte/InvgProvider.java @@ -162,6 +162,7 @@ public class InvgProvider extends AbstractHafasProvider + "(?:\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position , Pattern.DOTALL); + @Override public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException { final ResultHeader header = new ResultHeader(SERVER_PRODUCT); diff --git a/enabler/src/de/schildbach/pte/JetProvider.java b/enabler/src/de/schildbach/pte/JetProvider.java index b5e4783e..2abe236c 100644 --- a/enabler/src/de/schildbach/pte/JetProvider.java +++ b/enabler/src/de/schildbach/pte/JetProvider.java @@ -26,7 +26,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; /** * Jesuralem? JET = Jerusalem Eternal Tours? @@ -130,14 +129,6 @@ public class JetProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - 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 395035bf..07ea61e8 100644 --- a/enabler/src/de/schildbach/pte/LuProvider.java +++ b/enabler/src/de/schildbach/pte/LuProvider.java @@ -23,7 +23,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; /** * @author Andreas Schildbach @@ -160,14 +159,6 @@ public class LuProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override protected char normalizeType(final String type) { diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/enabler/src/de/schildbach/pte/NasaProvider.java index 8e08ac46..18d5051f 100644 --- a/enabler/src/de/schildbach/pte/NasaProvider.java +++ b/enabler/src/de/schildbach/pte/NasaProvider.java @@ -23,7 +23,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.util.StringReplaceReader; /** @@ -151,14 +150,6 @@ public class NasaProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override protected void addCustomReplaces(final StringReplaceReader reader) { diff --git a/enabler/src/de/schildbach/pte/NriProvider.java b/enabler/src/de/schildbach/pte/NriProvider.java index f0df7fe0..2260803d 100644 --- a/enabler/src/de/schildbach/pte/NriProvider.java +++ b/enabler/src/de/schildbach/pte/NriProvider.java @@ -26,7 +26,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.dto.QueryTripsContext; import de.schildbach.pte.dto.QueryTripsResult; @@ -156,14 +155,6 @@ public class NriProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/NsProvider.java b/enabler/src/de/schildbach/pte/NsProvider.java index 2ef690ef..3d678d90 100644 --- a/enabler/src/de/schildbach/pte/NsProvider.java +++ b/enabler/src/de/schildbach/pte/NsProvider.java @@ -131,6 +131,7 @@ public class NsProvider extends AbstractHafasProvider } } + @Override public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException { throw new UnsupportedOperationException(); diff --git a/enabler/src/de/schildbach/pte/NvvProvider.java b/enabler/src/de/schildbach/pte/NvvProvider.java index b168904b..158123a9 100644 --- a/enabler/src/de/schildbach/pte/NvvProvider.java +++ b/enabler/src/de/schildbach/pte/NvvProvider.java @@ -23,7 +23,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.util.StringReplaceReader; /** @@ -173,14 +172,6 @@ public class NvvProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override protected void addCustomReplaces(final StringReplaceReader reader) { diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/enabler/src/de/schildbach/pte/OebbProvider.java index 143f15a0..d8c838b0 100644 --- a/enabler/src/de/schildbach/pte/OebbProvider.java +++ b/enabler/src/de/schildbach/pte/OebbProvider.java @@ -24,7 +24,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; /** * @author Andreas Schildbach @@ -163,14 +162,6 @@ public class OebbProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/PlProvider.java b/enabler/src/de/schildbach/pte/PlProvider.java index b222e070..ba0bdfbb 100644 --- a/enabler/src/de/schildbach/pte/PlProvider.java +++ b/enabler/src/de/schildbach/pte/PlProvider.java @@ -24,7 +24,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.util.StringReplaceReader; /** @@ -153,14 +152,6 @@ public class PlProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override protected void addCustomReplaces(final StringReplaceReader reader) { diff --git a/enabler/src/de/schildbach/pte/RtProvider.java b/enabler/src/de/schildbach/pte/RtProvider.java index 98db41ab..ffbdc6e3 100644 --- a/enabler/src/de/schildbach/pte/RtProvider.java +++ b/enabler/src/de/schildbach/pte/RtProvider.java @@ -24,7 +24,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; /** * @author Andreas Schildbach @@ -121,14 +120,6 @@ public class RtProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/SbbProvider.java b/enabler/src/de/schildbach/pte/SbbProvider.java index 0c46fd75..50bccf8c 100644 --- a/enabler/src/de/schildbach/pte/SbbProvider.java +++ b/enabler/src/de/schildbach/pte/SbbProvider.java @@ -24,7 +24,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; /** * @author Andreas Schildbach @@ -142,14 +141,6 @@ public class SbbProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/SeProvider.java b/enabler/src/de/schildbach/pte/SeProvider.java index e67e1d8d..e77768cc 100644 --- a/enabler/src/de/schildbach/pte/SeProvider.java +++ b/enabler/src/de/schildbach/pte/SeProvider.java @@ -27,7 +27,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; /** * @author Andreas Schildbach @@ -171,14 +170,6 @@ public class SeProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/SeptaProvider.java b/enabler/src/de/schildbach/pte/SeptaProvider.java index 0376fbdc..7bb2d625 100644 --- a/enabler/src/de/schildbach/pte/SeptaProvider.java +++ b/enabler/src/de/schildbach/pte/SeptaProvider.java @@ -183,6 +183,7 @@ public class SeptaProvider extends AbstractHafasProvider + "(?:\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position , Pattern.DOTALL); + @Override public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException { final ResultHeader header = new ResultHeader(SERVER_PRODUCT); diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/enabler/src/de/schildbach/pte/ShProvider.java index b18a523b..712990f8 100644 --- a/enabler/src/de/schildbach/pte/ShProvider.java +++ b/enabler/src/de/schildbach/pte/ShProvider.java @@ -207,6 +207,7 @@ public class ShProvider extends AbstractHafasProvider + "(?:\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position , Pattern.DOTALL); + @Override public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException { final ResultHeader header = new ResultHeader(SERVER_PRODUCT); diff --git a/enabler/src/de/schildbach/pte/SncbProvider.java b/enabler/src/de/schildbach/pte/SncbProvider.java index dce010a7..ab61afd1 100644 --- a/enabler/src/de/schildbach/pte/SncbProvider.java +++ b/enabler/src/de/schildbach/pte/SncbProvider.java @@ -24,7 +24,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; /** * @author Andreas Schildbach @@ -147,14 +146,6 @@ public class SncbProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/StockholmProvider.java b/enabler/src/de/schildbach/pte/StockholmProvider.java index 3e896beb..a7c2a2c0 100644 --- a/enabler/src/de/schildbach/pte/StockholmProvider.java +++ b/enabler/src/de/schildbach/pte/StockholmProvider.java @@ -28,7 +28,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.dto.Style; import de.schildbach.pte.dto.Style.Shape; @@ -159,14 +158,6 @@ public class StockholmProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @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 d11eccc2..eda6ef98 100644 --- a/enabler/src/de/schildbach/pte/VbbProvider.java +++ b/enabler/src/de/schildbach/pte/VbbProvider.java @@ -29,7 +29,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; /** * @author Andreas Schildbach @@ -169,14 +168,6 @@ public class VbbProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override public Collection defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java index b3e8d349..90629ab0 100644 --- a/enabler/src/de/schildbach/pte/VbnProvider.java +++ b/enabler/src/de/schildbach/pte/VbnProvider.java @@ -23,7 +23,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; /** * @author Andreas Schildbach @@ -135,14 +134,6 @@ public class VbnProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @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 06a5023e..f9b9b3e8 100644 --- a/enabler/src/de/schildbach/pte/VgsProvider.java +++ b/enabler/src/de/schildbach/pte/VgsProvider.java @@ -23,7 +23,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; /** * @author Andreas Schildbach @@ -137,12 +136,4 @@ public class VgsProvider extends AbstractHafasProvider throw new IllegalArgumentException("cannot handle: " + location); } } - - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } } diff --git a/enabler/src/de/schildbach/pte/VsnProvider.java b/enabler/src/de/schildbach/pte/VsnProvider.java index b9a8623c..56f7bf13 100644 --- a/enabler/src/de/schildbach/pte/VsnProvider.java +++ b/enabler/src/de/schildbach/pte/VsnProvider.java @@ -23,7 +23,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; /** * @author Andreas Schildbach @@ -156,14 +155,6 @@ public class VsnProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override protected char normalizeType(final String type) { diff --git a/enabler/src/de/schildbach/pte/ZvvProvider.java b/enabler/src/de/schildbach/pte/ZvvProvider.java index 90bba4fa..403c8569 100644 --- a/enabler/src/de/schildbach/pte/ZvvProvider.java +++ b/enabler/src/de/schildbach/pte/ZvvProvider.java @@ -27,7 +27,6 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; import de.schildbach.pte.dto.Style; import de.schildbach.pte.dto.Style.Shape; @@ -183,14 +182,6 @@ public class ZvvProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException - { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append(xmlQueryDeparturesParameters(stationId)); - - return xmlQueryDepartures(uri.toString(), stationId); - } - @Override protected Line parseLineAndType(final String lineAndType) {