Use common method for querying departures (Hafas).

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();

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<Product> defaultProducts()
 	{

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);

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<Product> defaultProducts()
 	{

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)
 	{

enabler/src/de/schildbach/pte/InvgProvider.java

@@ -162,6 +162,7 @@ public class InvgProvider extends AbstractHafasProvider
 			+ "(?:<td class=\"center sepline top\">\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);

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

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)
 	{

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)
 	{

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<Product> defaultProducts()
 	{

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();

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)
 	{

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<Product> defaultProducts()
 	{

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)
 	{

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<Product> defaultProducts()
 	{

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<Product> defaultProducts()
 	{

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<Product> defaultProducts()
 	{

enabler/src/de/schildbach/pte/SeptaProvider.java

@@ -183,6 +183,7 @@ public class SeptaProvider extends AbstractHafasProvider
 			+ "(?:<td class=\"center sepline top\">\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);

enabler/src/de/schildbach/pte/ShProvider.java

@@ -207,6 +207,7 @@ public class ShProvider extends AbstractHafasProvider
 			+ "(?:<td class=\"center sepline top\">\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);

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<Product> defaultProducts()
 	{

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)
 	{

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<Product> defaultProducts()
 	{

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)
 	{

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);
-	}
 }

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)
 	{

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)
 	{