Convert some fields to local variables

11 files changed, 12 insertions, 24 deletions

diff --git a/main/src/cgeo/geocaching/CacheCache.java b/main/src/cgeo/geocaching/CacheCache.java
index cce1943..1ada88c 100644
--- a/main/src/cgeo/geocaching/CacheCache.java
+++ b/main/src/cgeo/geocaching/CacheCache.java
@@ -23,14 +23,12 @@ public class CacheCache {
 
     private static final int MAX_CACHED_CACHES = 1000;
     final private LeastRecentlyUsedMap<String, cgCache> cachesCache;
-    final private RemoveHandler<cgCache> removeHandler;
 
     private static CacheCache instance = null;
 
     private CacheCache() {
         cachesCache = new LeastRecentlyUsedMap.LruCache<String, cgCache>(MAX_CACHED_CACHES);
-        removeHandler = new CacheRemoveHandler();
-        cachesCache.setRemoveHandler(removeHandler);
+        cachesCache.setRemoveHandler(new CacheRemoveHandler());
     }
 
     public static CacheCache getInstance() {
diff --git a/main/src/cgeo/geocaching/LiveMapInfo.java b/main/src/cgeo/geocaching/LiveMapInfo.java
index 3d6d110..822fbf6 100644
--- a/main/src/cgeo/geocaching/LiveMapInfo.java
+++ b/main/src/cgeo/geocaching/LiveMapInfo.java
@@ -9,8 +9,6 @@ import android.widget.CheckBox;
 
 public class LiveMapInfo extends AbstractActivity {
 
-    private int showCount;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -18,7 +16,7 @@ public class LiveMapInfo extends AbstractActivity {
         setTheme(R.style.transparent);
         setContentView(R.layout.livemapinfo);
 
-        showCount = Settings.getLiveMapHintShowCount();
+        final int showCount = Settings.getLiveMapHintShowCount();
 
         if (showCount > 2) {
             final CheckBox cb = (CheckBox) findViewById(R.id.live_map_hint_hide);
diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index a2fde26..989a2a5 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -71,7 +71,6 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D
     private LogType typeSelected = LogType.LOG_UNKNOWN;
     private int attempts = 0;
     private Button postButton = null;
-    private Button saveButton = null;
     private Button clearButton = null;
     private CheckBox tweetCheck = null;
     private LinearLayout tweetBox = null;
@@ -473,7 +472,7 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D
         tweetBox = (LinearLayout) findViewById(R.id.tweet_box);
         tweetCheck = (CheckBox) findViewById(R.id.tweet);
         clearButton = (Button) findViewById(R.id.clear);
-        saveButton = (Button) findViewById(R.id.save);
+        final Button saveButton = (Button) findViewById(R.id.save);
 
         possibleLogTypes = cache.getPossibleLogTypes();
 
diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/cgeo.java
index 8fa6f60..7ae235b 100644
--- a/main/src/cgeo/geocaching/cgeo.java
+++ b/main/src/cgeo/geocaching/cgeo.java
@@ -59,7 +59,6 @@ public class cgeo extends AbstractActivity {
 
     private int version = 0;
     private cgGeo geo = null;
-    private UpdateLocationCallback geoUpdate = null;
     private TextView filterTitle = null;
     private boolean cleanupRunning = false;
     private int countBubbleCnt = 0;
@@ -520,8 +519,7 @@ public class cgeo extends AbstractActivity {
         }
 
         if (geo == null) {
-            geoUpdate = new UpdateLocation();
-            geo = app.startGeo(geoUpdate);
+            geo = app.startGeo(new UpdateLocation());
         }
 
         final View findOnMap = findViewById(R.id.map);
diff --git a/main/src/cgeo/geocaching/cgeoadvsearch.java b/main/src/cgeo/geocaching/cgeoadvsearch.java
index 319ac96..4da0437 100644
--- a/main/src/cgeo/geocaching/cgeoadvsearch.java
+++ b/main/src/cgeo/geocaching/cgeoadvsearch.java
@@ -32,7 +32,6 @@ public class cgeoadvsearch extends AbstractActivity {
     private UpdateLocationCallback geoUpdate = new update();
     private EditText latEdit = null;
     private EditText lonEdit = null;
-    private String[] geocodesInCache = null;
 
     public cgeoadvsearch() {
         super("c:geo-search");
@@ -176,7 +175,7 @@ public class cgeoadvsearch extends AbstractActivity {
                 findByGeocodeFn();
             }
         });
-        geocodesInCache = app.geocodesInCache();
+        final String[] geocodesInCache = app.geocodesInCache();
         if (geocodesInCache != null) {
             final ArrayAdapter<String> geocodesAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_dropdown_item_1line, geocodesInCache);
             geocodeEdit.setAdapter(geocodesAdapter);
diff --git a/main/src/cgeo/geocaching/cgeocoords.java b/main/src/cgeo/geocaching/cgeocoords.java
index e6262b1..57fd144 100644
--- a/main/src/cgeo/geocaching/cgeocoords.java
+++ b/main/src/cgeo/geocaching/cgeocoords.java
@@ -42,8 +42,6 @@ public class cgeocoords extends Dialog {
     private TextView tLatSep1, tLatSep2, tLatSep3;
     private TextView tLonSep1, tLonSep2, tLonSep3;
 
-    private Spinner spinner;
-
     private CoordinateUpdate cuListener;
 
     private coordInputFormatEnum currentFormat = null;
@@ -83,7 +81,7 @@ public class cgeocoords extends Dialog {
             }
         });
 
-        spinner = (Spinner) findViewById(R.id.spinnerCoordinateFormats);
+        final Spinner spinner = (Spinner) findViewById(R.id.spinnerCoordinateFormats);
         final ArrayAdapter<CharSequence> adapter =
                 ArrayAdapter.createFromResource(context,
                         R.array.waypoint_coordinate_formats,
diff --git a/main/src/cgeo/geocaching/cgeotouch.java b/main/src/cgeo/geocaching/cgeotouch.java
index 56b5ba1..2e446c1 100644
--- a/main/src/cgeo/geocaching/cgeotouch.java
+++ b/main/src/cgeo/geocaching/cgeotouch.java
@@ -36,7 +36,6 @@ import java.util.Calendar;
 import java.util.List;
 
 public class cgeotouch extends AbstractActivity implements DateDialog.DateDialogParent {
-    private cgTrackable trackable = null;
     private List<LogType> logTypes = new ArrayList<LogType>();
     private ProgressDialog waitDialog = null;
     private String guid = null;
@@ -131,7 +130,7 @@ public class cgeotouch extends AbstractActivity implements DateDialog.DateDialog
             }
         }
 
-        trackable = app.getTrackableByGeocode("logging trackable");
+        final cgTrackable trackable = app.getTrackableByGeocode("logging trackable");
 
         if (StringUtils.isNotBlank(trackable.getName())) {
             setTitle(res.getString(R.string.trackable_touch) + trackable.getName());
diff --git a/main/src/cgeo/geocaching/ui/AddressListAdapter.java b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
index 34e751f..d77d6cc 100644
--- a/main/src/cgeo/geocaching/ui/AddressListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 public class AddressListAdapter extends ArrayAdapter<Address> {
 
     private LayoutInflater inflater;
-    private AddressListView holder;
     private Geopoint location;
 
     public AddressListAdapter(final Context context) {
@@ -39,6 +38,8 @@ public class AddressListAdapter extends ArrayAdapter<Address> {
 
         // holder pattern implementation
         View view = convertView;
+        AddressListView holder;
+
         if (view == null) {
             view = inflater.inflate(R.layout.addresses_item, null);
 
diff --git a/main/src/cgeo/geocaching/ui/CompassView.java b/main/src/cgeo/geocaching/ui/CompassView.java
index d9e0bfe..f9fb569 100644
--- a/main/src/cgeo/geocaching/ui/CompassView.java
+++ b/main/src/cgeo/geocaching/ui/CompassView.java
@@ -16,7 +16,6 @@ import android.view.View;
 
 public class CompassView extends View {
 
-    private changeThread watchdog = null;
     private volatile boolean wantStop = false;
     private Context context = null;
     private Bitmap compassUnderlay = null;
@@ -94,8 +93,7 @@ public class CompassView extends View {
         initialDisplay = true;
         wantStop = false;
 
-        watchdog = new changeThread();
-        watchdog.start();
+        new changeThread().start();
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/ui/GPXListAdapter.java b/main/src/cgeo/geocaching/ui/GPXListAdapter.java
index aa2234a..c62fa8c 100644
--- a/main/src/cgeo/geocaching/ui/GPXListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/GPXListAdapter.java
@@ -16,7 +16,6 @@ import java.io.File;
 import java.util.List;
 
 public class GPXListAdapter extends ArrayAdapter<File> {
-    private GPXListView holder = null;
     private cgeogpxes activity = null;
     private LayoutInflater inflater = null;
 
@@ -40,6 +39,7 @@ public class GPXListAdapter extends ArrayAdapter<File> {
         final File file = getItem(position);
 
         View v = rowView;
+        GPXListView holder = null;
 
         if (v == null) {
             v = inflater.inflate(R.layout.gpx_item, null);
diff --git a/main/src/cgeo/geocaching/ui/MapfileListAdapter.java b/main/src/cgeo/geocaching/ui/MapfileListAdapter.java
index e7380f0..a14d120 100644
--- a/main/src/cgeo/geocaching/ui/MapfileListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/MapfileListAdapter.java
@@ -19,7 +19,6 @@ public class MapfileListAdapter extends ArrayAdapter<File> {
 
     private cgSelectMapfile parentView;
     private LayoutInflater inflater;
-    private MapfileView holder;
 
     public MapfileListAdapter(cgSelectMapfile parentIn, List<File> listIn) {
         super(parentIn, 0, listIn);
@@ -41,6 +40,7 @@ public class MapfileListAdapter extends ArrayAdapter<File> {
         File file = getItem(position);
 
         View v = rowView;
+        MapfileView holder;
 
         if (v == null) {
             v = inflater.inflate(R.layout.mapfile_item, null);