multiple code cleanups

* unused imports
* remove author comment
* restrict access
* fix StaticMapsActivity code generation cycle (it should not contain
references to classes which are generated by the annotation processor
from itself)

1 files changed, 6 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java b/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java
index c42c2a2..a2a5803 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/AbstractStaticMapsApp.java
@@ -4,7 +4,7 @@ import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.ILogable;
 import cgeo.geocaching.R;
-import cgeo.geocaching.StaticMapsActivity;
+import cgeo.geocaching.StaticMapsActivity_;
 import cgeo.geocaching.StaticMapsProvider;
 import cgeo.geocaching.Waypoint;
 import cgeo.geocaching.activity.ActivityMixin;
@@ -49,7 +49,11 @@ abstract class AbstractStaticMapsApp extends AbstractApp implements CacheNavigat
         }
         final String geocode = StringUtils.upperCase(logable.getGeocode());
 
-        StaticMapsActivity.startActivity(activity, geocode, download, waypoint);
+        StaticMapsActivity_.IntentBuilder_ builder = StaticMapsActivity_.intent(activity).geocode(geocode).download(download);
+        if (waypoint != null) {
+            builder.waypointId(waypoint.getId());
+        }
+        builder.start();
         return true;
     }
 }