From 7422504893ad5018cfb2d95ae42b3c1567f50103 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Sat, 7 May 2011 23:57:21 +0000 Subject: [PATCH] stationId is int in queryDepartures() as well git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@624 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/AbstractEfaProvider.java | 4 ++-- src/de/schildbach/pte/BahnProvider.java | 4 ++-- src/de/schildbach/pte/BvgProvider.java | 16 ++++++++-------- src/de/schildbach/pte/DsbProvider.java | 4 ++-- src/de/schildbach/pte/InvgProvider.java | 8 ++++---- src/de/schildbach/pte/LuProvider.java | 4 ++-- src/de/schildbach/pte/NasaProvider.java | 11 +++++------ src/de/schildbach/pte/NetworkProvider.java | 2 +- src/de/schildbach/pte/NsProvider.java | 7 +++---- src/de/schildbach/pte/OebbProvider.java | 4 ++-- src/de/schildbach/pte/PlProvider.java | 4 ++-- src/de/schildbach/pte/RmvProvider.java | 4 ++-- src/de/schildbach/pte/SbbProvider.java | 8 ++++---- src/de/schildbach/pte/SeptaProvider.java | 11 +++++------ src/de/schildbach/pte/ShProvider.java | 11 +++++------ src/de/schildbach/pte/SncbProvider.java | 7 +++---- src/de/schildbach/pte/VgsProvider.java | 11 +++++------ src/de/schildbach/pte/ZvvProvider.java | 4 ++-- .../schildbach/pte/live/AtcProviderLiveTest.java | 2 +- .../schildbach/pte/live/AvvProviderLiveTest.java | 2 +- .../pte/live/BahnProviderLiveTest.java | 2 +- .../schildbach/pte/live/BvbProviderLiveTest.java | 2 +- .../schildbach/pte/live/BvgProviderLiveTest.java | 2 +- .../pte/live/DingProviderLiveTest.java | 2 +- .../schildbach/pte/live/DsbProviderLiveTest.java | 2 +- .../pte/live/InvgProviderLiveTest.java | 2 +- .../schildbach/pte/live/IvbProviderLiveTest.java | 2 +- .../schildbach/pte/live/KvvProviderLiveTest.java | 2 +- .../pte/live/LinzProviderLiveTest.java | 2 +- .../schildbach/pte/live/LuProviderLiveTest.java | 2 +- .../pte/live/MariborProviderLiveTest.java | 2 +- .../schildbach/pte/live/MetProviderLiveTest.java | 2 +- .../schildbach/pte/live/MvgProviderLiveTest.java | 2 +- .../schildbach/pte/live/MvvProviderLiveTest.java | 2 +- .../pte/live/NaldoProviderLiveTest.java | 2 +- .../pte/live/NasaProviderLiveTest.java | 2 +- .../schildbach/pte/live/NsProviderLiveTest.java | 2 +- .../pte/live/NvbwProviderLiveTest.java | 2 +- .../pte/live/OebbProviderLiveTest.java | 2 +- .../schildbach/pte/live/PlProviderLiveTest.java | 2 +- .../schildbach/pte/live/RmvProviderLiveTest.java | 2 +- .../schildbach/pte/live/SbbProviderLiveTest.java | 2 +- .../pte/live/SeptaProviderLiveTest.java | 2 +- .../schildbach/pte/live/SfProviderLiveTest.java | 2 +- .../schildbach/pte/live/ShProviderLiveTest.java | 2 +- .../pte/live/SncbProviderLiveTest.java | 2 +- .../schildbach/pte/live/StvProviderLiveTest.java | 2 +- .../schildbach/pte/live/SvvProviderLiveTest.java | 2 +- .../pte/live/SydneyProviderLiveTest.java | 2 +- .../schildbach/pte/live/TflProviderLiveTest.java | 2 +- .../pte/live/TleaProviderLiveTest.java | 2 +- .../pte/live/TlemProviderLiveTest.java | 2 +- .../pte/live/TlseProviderLiveTest.java | 2 +- .../pte/live/TlswProviderLiveTest.java | 2 +- .../pte/live/VagfrProviderLiveTest.java | 2 +- .../schildbach/pte/live/VblProviderLiveTest.java | 2 +- .../schildbach/pte/live/VgsProviderLiveTest.java | 2 +- .../schildbach/pte/live/VmsProviderLiveTest.java | 2 +- .../schildbach/pte/live/VmvProviderLiveTest.java | 2 +- .../schildbach/pte/live/VorProviderLiveTest.java | 2 +- .../schildbach/pte/live/VrnProviderLiveTest.java | 2 +- .../schildbach/pte/live/VrrProviderLiveTest.java | 2 +- .../schildbach/pte/live/VrtProviderLiveTest.java | 2 +- .../schildbach/pte/live/VvmProviderLiveTest.java | 2 +- .../schildbach/pte/live/VvoProviderLiveTest.java | 2 +- .../schildbach/pte/live/VvsProviderLiveTest.java | 2 +- .../schildbach/pte/live/VvvProviderLiveTest.java | 2 +- .../schildbach/pte/live/ZvvProviderLiveTest.java | 2 +- 68 files changed, 109 insertions(+), 115 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index 5e4af869..4c91bfee 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1026,13 +1026,13 @@ public abstract class AbstractEfaProvider implements NetworkProvider + "'"); } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final StringBuilder uri = new StringBuilder(apiBase); uri.append("XSLT_DM_REQUEST"); appendCommonRequestParams(uri); uri.append("&type_dm=stop&useRealtime=1&mode=direct"); - uri.append("&name_dm=").append(ParserUtils.urlEncode(stationId)); + uri.append("&name_dm=").append(stationId); uri.append("&deleteAssignedStops_dm=").append(equivs ? '0' : '1'); if (maxDepartures > 0) uri.append("&limit=").append(maxDepartures); diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index 939f2432..a10e4517 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -490,7 +490,7 @@ public final class BahnProvider extends AbstractHafasProvider } } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("bhftafel.exe/dn"); @@ -501,7 +501,7 @@ public final class BahnProvider extends AbstractHafasProvider uri.append("&L=vs_java3"); uri.append("&input=").append(stationId); - return xmlQueryDepartures(uri.toString(), Integer.parseInt(stationId)); + return xmlQueryDepartures(uri.toString(), stationId); } @Override diff --git a/src/de/schildbach/pte/BvgProvider.java b/src/de/schildbach/pte/BvgProvider.java index 0cf1337f..b58404f6 100644 --- a/src/de/schildbach/pte/BvgProvider.java +++ b/src/de/schildbach/pte/BvgProvider.java @@ -629,7 +629,7 @@ public final class BvgProvider extends AbstractHafasProvider private static final String DEPARTURE_URL_LIVE = BASE_URL + "/IstAbfahrtzeiten/index/mobil?"; - private String departuresQueryLiveUri(final String stationId) + private String departuresQueryLiveUri(final int stationId) { final StringBuilder uri = new StringBuilder(); uri.append(DEPARTURE_URL_LIVE); @@ -641,7 +641,7 @@ public final class BvgProvider extends AbstractHafasProvider private static final String DEPARTURE_URL_PLAN = API_BASE + "stboard.bin/dox/dox?boardType=dep&disableEquivs=yes&start=yes&"; - private String departuresQueryPlanUri(final String stationId, final int maxDepartures) + private String departuresQueryPlanUri(final int stationId, final int maxDepartures) { final StringBuilder uri = new StringBuilder(); uri.append(DEPARTURE_URL_PLAN); @@ -691,11 +691,11 @@ public final class BvgProvider extends AbstractHafasProvider private static final Pattern P_DEPARTURES_LIVE_ERRORS = Pattern.compile("(Haltestelle:)|(Wartungsgründen)|(http-equiv=\"refresh\")", Pattern.CASE_INSENSITIVE); - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final QueryDeparturesResult result = new QueryDeparturesResult(); - if (stationId.length() == 6) // live + if (stationId < 1000000) // live { // scrape page final String uri = departuresQueryLiveUri(stationId); @@ -782,8 +782,8 @@ public final class BvgProvider extends AbstractHafasProvider } } - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), placeAndName[0], - placeAndName[1]), departures, null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, placeAndName[0], placeAndName[1]), + departures, null)); return result; } else @@ -852,8 +852,8 @@ public final class BvgProvider extends AbstractHafasProvider } } - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), placeAndName[0], - placeAndName[1]), departures, null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, placeAndName[0], placeAndName[1]), + departures, null)); return result; } else diff --git a/src/de/schildbach/pte/DsbProvider.java b/src/de/schildbach/pte/DsbProvider.java index 9b7b1560..109a672b 100644 --- a/src/de/schildbach/pte/DsbProvider.java +++ b/src/de/schildbach/pte/DsbProvider.java @@ -167,7 +167,7 @@ public class DsbProvider extends AbstractHafasProvider return 0; } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/mn"); @@ -178,6 +178,6 @@ public class DsbProvider extends AbstractHafasProvider uri.append("&L=vs_java3"); uri.append("&input=").append(stationId); - return xmlQueryDepartures(uri.toString(), Integer.parseInt(stationId)); + return xmlQueryDepartures(uri.toString(), stationId); } } diff --git a/src/de/schildbach/pte/InvgProvider.java b/src/de/schildbach/pte/InvgProvider.java index 3f3857de..38dd9e3c 100644 --- a/src/de/schildbach/pte/InvgProvider.java +++ b/src/de/schildbach/pte/InvgProvider.java @@ -147,7 +147,7 @@ public class InvgProvider extends AbstractHafasProvider return 0; } - private String departuresQueryUri(final String stationId, final int maxDepartures) + private String departuresQueryUri(final int stationId, final int maxDepartures) { final StringBuilder uri = new StringBuilder(); @@ -193,7 +193,7 @@ public class InvgProvider extends AbstractHafasProvider + "(?:\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position , Pattern.DOTALL); - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final QueryDeparturesResult result = new QueryDeparturesResult(); @@ -208,8 +208,8 @@ public class InvgProvider extends AbstractHafasProvider // messages if (mHeadCoarse.group(4) != null) { - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId)), Collections - . emptyList(), null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId), + Collections. emptyList(), null)); return result; } else if (mHeadCoarse.group(5) != null) diff --git a/src/de/schildbach/pte/LuProvider.java b/src/de/schildbach/pte/LuProvider.java index 1347141d..9fe7e130 100644 --- a/src/de/schildbach/pte/LuProvider.java +++ b/src/de/schildbach/pte/LuProvider.java @@ -114,7 +114,7 @@ public class LuProvider extends AbstractHafasProvider return 0; } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/dn"); @@ -125,6 +125,6 @@ public class LuProvider extends AbstractHafasProvider uri.append("&L=vs_java3"); uri.append("&input=").append(stationId); - return xmlQueryDepartures(uri.toString(), Integer.parseInt(stationId)); + return xmlQueryDepartures(uri.toString(), stationId); } } diff --git a/src/de/schildbach/pte/NasaProvider.java b/src/de/schildbach/pte/NasaProvider.java index 2f327a27..f3c4ab71 100644 --- a/src/de/schildbach/pte/NasaProvider.java +++ b/src/de/schildbach/pte/NasaProvider.java @@ -88,7 +88,7 @@ public class NasaProvider extends AbstractHafasProvider } } - private String departuresQueryUri(final String stationId, final int maxDepartures) + private String departuresQueryUri(final int stationId, final int maxDepartures) { final StringBuilder uri = new StringBuilder(); @@ -132,7 +132,7 @@ public class NasaProvider extends AbstractHafasProvider + "(?:\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position , Pattern.DOTALL); - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final QueryDeparturesResult result = new QueryDeparturesResult(); @@ -147,8 +147,8 @@ public class NasaProvider extends AbstractHafasProvider // messages if (mHeadCoarse.group(3) != null) { - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId)), Collections - . emptyList(), null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId), + Collections. emptyList(), null)); return result; } else if (mHeadCoarse.group(4) != null) @@ -228,8 +228,7 @@ public class NasaProvider extends AbstractHafasProvider } } - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location), - departures, null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, null, location), departures, null)); return result; } else diff --git a/src/de/schildbach/pte/NetworkProvider.java b/src/de/schildbach/pte/NetworkProvider.java index 194ac807..a3e2ef67 100644 --- a/src/de/schildbach/pte/NetworkProvider.java +++ b/src/de/schildbach/pte/NetworkProvider.java @@ -129,7 +129,7 @@ public interface NetworkProvider * @return result object containing the departures * @throws IOException */ - QueryDeparturesResult queryDepartures(String stationId, int maxDepartures, boolean equivs) throws IOException; + QueryDeparturesResult queryDepartures(int stationId, int maxDepartures, boolean equivs) throws IOException; /** * Get colors of line diff --git a/src/de/schildbach/pte/NsProvider.java b/src/de/schildbach/pte/NsProvider.java index a06a9cc9..fb03ae57 100644 --- a/src/de/schildbach/pte/NsProvider.java +++ b/src/de/schildbach/pte/NsProvider.java @@ -87,7 +87,7 @@ public class NsProvider extends AbstractHafasProvider } } - private String departuresQueryUri(final String stationId, final int maxDepartures) + private String departuresQueryUri(final int stationId, final int maxDepartures) { final StringBuilder uri = new StringBuilder(); uri.append("http://hari.b-rail.be/hari3/webserver1/bin/stboard.exe/dox"); @@ -122,7 +122,7 @@ public class NsProvider extends AbstractHafasProvider + "(?:([+-]?\\d+|Ausfall)\r\n)?" // delay , Pattern.DOTALL); - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final QueryDeparturesResult result = new QueryDeparturesResult(); @@ -180,8 +180,7 @@ public class NsProvider extends AbstractHafasProvider } } - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location), - departures, null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, null, location), departures, null)); return result; } else diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java index 83a729cd..98df0c82 100644 --- a/src/de/schildbach/pte/OebbProvider.java +++ b/src/de/schildbach/pte/OebbProvider.java @@ -481,7 +481,7 @@ public class OebbProvider extends AbstractHafasProvider throw new UnsupportedOperationException(); } - private String departuresQueryUri(final String stationId, final int maxDepartures) + private String departuresQueryUri(final int stationId, final int maxDepartures) { final StringBuilder uri = new StringBuilder(); @@ -503,7 +503,7 @@ public class OebbProvider extends AbstractHafasProvider private static final Pattern P_DEPARTURES_ERROR = Pattern.compile("(Verbindung zum Server konnte leider nicht hergestellt werden)"); - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final QueryDeparturesResult result = new QueryDeparturesResult(); diff --git a/src/de/schildbach/pte/PlProvider.java b/src/de/schildbach/pte/PlProvider.java index 01cc64af..5709a7a5 100644 --- a/src/de/schildbach/pte/PlProvider.java +++ b/src/de/schildbach/pte/PlProvider.java @@ -311,7 +311,7 @@ public class PlProvider extends AbstractHafasProvider return 0; } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/pn"); @@ -322,6 +322,6 @@ public class PlProvider extends AbstractHafasProvider uri.append("&L=vs_java3"); uri.append("&input=").append(stationId); - return xmlQueryDepartures(uri.toString(), Integer.parseInt(stationId)); + return xmlQueryDepartures(uri.toString(), stationId); } } diff --git a/src/de/schildbach/pte/RmvProvider.java b/src/de/schildbach/pte/RmvProvider.java index c7ff72e0..5d362dfb 100644 --- a/src/de/schildbach/pte/RmvProvider.java +++ b/src/de/schildbach/pte/RmvProvider.java @@ -474,7 +474,7 @@ public class RmvProvider extends AbstractHafasProvider } } - private String departuresQueryUri(final String stationId, final int maxDepartures) + private String departuresQueryUri(final int stationId, final int maxDepartures) { final Calendar c = new GregorianCalendar(timeZone()); @@ -521,7 +521,7 @@ public class RmvProvider extends AbstractHafasProvider + "(?:\"\"\n[^<]*\n
\n)*" // (messages) , Pattern.DOTALL); - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final QueryDeparturesResult result = new QueryDeparturesResult(); diff --git a/src/de/schildbach/pte/SbbProvider.java b/src/de/schildbach/pte/SbbProvider.java index 2fe1df25..e5f78157 100644 --- a/src/de/schildbach/pte/SbbProvider.java +++ b/src/de/schildbach/pte/SbbProvider.java @@ -101,7 +101,7 @@ public class SbbProvider extends AbstractHafasProvider } } - private String departuresQueryUri(final String stationId, final int maxDepartures) + private String departuresQueryUri(final int stationId, final int maxDepartures) { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("bhftafel.exe/dox"); @@ -141,7 +141,7 @@ public class SbbProvider extends AbstractHafasProvider + ".*?" // , Pattern.DOTALL); - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final QueryDeparturesResult result = new QueryDeparturesResult(); @@ -156,8 +156,8 @@ public class SbbProvider extends AbstractHafasProvider // messages if (mHeadCoarse.group(3) != null) { - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId)), Collections - . emptyList(), null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId), + Collections. emptyList(), null)); return result; } else if (mHeadCoarse.group(5) != null) diff --git a/src/de/schildbach/pte/SeptaProvider.java b/src/de/schildbach/pte/SeptaProvider.java index 5d73be99..accc9563 100644 --- a/src/de/schildbach/pte/SeptaProvider.java +++ b/src/de/schildbach/pte/SeptaProvider.java @@ -145,7 +145,7 @@ public class SeptaProvider extends AbstractHafasProvider } } - private String departuresQueryUri(final String stationId, final int maxDepartures) + private String departuresQueryUri(final int stationId, final int maxDepartures) { final Calendar now = new GregorianCalendar(timeZone()); @@ -193,7 +193,7 @@ public class SeptaProvider extends AbstractHafasProvider + "(?:\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position , Pattern.DOTALL); - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final QueryDeparturesResult result = new QueryDeparturesResult(); @@ -208,8 +208,8 @@ public class SeptaProvider extends AbstractHafasProvider // messages if (mPageCoarse.group(5) != null) { - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId)), Collections - . emptyList(), null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId), + Collections. emptyList(), null)); return result; } else if (mPageCoarse.group(6) != null) @@ -287,8 +287,7 @@ public class SeptaProvider extends AbstractHafasProvider } } - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location), - departures, null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, null, location), departures, null)); return result; } else diff --git a/src/de/schildbach/pte/ShProvider.java b/src/de/schildbach/pte/ShProvider.java index 32b9b265..300fae4e 100644 --- a/src/de/schildbach/pte/ShProvider.java +++ b/src/de/schildbach/pte/ShProvider.java @@ -121,7 +121,7 @@ public class ShProvider extends AbstractHafasProvider return 0; } - private String departuresQueryUri(final String stationId, final int maxDepartures) + private String departuresQueryUri(final int stationId, final int maxDepartures) { final StringBuilder uri = new StringBuilder(); @@ -165,7 +165,7 @@ public class ShProvider extends AbstractHafasProvider + "(?:\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position , Pattern.DOTALL); - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final QueryDeparturesResult result = new QueryDeparturesResult(); @@ -180,8 +180,8 @@ public class ShProvider extends AbstractHafasProvider // messages if (mHeadCoarse.group(3) != null) { - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId)), Collections - . emptyList(), null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId), + Collections. emptyList(), null)); return result; } else if (mHeadCoarse.group(4) != null) @@ -261,8 +261,7 @@ public class ShProvider extends AbstractHafasProvider } } - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location), - departures, null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, null, location), departures, null)); return result; } else diff --git a/src/de/schildbach/pte/SncbProvider.java b/src/de/schildbach/pte/SncbProvider.java index aba9dd72..f066be50 100644 --- a/src/de/schildbach/pte/SncbProvider.java +++ b/src/de/schildbach/pte/SncbProvider.java @@ -94,7 +94,7 @@ public class SncbProvider extends AbstractHafasProvider } } - private String departuresQueryUri(final String stationId, final int maxDepartures) + private String departuresQueryUri(final int stationId, final int maxDepartures) { final StringBuilder uri = new StringBuilder(); uri.append("http://hari.b-rail.be/hari3/webserver1/bin/stboard.exe/dox"); @@ -129,7 +129,7 @@ public class SncbProvider extends AbstractHafasProvider + "(?:([+-]?\\d+|Ausfall)\r\n)?" // delay , Pattern.DOTALL); - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final QueryDeparturesResult result = new QueryDeparturesResult(); @@ -187,8 +187,7 @@ public class SncbProvider extends AbstractHafasProvider } } - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location), - departures, null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, null, location), departures, null)); return result; } else diff --git a/src/de/schildbach/pte/VgsProvider.java b/src/de/schildbach/pte/VgsProvider.java index e356508d..b3a8288e 100644 --- a/src/de/schildbach/pte/VgsProvider.java +++ b/src/de/schildbach/pte/VgsProvider.java @@ -108,7 +108,7 @@ public class VgsProvider extends AbstractHafasProvider } } - private String departuresQueryUri(final String stationId, final int maxDepartures) + private String departuresQueryUri(final int stationId, final int maxDepartures) { final StringBuilder uri = new StringBuilder(); @@ -152,7 +152,7 @@ public class VgsProvider extends AbstractHafasProvider + "(?:\n(" + ParserUtils.P_PLATFORM + ").*?)?" // position , Pattern.DOTALL); - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final QueryDeparturesResult result = new QueryDeparturesResult(); @@ -167,8 +167,8 @@ public class VgsProvider extends AbstractHafasProvider // messages if (mHeadCoarse.group(3) != null) { - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId)), Collections - . emptyList(), null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId), + Collections. emptyList(), null)); return result; } else if (mHeadCoarse.group(4) != null) @@ -248,8 +248,7 @@ public class VgsProvider extends AbstractHafasProvider } } - result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, Integer.parseInt(stationId), null, location), - departures, null)); + result.stationDepartures.add(new StationDepartures(new Location(LocationType.STATION, stationId, null, location), departures, null)); return result; } else diff --git a/src/de/schildbach/pte/ZvvProvider.java b/src/de/schildbach/pte/ZvvProvider.java index f2ac9fdb..29b39eb8 100644 --- a/src/de/schildbach/pte/ZvvProvider.java +++ b/src/de/schildbach/pte/ZvvProvider.java @@ -189,7 +189,7 @@ public class ZvvProvider extends AbstractHafasProvider return 0; } - public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures, final boolean equivs) throws IOException + public QueryDeparturesResult queryDepartures(final int stationId, final int maxDepartures, final boolean equivs) throws IOException { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/dn"); @@ -200,6 +200,6 @@ public class ZvvProvider extends AbstractHafasProvider uri.append("&L=vs_java3"); uri.append("&input=").append(stationId); - return xmlQueryDepartures(uri.toString(), Integer.parseInt(stationId)); + return xmlQueryDepartures(uri.toString(), stationId); } } diff --git a/test/de/schildbach/pte/live/AtcProviderLiveTest.java b/test/de/schildbach/pte/live/AtcProviderLiveTest.java index 80f967a1..3e379045 100644 --- a/test/de/schildbach/pte/live/AtcProviderLiveTest.java +++ b/test/de/schildbach/pte/live/AtcProviderLiveTest.java @@ -70,7 +70,7 @@ public class AtcProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("740", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(740, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/AvvProviderLiveTest.java b/test/de/schildbach/pte/live/AvvProviderLiveTest.java index b38b2cd3..d85d3bee 100644 --- a/test/de/schildbach/pte/live/AvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/AvvProviderLiveTest.java @@ -69,7 +69,7 @@ public class AvvProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("100", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(100, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/BahnProviderLiveTest.java b/test/de/schildbach/pte/live/BahnProviderLiveTest.java index ae7f374e..bf075a6c 100644 --- a/test/de/schildbach/pte/live/BahnProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BahnProviderLiveTest.java @@ -58,7 +58,7 @@ public class BahnProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("692991", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(692991, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/BvbProviderLiveTest.java b/test/de/schildbach/pte/live/BvbProviderLiveTest.java index 182d2105..7fadc5fe 100644 --- a/test/de/schildbach/pte/live/BvbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BvbProviderLiveTest.java @@ -69,7 +69,7 @@ public class BvbProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("10000", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(10000, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/test/de/schildbach/pte/live/BvgProviderLiveTest.java index b6e77ced..0b26470e 100644 --- a/test/de/schildbach/pte/live/BvgProviderLiveTest.java +++ b/test/de/schildbach/pte/live/BvgProviderLiveTest.java @@ -64,7 +64,7 @@ public class BvgProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("309557", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(309557, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/DingProviderLiveTest.java b/test/de/schildbach/pte/live/DingProviderLiveTest.java index a106fe29..c41e3291 100644 --- a/test/de/schildbach/pte/live/DingProviderLiveTest.java +++ b/test/de/schildbach/pte/live/DingProviderLiveTest.java @@ -69,7 +69,7 @@ public class DingProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("90001611", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(90001611, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/DsbProviderLiveTest.java b/test/de/schildbach/pte/live/DsbProviderLiveTest.java index 3d536296..f28b5636 100644 --- a/test/de/schildbach/pte/live/DsbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/DsbProviderLiveTest.java @@ -69,7 +69,7 @@ public class DsbProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("8600858", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(8600858, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/InvgProviderLiveTest.java b/test/de/schildbach/pte/live/InvgProviderLiveTest.java index 732ca6a0..47564603 100644 --- a/test/de/schildbach/pte/live/InvgProviderLiveTest.java +++ b/test/de/schildbach/pte/live/InvgProviderLiveTest.java @@ -65,7 +65,7 @@ public class InvgProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("80301", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(80301, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/IvbProviderLiveTest.java b/test/de/schildbach/pte/live/IvbProviderLiveTest.java index a4241a6f..e8a09fb9 100644 --- a/test/de/schildbach/pte/live/IvbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/IvbProviderLiveTest.java @@ -69,7 +69,7 @@ public class IvbProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("60401187", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(60401187, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/KvvProviderLiveTest.java b/test/de/schildbach/pte/live/KvvProviderLiveTest.java index 636a274f..f3e742c6 100644 --- a/test/de/schildbach/pte/live/KvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/KvvProviderLiveTest.java @@ -73,7 +73,7 @@ public class KvvProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("7000090", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(7000090, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/LinzProviderLiveTest.java b/test/de/schildbach/pte/live/LinzProviderLiveTest.java index 06ecd21f..4c7daf05 100644 --- a/test/de/schildbach/pte/live/LinzProviderLiveTest.java +++ b/test/de/schildbach/pte/live/LinzProviderLiveTest.java @@ -81,7 +81,7 @@ public class LinzProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("60501720", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(60501720, 0, false); System.out.println(result); } diff --git a/test/de/schildbach/pte/live/LuProviderLiveTest.java b/test/de/schildbach/pte/live/LuProviderLiveTest.java index 5143d9e2..49b7fb3b 100644 --- a/test/de/schildbach/pte/live/LuProviderLiveTest.java +++ b/test/de/schildbach/pte/live/LuProviderLiveTest.java @@ -65,7 +65,7 @@ public class LuProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("9865836", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(9865836, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/MariborProviderLiveTest.java b/test/de/schildbach/pte/live/MariborProviderLiveTest.java index ef13b839..ab959397 100644 --- a/test/de/schildbach/pte/live/MariborProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MariborProviderLiveTest.java @@ -69,7 +69,7 @@ public class MariborProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("63203067", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(63203067, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/MetProviderLiveTest.java b/test/de/schildbach/pte/live/MetProviderLiveTest.java index bd2bb8dc..a81ccd4a 100644 --- a/test/de/schildbach/pte/live/MetProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MetProviderLiveTest.java @@ -69,7 +69,7 @@ public class MetProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("10001167", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(10001167, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/MvgProviderLiveTest.java b/test/de/schildbach/pte/live/MvgProviderLiveTest.java index e18bc8d4..2a7001ba 100644 --- a/test/de/schildbach/pte/live/MvgProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MvgProviderLiveTest.java @@ -69,7 +69,7 @@ public class MvgProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("3", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(3, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/MvvProviderLiveTest.java b/test/de/schildbach/pte/live/MvvProviderLiveTest.java index e16f1957..c8270493 100644 --- a/test/de/schildbach/pte/live/MvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/MvvProviderLiveTest.java @@ -73,7 +73,7 @@ public class MvvProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("2", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(2, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/NaldoProviderLiveTest.java b/test/de/schildbach/pte/live/NaldoProviderLiveTest.java index 096b0a32..ea6baa39 100644 --- a/test/de/schildbach/pte/live/NaldoProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NaldoProviderLiveTest.java @@ -69,7 +69,7 @@ public class NaldoProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("53019174", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(53019174, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/NasaProviderLiveTest.java b/test/de/schildbach/pte/live/NasaProviderLiveTest.java index d0c8cb93..1fef0abf 100644 --- a/test/de/schildbach/pte/live/NasaProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NasaProviderLiveTest.java @@ -65,7 +65,7 @@ public class NasaProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("13000", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(13000, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/NsProviderLiveTest.java b/test/de/schildbach/pte/live/NsProviderLiveTest.java index 8d2feaf6..4d107eb0 100644 --- a/test/de/schildbach/pte/live/NsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NsProviderLiveTest.java @@ -40,7 +40,7 @@ public class NsProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("100080", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(100080, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/NvbwProviderLiveTest.java b/test/de/schildbach/pte/live/NvbwProviderLiveTest.java index b0881d6e..73fb2192 100644 --- a/test/de/schildbach/pte/live/NvbwProviderLiveTest.java +++ b/test/de/schildbach/pte/live/NvbwProviderLiveTest.java @@ -69,7 +69,7 @@ public class NvbwProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("6900001", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(6900001, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/OebbProviderLiveTest.java b/test/de/schildbach/pte/live/OebbProviderLiveTest.java index 974b16c4..856fdae8 100644 --- a/test/de/schildbach/pte/live/OebbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/OebbProviderLiveTest.java @@ -56,7 +56,7 @@ public class OebbProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("902006", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(902006, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/PlProviderLiveTest.java b/test/de/schildbach/pte/live/PlProviderLiveTest.java index cc7a8cff..d1ff135d 100644 --- a/test/de/schildbach/pte/live/PlProviderLiveTest.java +++ b/test/de/schildbach/pte/live/PlProviderLiveTest.java @@ -65,7 +65,7 @@ public class PlProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("5100065", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(5100065, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/RmvProviderLiveTest.java b/test/de/schildbach/pte/live/RmvProviderLiveTest.java index 6ca5100c..f6ec9b9f 100644 --- a/test/de/schildbach/pte/live/RmvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/RmvProviderLiveTest.java @@ -66,7 +66,7 @@ public class RmvProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("3000001", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(3000001, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/SbbProviderLiveTest.java b/test/de/schildbach/pte/live/SbbProviderLiveTest.java index 75f3cada..c50cf987 100644 --- a/test/de/schildbach/pte/live/SbbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SbbProviderLiveTest.java @@ -57,7 +57,7 @@ public class SbbProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("8500010", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(8500010, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/SeptaProviderLiveTest.java b/test/de/schildbach/pte/live/SeptaProviderLiveTest.java index f671f6db..d695f82e 100644 --- a/test/de/schildbach/pte/live/SeptaProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SeptaProviderLiveTest.java @@ -65,7 +65,7 @@ public class SeptaProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("2090227", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(2090227, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/SfProviderLiveTest.java b/test/de/schildbach/pte/live/SfProviderLiveTest.java index ea38453c..cebecdc4 100644 --- a/test/de/schildbach/pte/live/SfProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SfProviderLiveTest.java @@ -69,7 +69,7 @@ public class SfProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("10001017", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(10001017, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/ShProviderLiveTest.java b/test/de/schildbach/pte/live/ShProviderLiveTest.java index a6d1f47c..ec0f150d 100644 --- a/test/de/schildbach/pte/live/ShProviderLiveTest.java +++ b/test/de/schildbach/pte/live/ShProviderLiveTest.java @@ -65,7 +65,7 @@ public class ShProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("715210", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(715210, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/SncbProviderLiveTest.java b/test/de/schildbach/pte/live/SncbProviderLiveTest.java index 8f06e506..eb4de643 100644 --- a/test/de/schildbach/pte/live/SncbProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SncbProviderLiveTest.java @@ -49,7 +49,7 @@ public class SncbProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("100080", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(100080, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/StvProviderLiveTest.java b/test/de/schildbach/pte/live/StvProviderLiveTest.java index 192dcc8f..889a1a9e 100644 --- a/test/de/schildbach/pte/live/StvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/StvProviderLiveTest.java @@ -69,7 +69,7 @@ public class StvProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("63203040", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(63203040, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/SvvProviderLiveTest.java b/test/de/schildbach/pte/live/SvvProviderLiveTest.java index 7909a8ca..62b66fd0 100644 --- a/test/de/schildbach/pte/live/SvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SvvProviderLiveTest.java @@ -69,7 +69,7 @@ public class SvvProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("60650002", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(60650002, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/SydneyProviderLiveTest.java b/test/de/schildbach/pte/live/SydneyProviderLiveTest.java index 4a1e083d..7c706d73 100644 --- a/test/de/schildbach/pte/live/SydneyProviderLiveTest.java +++ b/test/de/schildbach/pte/live/SydneyProviderLiveTest.java @@ -69,7 +69,7 @@ public class SydneyProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("10101452", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(10101452, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/TflProviderLiveTest.java b/test/de/schildbach/pte/live/TflProviderLiveTest.java index 6406eef1..ee937b4d 100644 --- a/test/de/schildbach/pte/live/TflProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TflProviderLiveTest.java @@ -73,7 +73,7 @@ public class TflProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("1000086", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(1000086, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/TleaProviderLiveTest.java b/test/de/schildbach/pte/live/TleaProviderLiveTest.java index 3caeaec2..3d4677b7 100644 --- a/test/de/schildbach/pte/live/TleaProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TleaProviderLiveTest.java @@ -69,7 +69,7 @@ public class TleaProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("1001003", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(1001003, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/TlemProviderLiveTest.java b/test/de/schildbach/pte/live/TlemProviderLiveTest.java index 7c2693d3..2bea4522 100644 --- a/test/de/schildbach/pte/live/TlemProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TlemProviderLiveTest.java @@ -69,7 +69,7 @@ public class TlemProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("1001003", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(1001003, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/TlseProviderLiveTest.java b/test/de/schildbach/pte/live/TlseProviderLiveTest.java index 2bc35ef0..2819fed4 100644 --- a/test/de/schildbach/pte/live/TlseProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TlseProviderLiveTest.java @@ -69,7 +69,7 @@ public class TlseProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("1001003", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(1001003, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/TlswProviderLiveTest.java b/test/de/schildbach/pte/live/TlswProviderLiveTest.java index 1bdc63fe..c6ee4b7f 100644 --- a/test/de/schildbach/pte/live/TlswProviderLiveTest.java +++ b/test/de/schildbach/pte/live/TlswProviderLiveTest.java @@ -69,7 +69,7 @@ public class TlswProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("247616", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(247616, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/VagfrProviderLiveTest.java b/test/de/schildbach/pte/live/VagfrProviderLiveTest.java index 240e5f71..01cf4922 100644 --- a/test/de/schildbach/pte/live/VagfrProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VagfrProviderLiveTest.java @@ -69,7 +69,7 @@ public class VagfrProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("6930112", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(6930112, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/VblProviderLiveTest.java b/test/de/schildbach/pte/live/VblProviderLiveTest.java index 085c393a..34d72feb 100644 --- a/test/de/schildbach/pte/live/VblProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VblProviderLiveTest.java @@ -69,7 +69,7 @@ public class VblProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("717", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(717, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/VgsProviderLiveTest.java b/test/de/schildbach/pte/live/VgsProviderLiveTest.java index 26e10da9..056dbf7f 100644 --- a/test/de/schildbach/pte/live/VgsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VgsProviderLiveTest.java @@ -69,7 +69,7 @@ public class VgsProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("8000244", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(8000244, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/VmsProviderLiveTest.java b/test/de/schildbach/pte/live/VmsProviderLiveTest.java index a12a26bb..872e9b3e 100644 --- a/test/de/schildbach/pte/live/VmsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VmsProviderLiveTest.java @@ -69,7 +69,7 @@ public class VmsProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("36030062", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(36030062, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/VmvProviderLiveTest.java b/test/de/schildbach/pte/live/VmvProviderLiveTest.java index 6e4823ff..e4a9a6f4 100644 --- a/test/de/schildbach/pte/live/VmvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VmvProviderLiveTest.java @@ -69,7 +69,7 @@ public class VmvProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("80001834", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(80001834, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/VorProviderLiveTest.java b/test/de/schildbach/pte/live/VorProviderLiveTest.java index 3a3ed53d..2d764fcd 100644 --- a/test/de/schildbach/pte/live/VorProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VorProviderLiveTest.java @@ -69,7 +69,7 @@ public class VorProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("60203090", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(60203090, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/VrnProviderLiveTest.java b/test/de/schildbach/pte/live/VrnProviderLiveTest.java index 3cb59a4c..61d2e8bb 100644 --- a/test/de/schildbach/pte/live/VrnProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrnProviderLiveTest.java @@ -93,7 +93,7 @@ public class VrnProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("6032236", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(6032236, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/test/de/schildbach/pte/live/VrrProviderLiveTest.java index 6316e1ec..70915975 100644 --- a/test/de/schildbach/pte/live/VrrProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrrProviderLiveTest.java @@ -85,7 +85,7 @@ public class VrrProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("1007258", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(1007258, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/VrtProviderLiveTest.java b/test/de/schildbach/pte/live/VrtProviderLiveTest.java index 6b21a8ca..a6be7d9a 100644 --- a/test/de/schildbach/pte/live/VrtProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VrtProviderLiveTest.java @@ -69,7 +69,7 @@ public class VrtProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("17001301", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(17001301, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/VvmProviderLiveTest.java b/test/de/schildbach/pte/live/VvmProviderLiveTest.java index 282cbd55..fac9bd00 100644 --- a/test/de/schildbach/pte/live/VvmProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvmProviderLiveTest.java @@ -69,7 +69,7 @@ public class VvmProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("3000510", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(3000510, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/VvoProviderLiveTest.java b/test/de/schildbach/pte/live/VvoProviderLiveTest.java index 4a5b2eec..aa355446 100644 --- a/test/de/schildbach/pte/live/VvoProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvoProviderLiveTest.java @@ -69,7 +69,7 @@ public class VvoProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("100", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(100, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/VvsProviderLiveTest.java b/test/de/schildbach/pte/live/VvsProviderLiveTest.java index b8421910..adefdf98 100644 --- a/test/de/schildbach/pte/live/VvsProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvsProviderLiveTest.java @@ -69,7 +69,7 @@ public class VvsProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("6118", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(6118, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/VvvProviderLiveTest.java b/test/de/schildbach/pte/live/VvvProviderLiveTest.java index e3f44631..9f730be3 100644 --- a/test/de/schildbach/pte/live/VvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/VvvProviderLiveTest.java @@ -69,7 +69,7 @@ public class VvvProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("60001296", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(60001296, 0, false); System.out.println(result.stationDepartures); } diff --git a/test/de/schildbach/pte/live/ZvvProviderLiveTest.java b/test/de/schildbach/pte/live/ZvvProviderLiveTest.java index fe2682dc..1e9a874c 100644 --- a/test/de/schildbach/pte/live/ZvvProviderLiveTest.java +++ b/test/de/schildbach/pte/live/ZvvProviderLiveTest.java @@ -73,7 +73,7 @@ public class ZvvProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures("183400", 0, false); + final QueryDeparturesResult result = provider.queryDepartures(183400, 0, false); System.out.println(result.stationDepartures); }