merge upstream

1 files changed, 6 insertions, 6 deletions

diff --git a/main/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java b/main/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java
index 4dbb46c..1eefdec 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/RMapsApp.java
@@ -3,8 +3,8 @@ package cgeo.geocaching.apps.cache.navi;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.geopoint.Geopoint;
-import cgeo.geocaching.geopoint.GeopointFormatter.Format;
+import cgeo.geocaching.location.Geopoint;
+import cgeo.geocaching.location.GeopointFormatter.Format;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -20,11 +20,11 @@ class RMapsApp extends AbstractPointNavigationApp {
     }
 
     @Override
-    public void navigate(Activity activity, Waypoint waypoint) {
+    public void navigate(final Activity activity, final Waypoint waypoint) {
         navigate(activity, waypoint.getCoords(), waypoint.getLookup(), waypoint.getName());
     }
 
-    private static void navigate(Activity activity, Geopoint coords, String code, String name) {
+    private static void navigate(final Activity activity, final Geopoint coords, final String code, final String name) {
         final ArrayList<String> locations = new ArrayList<>();
         locations.add(coords.format(Format.LAT_LON_DECDEGREE_COMMA) + ";" + code + ";" + name);
         final Intent intent = new Intent(INTENT);
@@ -33,12 +33,12 @@ class RMapsApp extends AbstractPointNavigationApp {
     }
 
     @Override
-    public void navigate(Activity activity, Geocache cache) {
+    public void navigate(final Activity activity, final Geocache cache) {
         navigate(activity, cache.getCoords(), cache.getGeocode(), cache.getName());
     }
 
     @Override
-    public void navigate(Activity activity, Geopoint coords) {
+    public void navigate(final Activity activity, final Geopoint coords) {
         navigate(activity, coords, "", "");
     }
 }