From 6f2b4515d9b8fdd1f653e7befd6cf3305957809b Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 8 Jul 2013 18:45:45 +0200 Subject: [PATCH] Extract XML query departures parameters to method --- .../de/schildbach/pte/AbstractHafasProvider.java | 14 ++++++++++++++ enabler/src/de/schildbach/pte/BahnProvider.java | 8 +------- enabler/src/de/schildbach/pte/DsbProvider.java | 8 +------- enabler/src/de/schildbach/pte/EireannProvider.java | 8 +------- enabler/src/de/schildbach/pte/LuProvider.java | 8 +------- enabler/src/de/schildbach/pte/NasaProvider.java | 8 +------- enabler/src/de/schildbach/pte/NriProvider.java | 8 +------- enabler/src/de/schildbach/pte/NvvProvider.java | 8 +------- enabler/src/de/schildbach/pte/OebbProvider.java | 8 +------- enabler/src/de/schildbach/pte/PlProvider.java | 8 +------- enabler/src/de/schildbach/pte/RmvProvider.java | 8 +------- enabler/src/de/schildbach/pte/RtProvider.java | 8 +------- enabler/src/de/schildbach/pte/SbbProvider.java | 8 +------- enabler/src/de/schildbach/pte/SeProvider.java | 8 +------- enabler/src/de/schildbach/pte/SncbProvider.java | 8 +------- .../src/de/schildbach/pte/StockholmProvider.java | 8 +------- enabler/src/de/schildbach/pte/VbbProvider.java | 8 +------- enabler/src/de/schildbach/pte/VbnProvider.java | 8 +------- enabler/src/de/schildbach/pte/VgsProvider.java | 8 +------- enabler/src/de/schildbach/pte/ZvvProvider.java | 8 +------- 20 files changed, 33 insertions(+), 133 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index 7a6a2d88..8e815180 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -588,6 +588,20 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider } } + protected StringBuilder xmlQueryDeparturesParameters(final int stationId) + { + final StringBuilder parameters = new StringBuilder(); + parameters.append("?productsFilter=").append(allProductsString()); + parameters.append("&boardType=dep"); + parameters.append("&disableEquivs=yes"); // don't use nearby stations + parameters.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations + parameters.append("&start=yes"); + parameters.append("&L=vs_java3"); + parameters.append("&input=").append(stationId); + + return parameters; + } + private static final Pattern P_XML_QUERY_DEPARTURES_DELAY = Pattern.compile("(?:-|k\\.A\\.?|cancel|\\+?\\s*(\\d+))"); protected QueryDeparturesResult xmlQueryDepartures(final String uri, final int stationId) throws IOException diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java index ec1e0324..dec3813c 100644 --- a/enabler/src/de/schildbach/pte/BahnProvider.java +++ b/enabler/src/de/schildbach/pte/BahnProvider.java @@ -193,13 +193,7 @@ public final class BahnProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/dn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/DsbProvider.java b/enabler/src/de/schildbach/pte/DsbProvider.java index 7916c76d..f0f3a69e 100644 --- a/enabler/src/de/schildbach/pte/DsbProvider.java +++ b/enabler/src/de/schildbach/pte/DsbProvider.java @@ -145,13 +145,7 @@ public class DsbProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/mn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/EireannProvider.java b/enabler/src/de/schildbach/pte/EireannProvider.java index d488f1eb..68d8cb93 100644 --- a/enabler/src/de/schildbach/pte/EireannProvider.java +++ b/enabler/src/de/schildbach/pte/EireannProvider.java @@ -134,13 +134,7 @@ public class EireannProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.bin/en"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/LuProvider.java b/enabler/src/de/schildbach/pte/LuProvider.java index 6969ec4f..44880490 100644 --- a/enabler/src/de/schildbach/pte/LuProvider.java +++ b/enabler/src/de/schildbach/pte/LuProvider.java @@ -151,13 +151,7 @@ public class LuProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/fn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/enabler/src/de/schildbach/pte/NasaProvider.java index ff089a6d..c073579b 100644 --- a/enabler/src/de/schildbach/pte/NasaProvider.java +++ b/enabler/src/de/schildbach/pte/NasaProvider.java @@ -154,13 +154,7 @@ public class NasaProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/dn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/NriProvider.java b/enabler/src/de/schildbach/pte/NriProvider.java index ab38415c..9c574300 100644 --- a/enabler/src/de/schildbach/pte/NriProvider.java +++ b/enabler/src/de/schildbach/pte/NriProvider.java @@ -168,13 +168,7 @@ public class NriProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/on"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/NvvProvider.java b/enabler/src/de/schildbach/pte/NvvProvider.java index 4873ffcc..2c82ac5b 100644 --- a/enabler/src/de/schildbach/pte/NvvProvider.java +++ b/enabler/src/de/schildbach/pte/NvvProvider.java @@ -146,13 +146,7 @@ public class NvvProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/dn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/enabler/src/de/schildbach/pte/OebbProvider.java index ae56820e..ac1d97ae 100644 --- a/enabler/src/de/schildbach/pte/OebbProvider.java +++ b/enabler/src/de/schildbach/pte/OebbProvider.java @@ -180,13 +180,7 @@ public class OebbProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/dn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/PlProvider.java b/enabler/src/de/schildbach/pte/PlProvider.java index f99f4438..cc76766f 100644 --- a/enabler/src/de/schildbach/pte/PlProvider.java +++ b/enabler/src/de/schildbach/pte/PlProvider.java @@ -169,13 +169,7 @@ public class PlProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/pn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/RmvProvider.java b/enabler/src/de/schildbach/pte/RmvProvider.java index 660bfff7..884f5c59 100644 --- a/enabler/src/de/schildbach/pte/RmvProvider.java +++ b/enabler/src/de/schildbach/pte/RmvProvider.java @@ -188,13 +188,7 @@ public class RmvProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/dn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/RtProvider.java b/enabler/src/de/schildbach/pte/RtProvider.java index 152a8f27..9029c094 100644 --- a/enabler/src/de/schildbach/pte/RtProvider.java +++ b/enabler/src/de/schildbach/pte/RtProvider.java @@ -139,13 +139,7 @@ public class RtProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/dn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/SbbProvider.java b/enabler/src/de/schildbach/pte/SbbProvider.java index a0ea5731..7c6aac0e 100644 --- a/enabler/src/de/schildbach/pte/SbbProvider.java +++ b/enabler/src/de/schildbach/pte/SbbProvider.java @@ -134,13 +134,7 @@ public class SbbProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/dn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/SeProvider.java b/enabler/src/de/schildbach/pte/SeProvider.java index 8adaca0c..1e1e2a09 100644 --- a/enabler/src/de/schildbach/pte/SeProvider.java +++ b/enabler/src/de/schildbach/pte/SeProvider.java @@ -181,13 +181,7 @@ public class SeProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/sn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/SncbProvider.java b/enabler/src/de/schildbach/pte/SncbProvider.java index b72731a7..85fe56f6 100644 --- a/enabler/src/de/schildbach/pte/SncbProvider.java +++ b/enabler/src/de/schildbach/pte/SncbProvider.java @@ -123,13 +123,7 @@ public class SncbProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/nn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/StockholmProvider.java b/enabler/src/de/schildbach/pte/StockholmProvider.java index 6811ba80..d79ae4fb 100644 --- a/enabler/src/de/schildbach/pte/StockholmProvider.java +++ b/enabler/src/de/schildbach/pte/StockholmProvider.java @@ -176,13 +176,7 @@ public class StockholmProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/sn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/VbbProvider.java b/enabler/src/de/schildbach/pte/VbbProvider.java index 3df03fa9..b369a838 100644 --- a/enabler/src/de/schildbach/pte/VbbProvider.java +++ b/enabler/src/de/schildbach/pte/VbbProvider.java @@ -175,13 +175,7 @@ public class VbbProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/dn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java index fd61fc83..a2e687d2 100644 --- a/enabler/src/de/schildbach/pte/VbnProvider.java +++ b/enabler/src/de/schildbach/pte/VbnProvider.java @@ -138,13 +138,7 @@ public class VbnProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/dn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/VgsProvider.java b/enabler/src/de/schildbach/pte/VgsProvider.java index 380b9679..552a2190 100644 --- a/enabler/src/de/schildbach/pte/VgsProvider.java +++ b/enabler/src/de/schildbach/pte/VgsProvider.java @@ -156,13 +156,7 @@ public class VgsProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/dn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); } diff --git a/enabler/src/de/schildbach/pte/ZvvProvider.java b/enabler/src/de/schildbach/pte/ZvvProvider.java index b15eb43e..41272207 100644 --- a/enabler/src/de/schildbach/pte/ZvvProvider.java +++ b/enabler/src/de/schildbach/pte/ZvvProvider.java @@ -197,13 +197,7 @@ public class ZvvProvider extends AbstractHafasProvider { final StringBuilder uri = new StringBuilder(); uri.append(API_BASE).append("stboard.exe/dn"); - uri.append("?productsFilter=").append(allProductsString()); - uri.append("&boardType=dep"); - uri.append("&disableEquivs=yes"); // don't use nearby stations - uri.append("&maxJourneys=50"); // ignore maxDepartures because result contains other stations - uri.append("&start=yes"); - uri.append("&L=vs_java3"); - uri.append("&input=").append(stationId); + uri.append(xmlQueryDeparturesParameters(stationId)); return xmlQueryDepartures(uri.toString(), stationId); }