diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 323de7a3..147ceee5 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/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); diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index 73553698..a6303970 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/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); diff --git a/enabler/src/de/schildbach/pte/AbstractNetworkProvider.java b/enabler/src/de/schildbach/pte/AbstractNetworkProvider.java index 375e7135..6f2f1b0e 100644 --- a/enabler/src/de/schildbach/pte/AbstractNetworkProvider.java +++ b/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 defaultProducts() { return ALL_EXCEPT_HIGHSPEED; diff --git a/enabler/src/de/schildbach/pte/AbstractTsiProvider.java b/enabler/src/de/schildbach/pte/AbstractTsiProvider.java index da691e4c..7734998b 100644 --- a/enabler/src/de/schildbach/pte/AbstractTsiProvider.java +++ b/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"); diff --git a/enabler/src/de/schildbach/pte/AtcProvider.java b/enabler/src/de/schildbach/pte/AtcProvider.java index b891accd..67b7bd0a 100644 --- a/enabler/src/de/schildbach/pte/AtcProvider.java +++ b/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; - } } diff --git a/enabler/src/de/schildbach/pte/AvvProvider.java b/enabler/src/de/schildbach/pte/AvvProvider.java index c0604358..94c60593 100644 --- a/enabler/src/de/schildbach/pte/AvvProvider.java +++ b/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 STYLES = new HashMap(); static diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java index 7c97c2eb..de964776 100644 --- a/enabler/src/de/schildbach/pte/BahnProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/BayernProvider.java b/enabler/src/de/schildbach/pte/BayernProvider.java index 90dfffab..f4e893ef 100644 --- a/enabler/src/de/schildbach/pte/BayernProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/BsvagProvider.java b/enabler/src/de/schildbach/pte/BsvagProvider.java index 009a1812..36d22f07 100644 --- a/enabler/src/de/schildbach/pte/BsvagProvider.java +++ b/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 STYLES = new HashMap(); static diff --git a/enabler/src/de/schildbach/pte/BvbProvider.java b/enabler/src/de/schildbach/pte/BvbProvider.java index e2487980..268a9e8e 100644 --- a/enabler/src/de/schildbach/pte/BvbProvider.java +++ b/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 { diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java index d62fd7ac..2808eec8 100644 --- a/enabler/src/de/schildbach/pte/BvgProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/DingProvider.java b/enabler/src/de/schildbach/pte/DingProvider.java index d8c7c123..f1b1bdd6 100644 --- a/enabler/src/de/schildbach/pte/DingProvider.java +++ b/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; - } } diff --git a/enabler/src/de/schildbach/pte/DsbProvider.java b/enabler/src/de/schildbach/pte/DsbProvider.java index bcc92123..98898d57 100644 --- a/enabler/src/de/schildbach/pte/DsbProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/DubProvider.java b/enabler/src/de/schildbach/pte/DubProvider.java index 5a75726d..737b0618 100644 --- a/enabler/src/de/schildbach/pte/DubProvider.java +++ b/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; - } } diff --git a/enabler/src/de/schildbach/pte/EireannProvider.java b/enabler/src/de/schildbach/pte/EireannProvider.java index fa61245d..8e31ab8d 100644 --- a/enabler/src/de/schildbach/pte/EireannProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/GvhProvider.java b/enabler/src/de/schildbach/pte/GvhProvider.java index 910ffba9..93107aab 100644 --- a/enabler/src/de/schildbach/pte/GvhProvider.java +++ b/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.DEPARTURES || capability == Capability.TRIPS) - return true; - - return false; + if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.TRIPS) + return false; + else + return super.hasCapability(capability); } @Override diff --git a/enabler/src/de/schildbach/pte/InvgProvider.java b/enabler/src/de/schildbach/pte/InvgProvider.java index 1e7d759d..e0301712 100644 --- a/enabler/src/de/schildbach/pte/InvgProvider.java +++ b/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.DEPARTURES) - return true; - - return false; + if (capability == Capability.TRIPS) + return false; + else + return super.hasCapability(capability); } @Override diff --git a/enabler/src/de/schildbach/pte/IvbProvider.java b/enabler/src/de/schildbach/pte/IvbProvider.java index abc1d9a5..0d2f23f4 100644 --- a/enabler/src/de/schildbach/pte/IvbProvider.java +++ b/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; - } } diff --git a/enabler/src/de/schildbach/pte/JetProvider.java b/enabler/src/de/schildbach/pte/JetProvider.java index ce5c895f..132f393c 100644 --- a/enabler/src/de/schildbach/pte/JetProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/KvvProvider.java b/enabler/src/de/schildbach/pte/KvvProvider.java index ab7bbfdd..65d7f436 100644 --- a/enabler/src/de/schildbach/pte/KvvProvider.java +++ b/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 diff --git a/enabler/src/de/schildbach/pte/LinzProvider.java b/enabler/src/de/schildbach/pte/LinzProvider.java index 6846d75e..262fbef6 100644 --- a/enabler/src/de/schildbach/pte/LinzProvider.java +++ b/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 STYLES = new HashMap(); static diff --git a/enabler/src/de/schildbach/pte/LuProvider.java b/enabler/src/de/schildbach/pte/LuProvider.java index b4c13bbf..42d29b3d 100644 --- a/enabler/src/de/schildbach/pte/LuProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/MetProvider.java b/enabler/src/de/schildbach/pte/MetProvider.java index a5f6b62a..0b1de592 100644 --- a/enabler/src/de/schildbach/pte/MetProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/MvgProvider.java b/enabler/src/de/schildbach/pte/MvgProvider.java index 987a6adf..3c0710d0 100644 --- a/enabler/src/de/schildbach/pte/MvgProvider.java +++ b/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; - } } diff --git a/enabler/src/de/schildbach/pte/MvvProvider.java b/enabler/src/de/schildbach/pte/MvvProvider.java index 4cad1c62..88807914 100644 --- a/enabler/src/de/schildbach/pte/MvvProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/NaldoProvider.java b/enabler/src/de/schildbach/pte/NaldoProvider.java index 4b78e5c3..243af1aa 100644 --- a/enabler/src/de/schildbach/pte/NaldoProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/enabler/src/de/schildbach/pte/NasaProvider.java index 378d7dd2..2477f838 100644 --- a/enabler/src/de/schildbach/pte/NasaProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/NriProvider.java b/enabler/src/de/schildbach/pte/NriProvider.java index 9aeca7a5..1c42010d 100644 --- a/enabler/src/de/schildbach/pte/NriProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/NsProvider.java b/enabler/src/de/schildbach/pte/NsProvider.java index 49341122..c9ec89f8 100644 --- a/enabler/src/de/schildbach/pte/NsProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/NvbwProvider.java b/enabler/src/de/schildbach/pte/NvbwProvider.java index f5107105..4d528215 100644 --- a/enabler/src/de/schildbach/pte/NvbwProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/NvvProvider.java b/enabler/src/de/schildbach/pte/NvvProvider.java index 53a0c235..e44e2126 100644 --- a/enabler/src/de/schildbach/pte/NvvProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/enabler/src/de/schildbach/pte/OebbProvider.java index 05d3dceb..44d72b83 100644 --- a/enabler/src/de/schildbach/pte/OebbProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/PacaProvider.java b/enabler/src/de/schildbach/pte/PacaProvider.java index b4f96671..5b0f4a62 100644 --- a/enabler/src/de/schildbach/pte/PacaProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/PlProvider.java b/enabler/src/de/schildbach/pte/PlProvider.java index da63b48b..0ff06b98 100644 --- a/enabler/src/de/schildbach/pte/PlProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/RsagProvider.java b/enabler/src/de/schildbach/pte/RsagProvider.java index 8eb8684d..a58de62b 100644 --- a/enabler/src/de/schildbach/pte/RsagProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/RtProvider.java b/enabler/src/de/schildbach/pte/RtProvider.java index d7287519..1d0d7659 100644 --- a/enabler/src/de/schildbach/pte/RtProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/SbbProvider.java b/enabler/src/de/schildbach/pte/SbbProvider.java index 29f1ab43..0060c4d4 100644 --- a/enabler/src/de/schildbach/pte/SbbProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/SeProvider.java b/enabler/src/de/schildbach/pte/SeProvider.java index 1642458c..6596a016 100644 --- a/enabler/src/de/schildbach/pte/SeProvider.java +++ b/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.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES) - return true; - - return false; + if (capability == Capability.TRIPS) + return false; + else + return super.hasCapability(capability); } @Override diff --git a/enabler/src/de/schildbach/pte/SeptaProvider.java b/enabler/src/de/schildbach/pte/SeptaProvider.java index 8106868a..c6f28412 100644 --- a/enabler/src/de/schildbach/pte/SeptaProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/SfProvider.java b/enabler/src/de/schildbach/pte/SfProvider.java index 20fd68dd..7cd67fdd 100644 --- a/enabler/src/de/schildbach/pte/SfProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/enabler/src/de/schildbach/pte/ShProvider.java index eff3e808..df560562 100644 --- a/enabler/src/de/schildbach/pte/ShProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/SncbProvider.java b/enabler/src/de/schildbach/pte/SncbProvider.java index c9959945..944488d2 100644 --- a/enabler/src/de/schildbach/pte/SncbProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/StockholmProvider.java b/enabler/src/de/schildbach/pte/StockholmProvider.java index f1a1be29..2e3fea68 100644 --- a/enabler/src/de/schildbach/pte/StockholmProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/StvProvider.java b/enabler/src/de/schildbach/pte/StvProvider.java index c4c8b2f0..d8933c76 100644 --- a/enabler/src/de/schildbach/pte/StvProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/SvvProvider.java b/enabler/src/de/schildbach/pte/SvvProvider.java index 507c7cbf..d45fd05a 100644 --- a/enabler/src/de/schildbach/pte/SvvProvider.java +++ b/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; - } } diff --git a/enabler/src/de/schildbach/pte/SydneyProvider.java b/enabler/src/de/schildbach/pte/SydneyProvider.java index cdb02d25..245f1ee7 100644 --- a/enabler/src/de/schildbach/pte/SydneyProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/TfiProvider.java b/enabler/src/de/schildbach/pte/TfiProvider.java index 0a72d478..9395e631 100644 --- a/enabler/src/de/schildbach/pte/TfiProvider.java +++ b/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 defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/TflProvider.java b/enabler/src/de/schildbach/pte/TflProvider.java index 4d100b6d..e62ede0b 100644 --- a/enabler/src/de/schildbach/pte/TflProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/TlemProvider.java b/enabler/src/de/schildbach/pte/TlemProvider.java index e6a11f35..14688fbe 100644 --- a/enabler/src/de/schildbach/pte/TlemProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/TlswProvider.java b/enabler/src/de/schildbach/pte/TlswProvider.java index 6c9add69..0f64c6aa 100644 --- a/enabler/src/de/schildbach/pte/TlswProvider.java +++ b/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 defaultProducts() { diff --git a/enabler/src/de/schildbach/pte/TlwmProvider.java b/enabler/src/de/schildbach/pte/TlwmProvider.java index 0b452ed6..4723df82 100644 --- a/enabler/src/de/schildbach/pte/TlwmProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/VagfrProvider.java b/enabler/src/de/schildbach/pte/VagfrProvider.java index b82ba52a..1e37240a 100644 --- a/enabler/src/de/schildbach/pte/VagfrProvider.java +++ b/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 STYLES = new HashMap(); static diff --git a/enabler/src/de/schildbach/pte/VbbProvider.java b/enabler/src/de/schildbach/pte/VbbProvider.java index 188e9713..df03ca80 100644 --- a/enabler/src/de/schildbach/pte/VbbProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/VblProvider.java b/enabler/src/de/schildbach/pte/VblProvider.java index 17a86ca6..49d181c1 100644 --- a/enabler/src/de/schildbach/pte/VblProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java index 61633b70..22780aaf 100644 --- a/enabler/src/de/schildbach/pte/VbnProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/VgnProvider.java b/enabler/src/de/schildbach/pte/VgnProvider.java index 938f7fe0..ea411513 100644 --- a/enabler/src/de/schildbach/pte/VgnProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/VgsProvider.java b/enabler/src/de/schildbach/pte/VgsProvider.java index 075288e2..114a5865 100644 --- a/enabler/src/de/schildbach/pte/VgsProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/VmobilProvider.java b/enabler/src/de/schildbach/pte/VmobilProvider.java index 98777174..ee7cd9f7 100644 --- a/enabler/src/de/schildbach/pte/VmobilProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/VmsProvider.java b/enabler/src/de/schildbach/pte/VmsProvider.java index f687ff6c..a771260d 100644 --- a/enabler/src/de/schildbach/pte/VmsProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/VmvProvider.java b/enabler/src/de/schildbach/pte/VmvProvider.java index a05fdc5b..5ac3d0b8 100644 --- a/enabler/src/de/schildbach/pte/VmvProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/VorProvider.java b/enabler/src/de/schildbach/pte/VorProvider.java index 84cc4544..6e6e498c 100644 --- a/enabler/src/de/schildbach/pte/VorProvider.java +++ b/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 STYLES = new HashMap(); static diff --git a/enabler/src/de/schildbach/pte/VrnProvider.java b/enabler/src/de/schildbach/pte/VrnProvider.java index 6df77350..8bcda294 100644 --- a/enabler/src/de/schildbach/pte/VrnProvider.java +++ b/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; - } } diff --git a/enabler/src/de/schildbach/pte/VrrProvider.java b/enabler/src/de/schildbach/pte/VrrProvider.java index aa751b06..3c6880dc 100644 --- a/enabler/src/de/schildbach/pte/VrrProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/VrtProvider.java b/enabler/src/de/schildbach/pte/VrtProvider.java index ae5ebf55..99b8093f 100644 --- a/enabler/src/de/schildbach/pte/VrtProvider.java +++ b/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; - } } diff --git a/enabler/src/de/schildbach/pte/VsnProvider.java b/enabler/src/de/schildbach/pte/VsnProvider.java index 6d455831..a4014388 100644 --- a/enabler/src/de/schildbach/pte/VsnProvider.java +++ b/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) { diff --git a/enabler/src/de/schildbach/pte/VvmProvider.java b/enabler/src/de/schildbach/pte/VvmProvider.java index 7c9397c4..7aec6b05 100644 --- a/enabler/src/de/schildbach/pte/VvmProvider.java +++ b/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; - } } diff --git a/enabler/src/de/schildbach/pte/VvoProvider.java b/enabler/src/de/schildbach/pte/VvoProvider.java index 20936c54..bbb4dc0c 100644 --- a/enabler/src/de/schildbach/pte/VvoProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/VvsProvider.java b/enabler/src/de/schildbach/pte/VvsProvider.java index 41727e90..420ab7ce 100644 --- a/enabler/src/de/schildbach/pte/VvsProvider.java +++ b/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() { diff --git a/enabler/src/de/schildbach/pte/VvtProvider.java b/enabler/src/de/schildbach/pte/VvtProvider.java index eec830a8..b816eb6e 100644 --- a/enabler/src/de/schildbach/pte/VvtProvider.java +++ b/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; - } } diff --git a/enabler/src/de/schildbach/pte/VvvProvider.java b/enabler/src/de/schildbach/pte/VvvProvider.java index 7acc992e..c4061290 100644 --- a/enabler/src/de/schildbach/pte/VvvProvider.java +++ b/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) diff --git a/enabler/src/de/schildbach/pte/WienProvider.java b/enabler/src/de/schildbach/pte/WienProvider.java index aa940a86..03b3a728 100644 --- a/enabler/src/de/schildbach/pte/WienProvider.java +++ b/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 STYLES = new HashMap(); static diff --git a/enabler/src/de/schildbach/pte/ZvvProvider.java b/enabler/src/de/schildbach/pte/ZvvProvider.java index 30ab64dc..61060895 100644 --- a/enabler/src/de/schildbach/pte/ZvvProvider.java +++ b/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) { diff --git a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java index e15dad1c..f9e51aab 100644 --- a/enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java +++ b/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 {