Refactoring: remove redundant local variables

Redundant local variables are assigned once and only used to return the
value. Returning the value directly is as readable and more concise.

3 files changed, 6 insertions, 12 deletions

diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapItemFactory.java b/main/src/cgeo/geocaching/maps/google/GoogleMapItemFactory.java
index 0e18dce..1a10023 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleMapItemFactory.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapItemFactory.java
@@ -20,13 +20,11 @@ public class GoogleMapItemFactory implements MapItemFactory {
 
     @Override
     public CachesOverlayItemImpl getCachesOverlayItem(final IWaypoint coordinate, final CacheType type) {
-        GoogleCacheOverlayItem baseItem = new GoogleCacheOverlayItem(coordinate, type);
-        return baseItem;
+        return new GoogleCacheOverlayItem(coordinate, type);
     }
 
     @Override
     public OtherCachersOverlayItemImpl getOtherCachersOverlayItemBase(Context context, Go4CacheUser userOne) {
-        GoogleOtherCachersOverlayItem baseItem = new GoogleOtherCachersOverlayItem(context, userOne);
-        return baseItem;
+        return new GoogleOtherCachersOverlayItem(context, userOne);
     }
 }
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapItemFactory.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapItemFactory.java
index 5e86f81..0df7894 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapItemFactory.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapItemFactory.java
@@ -20,14 +20,12 @@ public class MapsforgeMapItemFactory implements MapItemFactory {
 
     @Override
     public CachesOverlayItemImpl getCachesOverlayItem(final IWaypoint coordinate, final CacheType type) {
-        MapsforgeCacheOverlayItem baseItem = new MapsforgeCacheOverlayItem(coordinate, type);
-        return baseItem;
+        return new MapsforgeCacheOverlayItem(coordinate, type);
     }
 
     @Override
     public OtherCachersOverlayItemImpl getOtherCachersOverlayItemBase(Context context, Go4CacheUser userOne) {
-        MapsforgeOtherCachersOverlayItem baseItem = new MapsforgeOtherCachersOverlayItem(context, userOne);
-        return baseItem;
+        return new MapsforgeOtherCachersOverlayItem(context, userOne);
     }
 
 }
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java
index 27cadd8..863cbca 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java
@@ -20,14 +20,12 @@ public class MapsforgeMapItemFactory024 implements MapItemFactory {
 
     @Override
     public CachesOverlayItemImpl getCachesOverlayItem(final IWaypoint coordinate, final CacheType type) {
-        MapsforgeCacheOverlayItem baseItem = new MapsforgeCacheOverlayItem(coordinate, type);
-        return baseItem;
+        return new MapsforgeCacheOverlayItem(coordinate, type);
     }
 
     @Override
     public OtherCachersOverlayItemImpl getOtherCachersOverlayItemBase(Context context, Go4CacheUser userOne) {
-        MapsforgeOtherCachersOverlayItem baseItem = new MapsforgeOtherCachersOverlayItem(context, userOne);
-        return baseItem;
+        return new MapsforgeOtherCachersOverlayItem(context, userOne);
     }
 
 }