aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-07-30 10:52:22 +0200
committerSamuel Tardieu <sam@rfc1149.net>2014-07-30 11:03:01 +0200
commit583b227309e2a48894ea4496695c38f684361e65 (patch)
treeff74028c50fba5caabefda5a33a2ca9d8242b4da
parent68de6a122e82c438b932e24652e7b30ae9e902e2 (diff)
downloadcgeo-583b227309e2a48894ea4496695c38f684361e65.zip
cgeo-583b227309e2a48894ea4496695c38f684361e65.tar.gz
cgeo-583b227309e2a48894ea4496695c38f684361e65.tar.bz2
Move Google maps v1 files to package cgeo.geocaching.maps.google.v1
Hopefully this will make someone motivated to create the .v2 alternative.
-rw-r--r--main/AndroidManifest.xml2
-rw-r--r--main/res/layout/map_google.xml2
-rw-r--r--main/src/cgeo/geocaching/maps/MapProviderFactory.java2
-rw-r--r--main/src/cgeo/geocaching/maps/google/v1/GoogleCacheOverlay.java (renamed from main/src/cgeo/geocaching/maps/google/GoogleCacheOverlay.java)2
-rw-r--r--main/src/cgeo/geocaching/maps/google/v1/GoogleCacheOverlayItem.java (renamed from main/src/cgeo/geocaching/maps/google/GoogleCacheOverlayItem.java)2
-rw-r--r--main/src/cgeo/geocaching/maps/google/v1/GoogleGeoPoint.java (renamed from main/src/cgeo/geocaching/maps/google/GoogleGeoPoint.java)2
-rw-r--r--main/src/cgeo/geocaching/maps/google/v1/GoogleMapActivity.java (renamed from main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java)2
-rw-r--r--main/src/cgeo/geocaching/maps/google/v1/GoogleMapController.java (renamed from main/src/cgeo/geocaching/maps/google/GoogleMapController.java)2
-rw-r--r--main/src/cgeo/geocaching/maps/google/v1/GoogleMapItemFactory.java (renamed from main/src/cgeo/geocaching/maps/google/GoogleMapItemFactory.java)2
-rw-r--r--main/src/cgeo/geocaching/maps/google/v1/GoogleMapProjection.java (renamed from main/src/cgeo/geocaching/maps/google/GoogleMapProjection.java)2
-rw-r--r--main/src/cgeo/geocaching/maps/google/v1/GoogleMapProvider.java (renamed from main/src/cgeo/geocaching/maps/google/GoogleMapProvider.java)2
-rw-r--r--main/src/cgeo/geocaching/maps/google/v1/GoogleMapView.java (renamed from main/src/cgeo/geocaching/maps/google/GoogleMapView.java)2
-rw-r--r--main/src/cgeo/geocaching/maps/google/v1/GoogleOverlay.java (renamed from main/src/cgeo/geocaching/maps/google/GoogleOverlay.java)2
-rw-r--r--main/src/cgeo/geocaching/settings/Settings.java2
14 files changed, 14 insertions, 14 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index fe86b15..de91a06 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -206,7 +206,7 @@
</intent-filter>
</activity>
<activity
- android:name=".maps.google.GoogleMapActivity"
+ android:name=".maps.google.v1.GoogleMapActivity"
android:label="@string/map_map" >
</activity>
<activity
diff --git a/main/res/layout/map_google.xml b/main/res/layout/map_google.xml
index 471c2b8..85f550a 100644
--- a/main/res/layout/map_google.xml
+++ b/main/res/layout/map_google.xml
@@ -35,7 +35,7 @@
android:id="@+id/map"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- class="cgeo.geocaching.maps.google.GoogleMapView"
+ class="cgeo.geocaching.maps.google.v1.GoogleMapView"
android:apiKey="@string/maps_api_key"
android:clickable="true"
android:enabled="true"
diff --git a/main/src/cgeo/geocaching/maps/MapProviderFactory.java b/main/src/cgeo/geocaching/maps/MapProviderFactory.java
index b31ba1e..dd4ff0f 100644
--- a/main/src/cgeo/geocaching/maps/MapProviderFactory.java
+++ b/main/src/cgeo/geocaching/maps/MapProviderFactory.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.maps;
import cgeo.geocaching.CgeoApplication;
import cgeo.geocaching.R;
-import cgeo.geocaching.maps.google.GoogleMapProvider;
+import cgeo.geocaching.maps.google.v1.GoogleMapProvider;
import cgeo.geocaching.maps.interfaces.MapProvider;
import cgeo.geocaching.maps.interfaces.MapSource;
import cgeo.geocaching.maps.mapsforge.MapsforgeMapProvider;
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlay.java b/main/src/cgeo/geocaching/maps/google/v1/GoogleCacheOverlay.java
index d14c687..9b18c2d 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlay.java
+++ b/main/src/cgeo/geocaching/maps/google/v1/GoogleCacheOverlay.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.maps.google;
+package cgeo.geocaching.maps.google.v1;
import cgeo.geocaching.maps.CachesOverlay;
import cgeo.geocaching.maps.interfaces.ItemizedOverlayImpl;
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlayItem.java b/main/src/cgeo/geocaching/maps/google/v1/GoogleCacheOverlayItem.java
index b26654a..463aae9 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlayItem.java
+++ b/main/src/cgeo/geocaching/maps/google/v1/GoogleCacheOverlayItem.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.maps.google;
+package cgeo.geocaching.maps.google.v1;
import cgeo.geocaching.IWaypoint;
import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl;
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleGeoPoint.java b/main/src/cgeo/geocaching/maps/google/v1/GoogleGeoPoint.java
index d5f6385..2f540ad 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleGeoPoint.java
+++ b/main/src/cgeo/geocaching/maps/google/v1/GoogleGeoPoint.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.maps.google;
+package cgeo.geocaching.maps.google.v1;
import cgeo.geocaching.geopoint.Geopoint;
import cgeo.geocaching.maps.interfaces.GeoPointImpl;
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java b/main/src/cgeo/geocaching/maps/google/v1/GoogleMapActivity.java
index 2a29cc9..374e7b0 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
+++ b/main/src/cgeo/geocaching/maps/google/v1/GoogleMapActivity.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.maps.google;
+package cgeo.geocaching.maps.google.v1;
import cgeo.geocaching.activity.ActivityMixin;
import cgeo.geocaching.activity.FilteredActivity;
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapController.java b/main/src/cgeo/geocaching/maps/google/v1/GoogleMapController.java
index 096cd61..ea95676 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleMapController.java
+++ b/main/src/cgeo/geocaching/maps/google/v1/GoogleMapController.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.maps.google;
+package cgeo.geocaching.maps.google.v1;
import cgeo.geocaching.maps.interfaces.GeoPointImpl;
import cgeo.geocaching.maps.interfaces.MapControllerImpl;
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapItemFactory.java b/main/src/cgeo/geocaching/maps/google/v1/GoogleMapItemFactory.java
index c708dc5..d7e9380 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleMapItemFactory.java
+++ b/main/src/cgeo/geocaching/maps/google/v1/GoogleMapItemFactory.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.maps.google;
+package cgeo.geocaching.maps.google.v1;
import cgeo.geocaching.IWaypoint;
import cgeo.geocaching.geopoint.Geopoint;
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapProjection.java b/main/src/cgeo/geocaching/maps/google/v1/GoogleMapProjection.java
index dc694b8..901a369 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleMapProjection.java
+++ b/main/src/cgeo/geocaching/maps/google/v1/GoogleMapProjection.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.maps.google;
+package cgeo.geocaching.maps.google.v1;
import cgeo.geocaching.maps.interfaces.GeoPointImpl;
import cgeo.geocaching.maps.interfaces.MapProjectionImpl;
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapProvider.java b/main/src/cgeo/geocaching/maps/google/v1/GoogleMapProvider.java
index 38d7d96..884e076 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleMapProvider.java
+++ b/main/src/cgeo/geocaching/maps/google/v1/GoogleMapProvider.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.maps.google;
+package cgeo.geocaching.maps.google.v1;
import cgeo.geocaching.CgeoApplication;
import cgeo.geocaching.R;
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapView.java b/main/src/cgeo/geocaching/maps/google/v1/GoogleMapView.java
index ea815ab..c611790 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleMapView.java
+++ b/main/src/cgeo/geocaching/maps/google/v1/GoogleMapView.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.maps.google;
+package cgeo.geocaching.maps.google.v1;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleOverlay.java b/main/src/cgeo/geocaching/maps/google/v1/GoogleOverlay.java
index c684b9a..40a5539 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleOverlay.java
+++ b/main/src/cgeo/geocaching/maps/google/v1/GoogleOverlay.java
@@ -1,4 +1,4 @@
-package cgeo.geocaching.maps.google;
+package cgeo.geocaching.maps.google.v1;
import cgeo.geocaching.maps.PositionAndScaleOverlay;
import cgeo.geocaching.maps.interfaces.GeneralOverlay;
diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java
index 23293d2..01ebd6f 100644
--- a/main/src/cgeo/geocaching/settings/Settings.java
+++ b/main/src/cgeo/geocaching/settings/Settings.java
@@ -13,7 +13,7 @@ import cgeo.geocaching.enumerations.LogType;
import cgeo.geocaching.geopoint.Geopoint;
import cgeo.geocaching.list.StoredList;
import cgeo.geocaching.maps.MapProviderFactory;
-import cgeo.geocaching.maps.google.GoogleMapProvider;
+import cgeo.geocaching.maps.google.v1.GoogleMapProvider;
import cgeo.geocaching.maps.interfaces.GeoPointImpl;
import cgeo.geocaching.maps.interfaces.MapProvider;
import cgeo.geocaching.maps.interfaces.MapSource;