From 670a63e0f9f11bded3da3c49f772164b5124cddc Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 23 Sep 2016 19:11:01 +0200 Subject: [PATCH] Rename FrenchSouthWestProvider to FranceSouthWestProvider and NetworkId.FRENCHSOUTHWEST to NetworkId.FRANCESOUTHWEST. This is done to be consistent with the other France providers. --- ...hWestProvider.java => FranceSouthWestProvider.java} | 10 +++++----- enabler/src/de/schildbach/pte/NetworkId.java | 2 +- ...eTest.java => FranceSouthWestProviderLiveTest.java} | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) rename enabler/src/de/schildbach/pte/{FrenchSouthWestProvider.java => FranceSouthWestProvider.java} (88%) rename enabler/test/de/schildbach/pte/live/{FrenchSouthWestProviderLiveTest.java => FranceSouthWestProviderLiveTest.java} (95%) diff --git a/enabler/src/de/schildbach/pte/FrenchSouthWestProvider.java b/enabler/src/de/schildbach/pte/FranceSouthWestProvider.java similarity index 88% rename from enabler/src/de/schildbach/pte/FrenchSouthWestProvider.java rename to enabler/src/de/schildbach/pte/FranceSouthWestProvider.java index 4aa6c659..137e7755 100644 --- a/enabler/src/de/schildbach/pte/FrenchSouthWestProvider.java +++ b/enabler/src/de/schildbach/pte/FranceSouthWestProvider.java @@ -24,17 +24,17 @@ import de.schildbach.pte.dto.Style.Shape; /** * @author Nicolas Derive */ -public class FrenchSouthWestProvider extends AbstractNavitiaProvider { +public class FranceSouthWestProvider extends AbstractNavitiaProvider { private static String API_REGION = "fr-sw"; - public FrenchSouthWestProvider(final String apiBase, final String authorization) { - super(NetworkId.FRENCHSOUTHWEST, apiBase, authorization); + public FranceSouthWestProvider(final String apiBase, final String authorization) { + super(NetworkId.FRANCESOUTHWEST, apiBase, authorization); setTimeZone("Europe/Paris"); } - public FrenchSouthWestProvider(final String authorization) { - super(NetworkId.FRENCHSOUTHWEST, authorization); + public FranceSouthWestProvider(final String authorization) { + super(NetworkId.FRANCESOUTHWEST, authorization); setTimeZone("Europe/Paris"); } diff --git a/enabler/src/de/schildbach/pte/NetworkId.java b/enabler/src/de/schildbach/pte/NetworkId.java index 5b72ec7e..57996e3e 100644 --- a/enabler/src/de/schildbach/pte/NetworkId.java +++ b/enabler/src/de/schildbach/pte/NetworkId.java @@ -34,7 +34,7 @@ public enum NetworkId { SBB, BVB, VBL, ZVV, // France - PACA, PARIS, FRENCHSOUTHWEST, FRANCESOUTHEAST, FRANCENORTHWEST, FRANCENORTHEAST, + PACA, PARIS, FRANCESOUTHWEST, FRANCESOUTHEAST, FRANCENORTHWEST, FRANCENORTHEAST, // Belgium SNCB, diff --git a/enabler/test/de/schildbach/pte/live/FrenchSouthWestProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/FranceSouthWestProviderLiveTest.java similarity index 95% rename from enabler/test/de/schildbach/pte/live/FrenchSouthWestProviderLiveTest.java rename to enabler/test/de/schildbach/pte/live/FranceSouthWestProviderLiveTest.java index bea03718..c3424051 100644 --- a/enabler/test/de/schildbach/pte/live/FrenchSouthWestProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/FranceSouthWestProviderLiveTest.java @@ -21,15 +21,15 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import de.schildbach.pte.FrenchSouthWestProvider; +import de.schildbach.pte.FranceSouthWestProvider; import de.schildbach.pte.dto.Point; /** * @author Nicolas Derive */ -public class FrenchSouthWestProviderLiveTest extends AbstractNavitiaProviderLiveTest { - public FrenchSouthWestProviderLiveTest() { - super(new FrenchSouthWestProvider(secretProperty("navitia.authorization"))); +public class FranceSouthWestProviderLiveTest extends AbstractNavitiaProviderLiveTest { + public FranceSouthWestProviderLiveTest() { + super(new FranceSouthWestProvider(secretProperty("navitia.authorization"))); } @Test