diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index 7cac506b..80e9cae5 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -1464,7 +1464,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider return "
"; else - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } protected final String locationId(final Location location) diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java index e240202c..8fae81d8 100644 --- a/enabler/src/de/schildbach/pte/BahnProvider.java +++ b/enabler/src/de/schildbach/pte/BahnProvider.java @@ -152,7 +152,7 @@ public final class BahnProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java index 14b66de9..fa79c376 100644 --- a/enabler/src/de/schildbach/pte/BvgProvider.java +++ b/enabler/src/de/schildbach/pte/BvgProvider.java @@ -252,7 +252,7 @@ public final class BvgProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/DsbProvider.java b/enabler/src/de/schildbach/pte/DsbProvider.java index b35d550a..f4600074 100644 --- a/enabler/src/de/schildbach/pte/DsbProvider.java +++ b/enabler/src/de/schildbach/pte/DsbProvider.java @@ -131,7 +131,7 @@ public class DsbProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: '" + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: '" + location); } } diff --git a/enabler/src/de/schildbach/pte/EireannProvider.java b/enabler/src/de/schildbach/pte/EireannProvider.java index 98155051..e88fe1f2 100644 --- a/enabler/src/de/schildbach/pte/EireannProvider.java +++ b/enabler/src/de/schildbach/pte/EireannProvider.java @@ -113,7 +113,7 @@ public class EireannProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/InvgProvider.java b/enabler/src/de/schildbach/pte/InvgProvider.java index df320619..5a567362 100644 --- a/enabler/src/de/schildbach/pte/InvgProvider.java +++ b/enabler/src/de/schildbach/pte/InvgProvider.java @@ -109,7 +109,7 @@ public class InvgProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/JetProvider.java b/enabler/src/de/schildbach/pte/JetProvider.java index 4722ca31..629d10b7 100644 --- a/enabler/src/de/schildbach/pte/JetProvider.java +++ b/enabler/src/de/schildbach/pte/JetProvider.java @@ -132,7 +132,7 @@ public class JetProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/LuProvider.java b/enabler/src/de/schildbach/pte/LuProvider.java index b3769edf..b9f352f2 100644 --- a/enabler/src/de/schildbach/pte/LuProvider.java +++ b/enabler/src/de/schildbach/pte/LuProvider.java @@ -133,7 +133,7 @@ public class LuProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/enabler/src/de/schildbach/pte/NasaProvider.java index 4f02c30e..a9b64a3a 100644 --- a/enabler/src/de/schildbach/pte/NasaProvider.java +++ b/enabler/src/de/schildbach/pte/NasaProvider.java @@ -154,7 +154,7 @@ public class NasaProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/NriProvider.java b/enabler/src/de/schildbach/pte/NriProvider.java index f4c89d77..a844e630 100644 --- a/enabler/src/de/schildbach/pte/NriProvider.java +++ b/enabler/src/de/schildbach/pte/NriProvider.java @@ -149,7 +149,7 @@ public class NriProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/NsProvider.java b/enabler/src/de/schildbach/pte/NsProvider.java index 6079d7a3..a0ef9978 100644 --- a/enabler/src/de/schildbach/pte/NsProvider.java +++ b/enabler/src/de/schildbach/pte/NsProvider.java @@ -124,7 +124,7 @@ public class NsProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/NvvProvider.java b/enabler/src/de/schildbach/pte/NvvProvider.java index 5833f84a..27b3f162 100644 --- a/enabler/src/de/schildbach/pte/NvvProvider.java +++ b/enabler/src/de/schildbach/pte/NvvProvider.java @@ -175,7 +175,7 @@ public class NvvProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/enabler/src/de/schildbach/pte/OebbProvider.java index e4676222..e619a0f4 100644 --- a/enabler/src/de/schildbach/pte/OebbProvider.java +++ b/enabler/src/de/schildbach/pte/OebbProvider.java @@ -164,7 +164,7 @@ public class OebbProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/PlProvider.java b/enabler/src/de/schildbach/pte/PlProvider.java index d47af592..67c79500 100644 --- a/enabler/src/de/schildbach/pte/PlProvider.java +++ b/enabler/src/de/schildbach/pte/PlProvider.java @@ -150,7 +150,7 @@ public class PlProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/RtProvider.java b/enabler/src/de/schildbach/pte/RtProvider.java index abf54983..581fb553 100644 --- a/enabler/src/de/schildbach/pte/RtProvider.java +++ b/enabler/src/de/schildbach/pte/RtProvider.java @@ -118,7 +118,7 @@ public class RtProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/SbbProvider.java b/enabler/src/de/schildbach/pte/SbbProvider.java index b1af6c48..c2b71a24 100644 --- a/enabler/src/de/schildbach/pte/SbbProvider.java +++ b/enabler/src/de/schildbach/pte/SbbProvider.java @@ -115,7 +115,7 @@ public class SbbProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/SeProvider.java b/enabler/src/de/schildbach/pte/SeProvider.java index 8bf99f3b..e6bc7320 100644 --- a/enabler/src/de/schildbach/pte/SeProvider.java +++ b/enabler/src/de/schildbach/pte/SeProvider.java @@ -172,7 +172,7 @@ public class SeProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/SeptaProvider.java b/enabler/src/de/schildbach/pte/SeptaProvider.java index 2b5764e9..a498f2b2 100644 --- a/enabler/src/de/schildbach/pte/SeptaProvider.java +++ b/enabler/src/de/schildbach/pte/SeptaProvider.java @@ -132,7 +132,7 @@ public class SeptaProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/enabler/src/de/schildbach/pte/ShProvider.java index 5b24df97..d940ae8c 100644 --- a/enabler/src/de/schildbach/pte/ShProvider.java +++ b/enabler/src/de/schildbach/pte/ShProvider.java @@ -127,7 +127,7 @@ public class ShProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/SncbProvider.java b/enabler/src/de/schildbach/pte/SncbProvider.java index fae441db..4eb6c686 100644 --- a/enabler/src/de/schildbach/pte/SncbProvider.java +++ b/enabler/src/de/schildbach/pte/SncbProvider.java @@ -144,7 +144,7 @@ public class SncbProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/StockholmProvider.java b/enabler/src/de/schildbach/pte/StockholmProvider.java index a1081490..2e21db3b 100644 --- a/enabler/src/de/schildbach/pte/StockholmProvider.java +++ b/enabler/src/de/schildbach/pte/StockholmProvider.java @@ -161,7 +161,7 @@ public class StockholmProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/VbbProvider.java b/enabler/src/de/schildbach/pte/VbbProvider.java index 02e2fa30..791a1a9c 100644 --- a/enabler/src/de/schildbach/pte/VbbProvider.java +++ b/enabler/src/de/schildbach/pte/VbbProvider.java @@ -169,7 +169,7 @@ public class VbbProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: '" + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: '" + location); } } diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java index 46dd8fb5..7d4c516e 100644 --- a/enabler/src/de/schildbach/pte/VbnProvider.java +++ b/enabler/src/de/schildbach/pte/VbnProvider.java @@ -137,7 +137,7 @@ public class VbnProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/VgsProvider.java b/enabler/src/de/schildbach/pte/VgsProvider.java index 5244ae03..f477c889 100644 --- a/enabler/src/de/schildbach/pte/VgsProvider.java +++ b/enabler/src/de/schildbach/pte/VgsProvider.java @@ -140,7 +140,7 @@ public class VgsProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/ZvvProvider.java b/enabler/src/de/schildbach/pte/ZvvProvider.java index 017f7d22..07124523 100644 --- a/enabler/src/de/schildbach/pte/ZvvProvider.java +++ b/enabler/src/de/schildbach/pte/ZvvProvider.java @@ -180,7 +180,7 @@ public class ZvvProvider extends AbstractHafasProvider } else { - throw new IllegalArgumentException("cannot handle: " + location.toDebugString()); + throw new IllegalArgumentException("cannot handle: " + location); } } diff --git a/enabler/src/de/schildbach/pte/dto/Location.java b/enabler/src/de/schildbach/pte/dto/Location.java index a1f88790..5ec71fae 100644 --- a/enabler/src/de/schildbach/pte/dto/Location.java +++ b/enabler/src/de/schildbach/pte/dto/Location.java @@ -126,12 +126,7 @@ public final class Location implements Serializable @Override public String toString() { - return name; // invoked by AutoCompleteTextView in landscape orientation - } - - public String toDebugString() - { - return "[" + type + " " + id + " " + lat + "/" + lon + " " + (place != null ? "'" + place + "'" : "null") + " '" + name + "']"; + return "[" + type + " " + id + " " + lat + "/" + lon + " " + (place != null ? "\"" + place + "\"" : "null") + " \"" + name + "\"]"; } @Override diff --git a/enabler/src/de/schildbach/pte/dto/StationDepartures.java b/enabler/src/de/schildbach/pte/dto/StationDepartures.java index 129d1ebf..52f79854 100644 --- a/enabler/src/de/schildbach/pte/dto/StationDepartures.java +++ b/enabler/src/de/schildbach/pte/dto/StationDepartures.java @@ -42,7 +42,7 @@ public final class StationDepartures implements Serializable final StringBuilder builder = new StringBuilder(getClass().getName()); builder.append("["); if (location != null) - builder.append(location.toDebugString()); + builder.append(location); if (departures != null) builder.append(" ").append(departures.size()).append(" departures"); builder.append("]"); diff --git a/enabler/src/de/schildbach/pte/dto/Trip.java b/enabler/src/de/schildbach/pte/dto/Trip.java index 813758ec..64a0ea39 100644 --- a/enabler/src/de/schildbach/pte/dto/Trip.java +++ b/enabler/src/de/schildbach/pte/dto/Trip.java @@ -301,7 +301,7 @@ public final class Trip implements Serializable if (destination != null) { builder.append(","); - builder.append("destination=").append(destination.toDebugString()); + builder.append("destination=").append(destination); } builder.append(","); builder.append("departure=").append(departureStop); @@ -339,9 +339,9 @@ public final class Trip implements Serializable final StringBuilder builder = new StringBuilder(getClass().getName() + "["); builder.append("type=").append(type); builder.append(","); - builder.append("departure=").append(departure.toDebugString()); + builder.append("departure=").append(departure); builder.append(","); - builder.append("arrival=").append(arrival.toDebugString()); + builder.append("arrival=").append(arrival); builder.append(","); builder.append("distance=").append(distance); builder.append(","); diff --git a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java index 43c4c828..edebc91a 100644 --- a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java @@ -63,7 +63,7 @@ public abstract class AbstractProviderLiveTest { System.out.print(autocompletes.size() + " "); for (final Location autocomplete : autocompletes) - System.out.print(autocomplete.toDebugString() + " "); + System.out.print(autocomplete + " "); System.out.println(); }