code cleanup to reduce compiler warnings

* unused imports
* unused variables
* name clashes
* unspecified generics

11 files changed, 61 insertions, 72 deletions

diff --git a/src/cgeo/geocaching/cgDirection.java b/src/cgeo/geocaching/cgDirection.java
index daf5df6..09b943d 100644
--- a/src/cgeo/geocaching/cgDirection.java
+++ b/src/cgeo/geocaching/cgDirection.java
@@ -3,22 +3,17 @@ package cgeo.geocaching;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
-import android.hardware.SensorManager;
 import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
 import android.os.Build;
-import android.util.Log;
 import android.view.Display;
 import android.view.Surface;
 
 public class cgDirection {
-	private Resources res = null;
 	private cgDirection dir = null;
-	private cgeoapplication app = null;
 	private Context context = null;
-	private cgWarning warning = null;
 	private SensorManager sensorManager = null;
 	private cgeoSensorListener sensorListener = null;
 	private cgUpdateDir dirUpdate = null;
@@ -27,11 +22,8 @@ public class cgDirection {
 	public Double directionNow = null;
 
 	public cgDirection(cgeoapplication appIn, Context contextIn, cgUpdateDir dirUpdateIn, cgWarning warningIn) {
-		app = appIn;
 		context = contextIn;
 		dirUpdate = dirUpdateIn;
-		warning = warningIn;
-		res = context.getResources();
 
 		try {
 			final int sdk = new Integer(Build.VERSION.SDK).intValue();
diff --git a/src/cgeo/geocaching/cgeo.java b/src/cgeo/geocaching/cgeo.java
index 67ff74a..5ab26ab 100644
--- a/src/cgeo/geocaching/cgeo.java
+++ b/src/cgeo/geocaching/cgeo.java
@@ -1,17 +1,17 @@
 package cgeo.geocaching;
 
-import gnu.android.app.appmanualclient.*;
+import gnu.android.app.appmanualclient.AppManualReaderClient;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map.Entry;
 
-import android.os.Bundle;
-import android.os.Handler;
 import android.app.Activity;
-import android.view.View;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.Button;
-import android.widget.TextView;
-import android.content.Intent;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -19,18 +19,18 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.location.Address;
 import android.location.Geocoder;
+import android.os.Bundle;
+import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 import android.view.ContextMenu;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map.Entry;
+import android.widget.TextView;
 
 public class cgeo extends Activity {
 
@@ -199,7 +199,7 @@ public class cgeo extends Activity {
 	@Override
 	public void onResume() {
 		super.onResume();
-		
+
 		settings.load();
 		init();
 	}
@@ -285,7 +285,7 @@ public class cgeo extends Activity {
 		menu.add(1, 3, 0, res.getString(R.string.mystery));
 
 		// then add all other cache types sorted alphabetically
-		HashMap<String, String> allTypes = (HashMap<String, String>) base.cacheTypesInv.clone();
+		HashMap<String, String> allTypes = (HashMap<String, String>) cgBase.cacheTypesInv.clone();
 		allTypes.remove("traditional");
 		allTypes.remove("multi");
 		allTypes.remove("mystery");
diff --git a/src/cgeo/geocaching/cgeocaches.java b/src/cgeo/geocaching/cgeocaches.java
index bf0fb29..18a24e2 100644
--- a/src/cgeo/geocaching/cgeocaches.java
+++ b/src/cgeo/geocaching/cgeocaches.java
@@ -93,7 +93,7 @@ public class cgeocaches extends ListActivity {
 	private cgGeo geo = null;
 	private cgDirection dir = null;
 	private cgUpdateLoc geoUpdate = new update();
-	private cgUpdateDir dirUpdate = new updateDir();
+	private cgUpdateDir dirUpdate = new UpdateDirection();
 	private String title = "";
 	private int detailTotal = 0;
 	private int detailProgress = 0;
@@ -1618,7 +1618,7 @@ public class cgeocaches extends ListActivity {
 		}
 	}
 
-	private class updateDir extends cgUpdateDir {
+	private class UpdateDirection extends cgUpdateDir {
 
 		@Override
 		public void updateDir(cgDirection dir) {
diff --git a/src/cgeo/geocaching/cgeonavigate.java b/src/cgeo/geocaching/cgeonavigate.java
index 65afa17..7640a0e 100644
--- a/src/cgeo/geocaching/cgeonavigate.java
+++ b/src/cgeo/geocaching/cgeonavigate.java
@@ -36,7 +36,7 @@ public class cgeonavigate extends Activity {
 	private cgGeo geo = null;
 	private cgDirection dir = null;
 	private cgUpdateLoc geoUpdate = new update();
-	private cgUpdateDir dirUpdate = new updateDir();
+	private cgUpdateDir dirUpdate = new UpdateDirection();
 	private Double dstLatitude = null;
 	private Double dstLongitude = null;
 	private Double cacheHeading = new Double(0);
@@ -447,7 +447,7 @@ public class cgeonavigate extends Activity {
 		}
 	}
 
-	private class updateDir extends cgUpdateDir {
+	private class UpdateDirection extends cgUpdateDir {
 
 		@Override
 		public void updateDir(cgDirection dir) {
diff --git a/src/cgeo/geocaching/cgeosmaps.java b/src/cgeo/geocaching/cgeosmaps.java
index 9979ab5..02d7c2f 100644
--- a/src/cgeo/geocaching/cgeosmaps.java
+++ b/src/cgeo/geocaching/cgeosmaps.java
@@ -58,14 +58,11 @@ public class cgeosmaps extends Activity {
 					}
 					smapsView.removeAllViews();
 
-					int cnt = 1;
 					for (Bitmap image : maps) {
 						if (image != null) {
 							final ImageView map = (ImageView) inflater.inflate(R.layout.map_static_item, null);
 							map.setImageBitmap(image);
 							smapsView.addView(map);
-							
-							cnt++;
 						}
 					}
 				}
@@ -122,7 +119,7 @@ public class cgeosmaps extends Activity {
 	@Override
 	public void onResume() {
 		super.onResume();
-		
+
 		settings.load();
 	}
 
diff --git a/src/cgeo/geocaching/googlemaps/googleMapFactory.java b/src/cgeo/geocaching/googlemaps/googleMapFactory.java
index 86e75a0..28bfca5 100644
--- a/src/cgeo/geocaching/googlemaps/googleMapFactory.java
+++ b/src/cgeo/geocaching/googlemaps/googleMapFactory.java
@@ -7,14 +7,16 @@ import cgeo.geocaching.cgUser;
 import cgeo.geocaching.mapinterfaces.CacheOverlayItemImpl;
 import cgeo.geocaching.mapinterfaces.GeoPointImpl;
 import cgeo.geocaching.mapinterfaces.MapFactory;
-import cgeo.geocaching.mapinterfaces.OverlayImpl;
 import cgeo.geocaching.mapinterfaces.OverlayBase;
+import cgeo.geocaching.mapinterfaces.OverlayImpl;
 import cgeo.geocaching.mapinterfaces.UserOverlayItemImpl;
 
+import com.google.android.maps.MapActivity;
+
 public class googleMapFactory implements MapFactory{
 
 	@Override
-	public Class getMapClass() {
+	public Class<?extends MapActivity> getMapClass() {
 		return googleMapActivity.class;
 	}
 
@@ -38,7 +40,7 @@ public class googleMapFactory implements MapFactory{
 		googleOverlay baseOvl = new googleOverlay(ovlIn);
 		return baseOvl;
 	}
-	
+
 	@Override
 	public CacheOverlayItemImpl getCacheOverlayItem(cgCoord coordinate, String type) {
 		googleCacheOverlayItem baseItem = new googleCacheOverlayItem(coordinate, type);
diff --git a/src/cgeo/geocaching/mapcommon/cgMapOverlay.java b/src/cgeo/geocaching/mapcommon/cgMapOverlay.java
index 7433ccb..79622cd 100644
--- a/src/cgeo/geocaching/mapcommon/cgMapOverlay.java
+++ b/src/cgeo/geocaching/mapcommon/cgMapOverlay.java
@@ -1,10 +1,12 @@
 package cgeo.geocaching.mapcommon;
 
+import java.util.ArrayList;
+
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
-import android.content.Intent;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
@@ -20,17 +22,13 @@ import cgeo.geocaching.cgeodetail;
 import cgeo.geocaching.cgeonavigate;
 import cgeo.geocaching.cgeopopup;
 import cgeo.geocaching.cgeowaypoint;
+import cgeo.geocaching.mapinterfaces.CacheOverlayItemImpl;
 import cgeo.geocaching.mapinterfaces.GeoPointImpl;
 import cgeo.geocaching.mapinterfaces.ItemizedOverlayImpl;
 import cgeo.geocaching.mapinterfaces.MapFactory;
 import cgeo.geocaching.mapinterfaces.MapProjectionImpl;
-import cgeo.geocaching.mapinterfaces.OverlayBase;
 import cgeo.geocaching.mapinterfaces.MapViewImpl;
-import cgeo.geocaching.mapinterfaces.CacheOverlayItemImpl;
-
-import java.util.ArrayList;
-
-import org.mapsforge.android.maps.Projection;
+import cgeo.geocaching.mapinterfaces.OverlayBase;
 
 public class cgMapOverlay extends ItemizedOverlayBase implements OverlayBase {
 
@@ -55,11 +53,11 @@ public class cgMapOverlay extends ItemizedOverlayBase implements OverlayBase {
 		context = contextIn;
 		fromDetail = fromDetailIn;
 	}
-	
+
 	public void updateItems(CacheOverlayItemImpl item) {
 		ArrayList<CacheOverlayItemImpl> itemsPre = new ArrayList<CacheOverlayItemImpl>();
 		itemsPre.add(item);
-		
+
 		updateItems(itemsPre);
 	}
 
@@ -73,15 +71,15 @@ public class cgMapOverlay extends ItemizedOverlayBase implements OverlayBase {
 		}
 
 //		items.clear();
-		
+
 //		if (itemsPre.size() > 0) {
 			items = (ArrayList<CacheOverlayItemImpl>) itemsPre.clone();
 //		}
-		
+
 		setLastFocusedItemIndex(-1); // to reset tap during data change
 		populate();
 	}
-	
+
 	public boolean getCircles() {
 		return displayCircles;
 	}
@@ -94,23 +92,23 @@ public class cgMapOverlay extends ItemizedOverlayBase implements OverlayBase {
 	public void draw(Canvas canvas, MapViewImpl mapView, boolean shadow) {
 
 		drawInternal(canvas, mapView.getMapProjection());
-		
+
 		super.draw(canvas, mapView, false);
 	}
-	
+
 	@Override
 	public void drawOverlayBitmap(Canvas canvas, Point drawPosition,
 			MapProjectionImpl projection, byte drawZoomLevel) {
-		
+
 		drawInternal(canvas, projection);
-		
+
 		super.drawOverlayBitmap(canvas, drawPosition, projection, drawZoomLevel);
 	}
-	
+
 	private void drawInternal(Canvas canvas, MapProjectionImpl projection) {
-		
+
 		MapFactory mapFactory = settings.getMapFactory();
-		
+
 		if (displayCircles) {
 			if (blockedCircle == null) {
 				blockedCircle = new Paint();
@@ -154,9 +152,9 @@ public class cgMapOverlay extends ItemizedOverlayBase implements OverlayBase {
 			}
 
 			canvas.setDrawFilter(remfil);
-		}		
+		}
 	}
-	
+
 	@Override
 	public boolean onTap(int index) {
 		try {
diff --git a/src/cgeo/geocaching/mapinterfaces/MapFactory.java b/src/cgeo/geocaching/mapinterfaces/MapFactory.java
index fe09626..620f673 100644
--- a/src/cgeo/geocaching/mapinterfaces/MapFactory.java
+++ b/src/cgeo/geocaching/mapinterfaces/MapFactory.java
@@ -1,18 +1,19 @@
 package cgeo.geocaching.mapinterfaces;
 
+import android.app.Activity;
 import android.content.Context;
 import cgeo.geocaching.cgCoord;
 import cgeo.geocaching.cgUser;
 
 /**
  * Defines functions of a factory class to get implementation specific objects
- * (GeoPoints, OverlayItems, ...) 
+ * (GeoPoints, OverlayItems, ...)
  * @author rsudev
  *
  */
 public interface MapFactory {
 
-	public Class getMapClass();
+	public Class<?extends Activity> getMapClass();
 
 	public int getMapViewId();
 
diff --git a/src/cgeo/geocaching/mapsforge/mfCacheOverlay.java b/src/cgeo/geocaching/mapsforge/mfCacheOverlay.java
index a7665cb..6333133 100644
--- a/src/cgeo/geocaching/mapsforge/mfCacheOverlay.java
+++ b/src/cgeo/geocaching/mapsforge/mfCacheOverlay.java
@@ -1,7 +1,6 @@
 package cgeo.geocaching.mapsforge;
 
 import org.mapsforge.android.maps.ItemizedOverlay;
-import org.mapsforge.android.maps.MapView;
 import org.mapsforge.android.maps.Projection;
 
 import android.content.Context;
@@ -23,7 +22,7 @@ public class mfCacheOverlay extends ItemizedOverlay<mfCacheOverlayItem> implemen
 		super(boundCenterBottom(markerIn));
 		base = new cgMapOverlay(settingsIn, this, contextIn, fromDetailIn);
 	}
-	
+
 	@Override
 	public cgMapOverlay getBase() {
 		return base;
@@ -49,7 +48,7 @@ public class mfCacheOverlay extends ItemizedOverlay<mfCacheOverlayItem> implemen
 	protected boolean onTap(int arg0) {
 		if (base == null)
 			return false;
-		
+
 		return base.onTap(arg0);
 	}
 
@@ -58,7 +57,7 @@ public class mfCacheOverlay extends ItemizedOverlay<mfCacheOverlayItem> implemen
 			Projection projection, byte drawZoomLevel) {
 		base.drawOverlayBitmap(canvas, drawPosition, new mfMapProjection(projection), drawZoomLevel);
 	}
-	
+
 	@Override
 	public void superPopulate() {
 		populate();
diff --git a/src/cgeo/geocaching/mapsforge/mfMapFactory.java b/src/cgeo/geocaching/mapsforge/mfMapFactory.java
index 2031187..fa665ec 100644
--- a/src/cgeo/geocaching/mapsforge/mfMapFactory.java
+++ b/src/cgeo/geocaching/mapsforge/mfMapFactory.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.mapsforge;
 
+import android.app.Activity;
 import android.content.Context;
 import cgeo.geocaching.R;
 import cgeo.geocaching.cgCoord;
@@ -14,7 +15,7 @@ import cgeo.geocaching.mapinterfaces.UserOverlayItemImpl;
 public class mfMapFactory implements MapFactory{
 
 	@Override
-	public Class getMapClass() {
+	public Class<?extends Activity> getMapClass() {
 		return mfMapActivity.class;
 	}
 
@@ -38,7 +39,7 @@ public class mfMapFactory implements MapFactory{
 		mfOverlay baseOvl = new mfOverlay(ovlIn);
 		return baseOvl;
 	}
-	
+
 	@Override
 	public CacheOverlayItemImpl getCacheOverlayItem(cgCoord coordinate, String type) {
 		mfCacheOverlayItem baseItem = new mfCacheOverlayItem(coordinate, type);
diff --git a/src/cgeo/geocaching/mapsforge/mfUsersOverlay.java b/src/cgeo/geocaching/mapsforge/mfUsersOverlay.java
index 64ccc37..8f3ba04 100644
--- a/src/cgeo/geocaching/mapsforge/mfUsersOverlay.java
+++ b/src/cgeo/geocaching/mapsforge/mfUsersOverlay.java
@@ -1,7 +1,6 @@
 package cgeo.geocaching.mapsforge;
 
 import org.mapsforge.android.maps.ItemizedOverlay;
-import org.mapsforge.android.maps.MapView;
 import org.mapsforge.android.maps.Projection;
 
 import android.content.Context;
@@ -21,7 +20,7 @@ public class mfUsersOverlay extends ItemizedOverlay<mfUsersOverlayItem> implemen
 		super(boundCenter(markerIn));
 		base = new cgUsersOverlay(this, contextIn);
 	}
-	
+
 	@Override
 	public cgUsersOverlay getBase() {
 		return base;
@@ -47,14 +46,14 @@ public class mfUsersOverlay extends ItemizedOverlay<mfUsersOverlayItem> implemen
 	protected boolean onTap(int arg0) {
 		if (base == null)
 			return false;
-		
+
 		return base.onTap(arg0);
 	}
 
 	@Override
 	protected void drawOverlayBitmap(Canvas canvas, Point drawPosition,
 			Projection projection, byte drawZoomLevel) {
-		
+
 		base.drawOverlayBitmap(canvas, drawPosition, new mfMapProjection(projection), drawZoomLevel);
 	}
 
@@ -91,7 +90,7 @@ public class mfUsersOverlay extends ItemizedOverlay<mfUsersOverlayItem> implemen
 	@Override
 	public void superDrawOverlayBitmap(Canvas canvas, Point drawPosition,
 			MapProjectionImpl projection, byte drawZoomLevel) {
-		
+
 		super.drawOverlayBitmap(canvas, drawPosition, (Projection) projection.getImpl(), drawZoomLevel);
 	}