From 98ceed52f88bf7edba4f94e70f9f2bf95c10e53e Mon Sep 17 00:00:00 2001 From: "andreas.schildbach" Date: Sun, 17 Oct 2010 21:49:06 +0000 Subject: [PATCH] renamed VbbProvider to BvgProvider git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@311 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- .../pte/{VbbProvider.java => BvgProvider.java} | 10 +++++----- .../pte/{VbbProviderTest.java => BvgProviderTest.java} | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) rename src/de/schildbach/pte/{VbbProvider.java => BvgProvider.java} (99%) rename test/de/schildbach/pte/{VbbProviderTest.java => BvgProviderTest.java} (96%) diff --git a/src/de/schildbach/pte/VbbProvider.java b/src/de/schildbach/pte/BvgProvider.java similarity index 99% rename from src/de/schildbach/pte/VbbProvider.java rename to src/de/schildbach/pte/BvgProvider.java index 4562c08b..aa774ce6 100644 --- a/src/de/schildbach/pte/VbbProvider.java +++ b/src/de/schildbach/pte/BvgProvider.java @@ -46,7 +46,7 @@ import de.schildbach.pte.util.ParserUtils; /** * @author Andreas Schildbach */ -public final class VbbProvider implements NetworkProvider +public final class BvgProvider implements NetworkProvider { public static final String NETWORK_ID = "mobil.bvg.de"; @@ -109,10 +109,10 @@ public final class VbbProvider implements NetworkProvider uri.append("http://mobil.bvg.de/Fahrinfo/bin/query.bin/dox"); uri.append("?REQ0HafasInitialSelection=0"); - appendLocationVbb(uri, from, "S0", "SID"); - appendLocationVbb(uri, to, "Z0", "ZID"); + appendLocationBvg(uri, from, "S0", "SID"); + appendLocationBvg(uri, to, "Z0", "ZID"); if (via != null) - appendLocationVbb(uri, via, "1", null); + appendLocationBvg(uri, via, "1", null); uri.append("&REQ0HafasSearchForw=").append(dep ? "1" : "0"); uri.append("&REQ0JourneyDate=").append(ParserUtils.urlEncode(DATE_FORMAT.format(date))); @@ -142,7 +142,7 @@ public final class VbbProvider implements NetworkProvider return uri.toString(); } - private static final void appendLocationVbb(final StringBuilder uri, final Location location, final String paramSuffix, final String paramWgs) + private static final void appendLocationBvg(final StringBuilder uri, final Location location, final String paramSuffix, final String paramWgs) { if (location.type == LocationType.ADDRESS && location.lat != 0 && location.lon != 0 && paramWgs != null) { diff --git a/test/de/schildbach/pte/VbbProviderTest.java b/test/de/schildbach/pte/BvgProviderTest.java similarity index 96% rename from test/de/schildbach/pte/VbbProviderTest.java rename to test/de/schildbach/pte/BvgProviderTest.java index 8e2d3ffb..d694e527 100644 --- a/test/de/schildbach/pte/VbbProviderTest.java +++ b/test/de/schildbach/pte/BvgProviderTest.java @@ -26,7 +26,7 @@ import org.junit.Test; /** * @author Andreas Schildbach */ -public class VbbProviderTest +public class BvgProviderTest { @Test public void footwayWithLink() @@ -90,7 +90,7 @@ public class VbbProviderTest private void assertFineConnectionDetails(String s) { - Matcher m = VbbProvider.P_CONNECTION_DETAILS_FINE.matcher(s); + Matcher m = BvgProvider.P_CONNECTION_DETAILS_FINE.matcher(s); assertTrue(m.matches()); // ParserUtils.printGroups(m); }