1 files changed, 13 insertions, 13 deletions

diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 6ffdd63..f354374 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -2,14 +2,14 @@ package cgeo.geocaching.maps;
 
 import cgeo.geocaching.R;
 import cgeo.geocaching.Settings;
+import cgeo.geocaching.UpdateDirectionCallback;
+import cgeo.geocaching.UpdateLocationCallback;
 import cgeo.geocaching.cgBase;
 import cgeo.geocaching.cgCache;
 import cgeo.geocaching.cgCoord;
 import cgeo.geocaching.cgDirection;
 import cgeo.geocaching.cgGeo;
 import cgeo.geocaching.cgSearch;
-import cgeo.geocaching.cgUpdateDir;
-import cgeo.geocaching.cgUpdateLoc;
 import cgeo.geocaching.cgWaypoint;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.cgeocaches;
@@ -99,8 +99,8 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory
     private cgeoapplication app = null;
     private cgGeo geo = null;
     private cgDirection dir = null;
-    private cgUpdateLoc geoUpdate = new UpdateLoc();
-    private cgUpdateDir dirUpdate = new UpdateDir();
+    private UpdateLocationCallback geoUpdate = new UpdateLoc();
+    private UpdateDirectionCallback dirUpdate = new UpdateDir();
     // from intent
     private boolean fromDetailIntent = false;
     private cgSearch searchIntent = null;
@@ -347,10 +347,10 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory
 
         // start location and directory services
         if (geo != null) {
-            geoUpdate.updateLoc(geo);
+            geoUpdate.updateLocation(geo);
         }
         if (dir != null) {
-            dirUpdate.updateDir(dir);
+            dirUpdate.updateDirection(dir);
         }
 
         // get parameters
@@ -423,10 +423,10 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory
             dir = app.startDir(activity, dirUpdate);
         }
 
-        geoUpdate.updateLoc(geo);
+        geoUpdate.updateLocation(geo);
 
         if (dir != null) {
-            dirUpdate.updateDir(dir);
+            dirUpdate.updateDirection(dir);
         }
 
         startTimer();
@@ -524,7 +524,7 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory
 
         menu.add(0, MENU_MAP_LIVE, 0, res.getString(R.string.map_live_disable)).setIcon(R.drawable.ic_menu_refresh);
         menu.add(0, MENU_STORE_CACHES, 0, res.getString(R.string.caches_store_offline)).setIcon(android.R.drawable.ic_menu_set_as).setEnabled(false);
-        menu.add(0, MENU_TRAIL_MODE, 0, res.getString(R.string.map_trail_hide)).setIcon(android.R.drawable.ic_menu_recent_history);
+        menu.add(0, MENU_TRAIL_MODE, 0, res.getString(R.string.map_trail_hide)).setIcon(R.drawable.ic_menu_trail);
         menu.add(0, MENU_CIRCLE_MODE, 0, res.getString(R.string.map_circles_hide)).setIcon(R.drawable.ic_menu_circle);
         menu.add(0, MENU_AS_LIST, 0, res.getString(R.string.map_as_list)).setIcon(android.R.drawable.ic_menu_agenda);
 
@@ -756,10 +756,10 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory
     }
 
     // class: update location
-    private class UpdateLoc extends cgUpdateLoc {
+    private class UpdateLoc implements UpdateLocationCallback {
 
         @Override
-        public void updateLoc(cgGeo geo) {
+        public void updateLocation(cgGeo geo) {
             if (geo == null) {
                 return;
             }
@@ -803,10 +803,10 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory
     }
 
     // class: update direction
-    private class UpdateDir extends cgUpdateDir {
+    private class UpdateDir implements UpdateDirectionCallback {
 
         @Override
-        public void updateDir(cgDirection dir) {
+        public void updateDirection(cgDirection dir) {
             if (dir == null || dir.directionNow == null) {
                 return;
             }