From f65aa7ea57bb0d0b8ccd824fd2eea83087493901 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 9 Jul 2013 18:34:54 +0200 Subject: [PATCH] Extract XML nearby stations parameters to method --- .../de/schildbach/pte/AbstractHafasProvider.java | 13 +++++++++++++ enabler/src/de/schildbach/pte/DsbProvider.java | 6 +----- enabler/src/de/schildbach/pte/EireannProvider.java | 6 +----- enabler/src/de/schildbach/pte/LuProvider.java | 5 +---- enabler/src/de/schildbach/pte/NriProvider.java | 6 +----- enabler/src/de/schildbach/pte/PlProvider.java | 6 +----- enabler/src/de/schildbach/pte/RtProvider.java | 6 +----- enabler/src/de/schildbach/pte/SbbProvider.java | 6 +----- enabler/src/de/schildbach/pte/SeProvider.java | 5 +---- .../src/de/schildbach/pte/StockholmProvider.java | 5 +---- enabler/src/de/schildbach/pte/VbbProvider.java | 6 +----- enabler/src/de/schildbach/pte/VbnProvider.java | 6 +----- enabler/src/de/schildbach/pte/ZvvProvider.java | 6 +----- 13 files changed, 25 insertions(+), 57 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index c4e63803..6edd272f 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -2256,6 +2256,19 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider return m.group(1); } + protected final StringBuilder xmlNearbyStationsParameters(final int stationId) + { + final StringBuilder parameters = new StringBuilder(); + parameters.append("?productsFilter=").append(allProductsString()); + parameters.append("&boardType=dep"); + parameters.append("&input=").append(stationId); + parameters.append("&sTI=1&start=yes&hcount=0&L=vs_java3"); + if (clientType != null) + parameters.append("&clientType=").append(ParserUtils.urlEncode(clientType)); + + return parameters; + } + private static final Pattern P_XML_NEARBY_STATIONS_COARSE = Pattern.compile("\\G<\\s*St\\s*(.*?)/?>(?:\n|\\z)", Pattern.DOTALL); private static final Pattern P_XML_NEARBY_STATIONS_FINE = Pattern.compile("" // + "evaId=\"(\\d+)\"\\s*" // id diff --git a/enabler/src/de/schildbach/pte/DsbProvider.java b/enabler/src/de/schildbach/pte/DsbProvider.java index d20c3028..ac188f76 100644 --- a/enabler/src/de/schildbach/pte/DsbProvider.java +++ b/enabler/src/de/schildbach/pte/DsbProvider.java @@ -125,11 +125,7 @@ public class DsbProvider extends AbstractHafasProvider else if (location.type == LocationType.STATION && location.hasId()) { final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&input=").append(location.id); - uri.append("&sTI=1&start=yes&hcount=0"); - uri.append("&L=vs_java3"); + uri.append(xmlNearbyStationsParameters(location.id)); return xmlNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/EireannProvider.java b/enabler/src/de/schildbach/pte/EireannProvider.java index 832a831f..ed08cfc1 100644 --- a/enabler/src/de/schildbach/pte/EireannProvider.java +++ b/enabler/src/de/schildbach/pte/EireannProvider.java @@ -113,11 +113,7 @@ public class EireannProvider extends AbstractHafasProvider else if (location.type == LocationType.STATION && location.hasId()) { final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&input=").append(location.id); - uri.append("&sTI=1&start=yes&hcount=0"); - uri.append("&L=vs_java3"); + uri.append(xmlNearbyStationsParameters(location.id)); return xmlNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/LuProvider.java b/enabler/src/de/schildbach/pte/LuProvider.java index 352208e3..f25cd6e6 100644 --- a/enabler/src/de/schildbach/pte/LuProvider.java +++ b/enabler/src/de/schildbach/pte/LuProvider.java @@ -133,10 +133,7 @@ public class LuProvider extends AbstractHafasProvider else if (location.type == LocationType.STATION && location.hasId()) { final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&input=").append(location.id); - uri.append("&sTI=1&start=yes&hcount=0&L=vs_java3"); + uri.append(xmlNearbyStationsParameters(location.id)); return xmlNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/NriProvider.java b/enabler/src/de/schildbach/pte/NriProvider.java index abd91a8c..0b44051a 100644 --- a/enabler/src/de/schildbach/pte/NriProvider.java +++ b/enabler/src/de/schildbach/pte/NriProvider.java @@ -147,11 +147,7 @@ public class NriProvider extends AbstractHafasProvider else if (location.type == LocationType.STATION && location.hasId()) { final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&input=").append(location.id); - uri.append("&sTI=1&start=yes&hcount=0"); - uri.append("&L=vs_java3"); + uri.append(xmlNearbyStationsParameters(location.id)); return xmlNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/PlProvider.java b/enabler/src/de/schildbach/pte/PlProvider.java index 14038c0c..23156a1e 100644 --- a/enabler/src/de/schildbach/pte/PlProvider.java +++ b/enabler/src/de/schildbach/pte/PlProvider.java @@ -150,11 +150,7 @@ public class PlProvider extends AbstractHafasProvider else if (location.type == LocationType.STATION && location.hasId()) { final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&input=").append(location.id); - uri.append("&sTI=1&start=yes&hcount=0"); - uri.append("&L=vs_java3"); + uri.append(xmlNearbyStationsParameters(location.id)); return xmlNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/RtProvider.java b/enabler/src/de/schildbach/pte/RtProvider.java index 332807e7..36bc1bf9 100644 --- a/enabler/src/de/schildbach/pte/RtProvider.java +++ b/enabler/src/de/schildbach/pte/RtProvider.java @@ -118,11 +118,7 @@ public class RtProvider extends AbstractHafasProvider else if (location.type == LocationType.STATION && location.hasId()) { final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&input=").append(location.id); - uri.append("&sTI=1&start=yes&hcount=0"); - uri.append("&L=vs_java3"); + uri.append(xmlNearbyStationsParameters(location.id)); return xmlNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/SbbProvider.java b/enabler/src/de/schildbach/pte/SbbProvider.java index 387f8de6..ff409c4a 100644 --- a/enabler/src/de/schildbach/pte/SbbProvider.java +++ b/enabler/src/de/schildbach/pte/SbbProvider.java @@ -112,11 +112,7 @@ public class SbbProvider extends AbstractHafasProvider else if (location.type == LocationType.STATION && location.hasId()) { final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&input=").append(location.id); - uri.append("&sTI=1&start=yes&hcount=0"); - uri.append("&L=vs_java3"); + uri.append(xmlNearbyStationsParameters(location.id)); return xmlNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/SeProvider.java b/enabler/src/de/schildbach/pte/SeProvider.java index 233d4c37..55f6667a 100644 --- a/enabler/src/de/schildbach/pte/SeProvider.java +++ b/enabler/src/de/schildbach/pte/SeProvider.java @@ -167,10 +167,7 @@ public class SeProvider extends AbstractHafasProvider else if (location.type == LocationType.STATION && location.hasId()) { final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&input=").append(location.id); - uri.append("&sTI=1&start=yes&hcount=0&L=vs_java3"); + uri.append(xmlNearbyStationsParameters(location.id)); return xmlNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/StockholmProvider.java b/enabler/src/de/schildbach/pte/StockholmProvider.java index c614e4b9..4b4093c4 100644 --- a/enabler/src/de/schildbach/pte/StockholmProvider.java +++ b/enabler/src/de/schildbach/pte/StockholmProvider.java @@ -156,10 +156,7 @@ public class StockholmProvider extends AbstractHafasProvider else if (location.type == LocationType.STATION && location.hasId()) { final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&input=").append(location.id); - uri.append("&sTI=1&start=yes&hcount=0&L=vs_java3"); + uri.append(xmlNearbyStationsParameters(location.id)); return xmlNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/VbbProvider.java b/enabler/src/de/schildbach/pte/VbbProvider.java index 953d91e6..9103783d 100644 --- a/enabler/src/de/schildbach/pte/VbbProvider.java +++ b/enabler/src/de/schildbach/pte/VbbProvider.java @@ -154,11 +154,7 @@ public class VbbProvider extends AbstractHafasProvider else if (location.type == LocationType.STATION && location.hasId()) { final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&input=").append(location.id); - uri.append("&sTI=1&start=yes&hcount=0"); - uri.append("&L=vs_java3"); + uri.append(xmlNearbyStationsParameters(location.id)); return xmlNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java index 981b1363..f468a0ae 100644 --- a/enabler/src/de/schildbach/pte/VbnProvider.java +++ b/enabler/src/de/schildbach/pte/VbnProvider.java @@ -117,11 +117,7 @@ public class VbnProvider extends AbstractHafasProvider else if (location.type == LocationType.STATION && location.hasId()) { final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&input=").append(location.id); - uri.append("&sTI=1&start=yes&hcount=0"); - uri.append("&L=vs_java3"); + uri.append(xmlNearbyStationsParameters(location.id)); return xmlNearbyStations(uri.toString()); } diff --git a/enabler/src/de/schildbach/pte/ZvvProvider.java b/enabler/src/de/schildbach/pte/ZvvProvider.java index e2397bc1..a23d98c1 100644 --- a/enabler/src/de/schildbach/pte/ZvvProvider.java +++ b/enabler/src/de/schildbach/pte/ZvvProvider.java @@ -178,11 +178,7 @@ public class ZvvProvider extends AbstractHafasProvider else if (location.type == LocationType.STATION && location.hasId()) { final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&input=").append(location.id); - uri.append("&sTI=1&start=yes&hcount=0"); - uri.append("&L=vs_java3"); + uri.append(xmlNearbyStationsParameters(location.id)); return xmlNearbyStations(uri.toString()); }