Fix NetworkProvider.hasCapabilities().

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

@@ -231,6 +231,12 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		this.fareCorrectionFactor = fareCorrectionFactor;
 	}
 
+	@Override
+	protected boolean hasCapability(final Capability capability)
+	{
+		return true;
+	}
+
 	private final void appendCommonRequestParams(final StringBuilder uri, final String outputFormat)
 	{
 		uri.append("?outputFormat=").append(outputFormat);

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

@@ -219,6 +219,12 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 		this.stationBoardCanDoEquivs = canDoEquivs;
 	}
 
+	@Override
+	protected boolean hasCapability(final Capability capability)
+	{
+		return true;
+	}
+
 	protected final String allProductsString()
 	{
 		final StringBuilder allProducts = new StringBuilder(numProductBits);

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

@@ -24,6 +24,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 
+import de.schildbach.pte.NetworkProvider.Capability;
 import de.schildbach.pte.dto.Point;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.Style;
@@ -47,6 +48,17 @@ public abstract class AbstractNetworkProvider implements NetworkProvider
 		ALL_EXCEPT_HIGHSPEED.remove(Product.HIGH_SPEED_TRAIN);
 	}
 
+	public final boolean hasCapabilities(final Capability... capabilities)
+	{
+		for (final Capability capability : capabilities)
+			if (!hasCapability(capability))
+				return false;
+
+		return true;
+	}
+
+	protected abstract boolean hasCapability(Capability capability);
+
 	public Collection<Product> defaultProducts()
 	{
 		return ALL_EXCEPT_HIGHSPEED;

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

@@ -187,6 +187,15 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider
 				apiBase + (stopFinderEndpoint != null ? stopFinderEndpoint : DEFAULT_STOPFINDER_ENDPOINT));
 	}
 
+	@Override
+	protected boolean hasCapability(final Capability capability)
+	{
+		if (capability == Capability.DEPARTURES)
+			return false;
+		else
+			return true;
+	}
+
 	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{
 		final StringBuilder parameters = buildCommonRequestParams("SearchTripPoint", "json");

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

@@ -34,13 +34,4 @@ public class AtcProvider extends AbstractEfaProvider
 	{
 		return NETWORK_ID;
 	}
-
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
 }

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

@@ -43,15 +43,6 @@ public class AvvProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	private static final Map<String, Style> STYLES = new HashMap<String, Style>();
 
 	static

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

@@ -43,16 +43,6 @@ public final class BahnProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.NEARBY_STATIONS || capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS
-					|| capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -56,15 +56,6 @@ public class BayernProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -43,15 +43,6 @@ public class BsvagProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	private static final Map<String, Style> STYLES = new HashMap<String, Style>();
 
 	static

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

@@ -41,15 +41,6 @@ public class BvbProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
 	{

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

@@ -73,15 +73,6 @@ public final class BvgProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.NEARBY_STATIONS)
-				return false;
-
-		return true;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -34,13 +34,4 @@ public class DingProvider extends AbstractEfaProvider
 	{
 		return NETWORK_ID;
 	}
-
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
 }

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

@@ -44,15 +44,6 @@ public class DsbProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -38,13 +38,4 @@ public class DubProvider extends AbstractEfaProvider
 	{
 		return NETWORK_ID;
 	}
-
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
 }

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

@@ -52,15 +52,6 @@ public class EireannProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected void setProductBits(final StringBuilder productBits, final Product product)
 	{

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

@@ -43,13 +43,13 @@ public class GvhProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
+	@Override
+	protected boolean hasCapability(final Capability capability)
 	{
-		for (final Capability capability : capabilities)
+		if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.TRIPS)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
 			return false;
+		else
+			return super.hasCapability(capability);
 	}
 
 	@Override

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

@@ -70,13 +70,13 @@ public class InvgProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
+	@Override
+	protected boolean hasCapability(final Capability capability)
 	{
-		for (final Capability capability : capabilities)
+		if (capability == Capability.TRIPS)
-			if (capability == Capability.DEPARTURES)
-				return true;
-
 			return false;
+		else
+			return super.hasCapability(capability);
 	}
 
 	@Override

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

@@ -36,13 +36,4 @@ public class IvbProvider extends AbstractEfaProvider
 	{
 		return NETWORK_ID;
 	}
-
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
 }

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

@@ -47,15 +47,6 @@ public class JetProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -50,15 +50,6 @@ public class KvvProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	private static final Pattern P_LINE = Pattern.compile("(.*?)\\s+\\([\\w/]+\\)", Pattern.CASE_INSENSITIVE);
 
 	@Override

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

@@ -43,15 +43,6 @@ public class LinzProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	private static final Map<String, Style> STYLES = new HashMap<String, Style>();
 
 	static

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

@@ -37,15 +37,6 @@ public class LuProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -46,15 +46,6 @@ public class MetProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -34,13 +34,4 @@ public class MvgProvider extends AbstractEfaProvider
 	{
 		return NETWORK_ID;
 	}
-
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
 }

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

@@ -49,15 +49,6 @@ public class MvvProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -41,15 +41,6 @@ public class NaldoProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -45,15 +45,6 @@ public class NasaProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -47,15 +47,6 @@ public class NriProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -49,15 +49,6 @@ public class NsProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -38,15 +38,6 @@ public class NvbwProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -43,15 +43,6 @@ public class NvvProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected void setProductBits(final StringBuilder productBits, final Product product)
 	{

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

@@ -46,16 +46,6 @@ public class OebbProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.NEARBY_STATIONS || capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS
-					|| capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -36,15 +36,6 @@ public class PacaProvider extends AbstractTsiProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String translateToLocalProduct(final Product p)
 	{

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

@@ -43,15 +43,6 @@ public class PlProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -45,15 +45,6 @@ public class RsagProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -41,15 +41,6 @@ public class RtProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected void setProductBits(final StringBuilder productBits, final Product product)
 	{

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

@@ -41,15 +41,6 @@ public class SbbProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -50,13 +50,13 @@ public class SeProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
+	@Override
+	protected boolean hasCapability(final Capability capability)
 	{
-		for (final Capability capability : capabilities)
+		if (capability == Capability.TRIPS)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES)
-				return true;
-
 			return false;
+		else
+			return super.hasCapability(capability);
 	}
 
 	@Override

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

@@ -67,15 +67,6 @@ public class SeptaProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected void setProductBits(final StringBuilder productBits, final Product product)
 	{

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

@@ -45,15 +45,6 @@ public class SfProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String normalizeLocationName(final String name)
 	{

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

@@ -59,15 +59,6 @@ public class ShProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -47,15 +47,6 @@ public class SncbProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -49,15 +49,6 @@ public class StockholmProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -37,15 +37,6 @@ public class StvProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -34,13 +34,4 @@ public class SvvProvider extends AbstractEfaProvider
 	{
 		return NETWORK_ID;
 	}
-
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
 }

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

@@ -38,15 +38,6 @@ public class SydneyProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String normalizeLocationName(final String name)
 	{

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

@@ -41,15 +41,6 @@ public class TfiProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	public Collection<Product> defaultProducts()
 	{

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

@@ -44,15 +44,6 @@ public class TflProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -44,15 +44,6 @@ public class TlemProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -42,15 +42,6 @@ public class TlswProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	public Collection<Product> defaultProducts()
 	{

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

@@ -43,15 +43,6 @@ public class TlwmProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -44,15 +44,6 @@ public class VagfrProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	private static final Map<String, Style> STYLES = new HashMap<String, Style>();
 
 	static

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

@@ -52,15 +52,6 @@ public class VbbProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -37,15 +37,6 @@ public class VblProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -39,16 +39,6 @@ public class VbnProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.NEARBY_STATIONS || capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS
-					|| capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected void setProductBits(final StringBuilder productBits, final Product product)
 	{

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

@@ -43,15 +43,6 @@ public class VgnProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -43,15 +43,6 @@ public class VgsProvider extends AbstractHafasProvider
 		return NetworkId.VGS;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected void setProductBits(final StringBuilder productBits, final Product product)
 	{

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

@@ -37,15 +37,6 @@ public class VmobilProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -35,15 +35,6 @@ public class VmsProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -44,15 +44,6 @@ public class VmvProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -48,15 +48,6 @@ public class VorProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	private static final Map<String, Style> STYLES = new HashMap<String, Style>();
 
 	static

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

@@ -34,13 +34,4 @@ public class VrnProvider extends AbstractEfaProvider
 	{
 		return NETWORK_ID;
 	}
-
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
 }

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

@@ -46,15 +46,6 @@ public class VrrProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -34,13 +34,4 @@ public class VrtProvider extends AbstractEfaProvider
 	{
 		return NETWORK_ID;
 	}
-
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
 }

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

@@ -42,15 +42,6 @@ public class VsnProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

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

@@ -36,13 +36,4 @@ public class VvmProvider extends AbstractEfaProvider
 	{
 		return NETWORK_ID;
 	}
-
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
 }

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

@@ -44,15 +44,6 @@ public class VvoProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -44,15 +44,6 @@ public class VvsProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	public Point[] getArea()
 	{

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

@@ -36,13 +36,4 @@ public class VvtProvider extends AbstractEfaProvider
 	{
 		return NETWORK_ID;
 	}
-
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
 }

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

@@ -37,15 +37,6 @@ public class VvvProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
 			final String trainNum, final String trainName)

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

@@ -44,15 +44,6 @@ public class WienProvider extends AbstractEfaProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	private static final Map<String, Style> STYLES = new HashMap<String, Style>();
 
 	static

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

@@ -46,15 +46,6 @@ public class ZvvProvider extends AbstractHafasProvider
 		return NETWORK_ID;
 	}
 
-	public boolean hasCapabilities(final Capability... capabilities)
-	{
-		for (final Capability capability : capabilities)
-			if (capability == Capability.DEPARTURES || capability == Capability.TRIPS)
-				return true;
-
-		return false;
-	}
-
 	@Override
 	protected char intToProduct(final int value)
 	{

enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java

@@ -18,6 +18,7 @@
 package de.schildbach.pte.live;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
@@ -26,6 +27,7 @@ import org.junit.Test;
 
 import de.schildbach.pte.GvhProvider;
 import de.schildbach.pte.NetworkProvider.Accessibility;
+import de.schildbach.pte.NetworkProvider.Capability;
 import de.schildbach.pte.NetworkProvider.WalkSpeed;
 import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.LocationType;
@@ -45,6 +47,14 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest
 		super(new GvhProvider(null));
 	}
 
+	@Test
+	public void capabilities() throws Exception
+	{
+		assertTrue(provider.hasCapabilities(Capability.NEARBY_STATIONS, Capability.DEPARTURES));
+		assertFalse(provider.hasCapabilities(Capability.SUGGEST_LOCATIONS, Capability.TRIPS));
+		assertFalse(provider.hasCapabilities(Capability.DEPARTURES, Capability.TRIPS));
+	}
+
 	@Test
 	public void nearbyStations() throws Exception
 	{