refactoring: avoid optimization of TEMPORARY_LIST

11 files changed, 35 insertions, 35 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 363d1db..dd9a034 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -886,9 +886,9 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                         public void call(final Integer selectedListId) {
                             storeCache(selectedListId, new StoreCacheHandler(CacheDetailActivity.this, progress));
                         }
-                    }, true, StoredList.TEMPORARY_LIST_ID);
+                    }, true, StoredList.TEMPORARY_LIST.id);
         } else {
-            storeCache(StoredList.TEMPORARY_LIST_ID, new StoreCacheHandler(this, progress));
+            storeCache(StoredList.TEMPORARY_LIST.id, new StoreCacheHandler(this, progress));
         }
     }
 
diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java
index 9d15e47..0ef587b 100644
--- a/main/src/cgeo/geocaching/CacheListActivity.java
+++ b/main/src/cgeo/geocaching/CacheListActivity.java
@@ -130,7 +130,7 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
     private int detailTotal = 0;
     private int detailProgress = 0;
     private long detailProgressTime = 0L;
-    private int listId = StoredList.TEMPORARY_LIST_ID; // Only meaningful for the OFFLINE type
+    private int listId = StoredList.TEMPORARY_LIST.id; // Only meaningful for the OFFLINE type
     private final GeoDirHandler geoDirHandler = new GeoDirHandler() {
 
         @Override
@@ -1080,11 +1080,11 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
                             }
                             refreshStoredInternal(caches);
                         }
-                    }, true, StoredList.TEMPORARY_LIST_ID, newListName);
+                    }, true, StoredList.TEMPORARY_LIST.id, newListName);
         } else {
             if (type != CacheListType.OFFLINE) {
                 for (final Geocache geocache : caches) {
-                    if (geocache.getListId() == StoredList.TEMPORARY_LIST_ID) {
+                    if (geocache.getListId() == StoredList.TEMPORARY_LIST.id) {
                         geocache.setListId(StoredList.STANDARD_LIST_ID);
                     }
                 }
@@ -1592,7 +1592,7 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
                 }
                 if (listId == PseudoList.ALL_LIST.id) {
                     title = res.getString(R.string.list_all_lists);
-                } else if (listId <= StoredList.TEMPORARY_LIST_ID) {
+                } else if (listId <= StoredList.TEMPORARY_LIST.id) {
                     listId = StoredList.STANDARD_LIST_ID;
                     title = res.getString(R.string.stored_caches_button);
                 } else {
diff --git a/main/src/cgeo/geocaching/CachePopupFragment.java b/main/src/cgeo/geocaching/CachePopupFragment.java
index b2af12c..fda00d9 100644
--- a/main/src/cgeo/geocaching/CachePopupFragment.java
+++ b/main/src/cgeo/geocaching/CachePopupFragment.java
@@ -135,9 +135,9 @@ public class CachePopupFragment extends AbstractDialogFragment {
                             public void call(final Integer selectedListId) {
                                 storeCache(selectedListId);
                             }
-                        }, true, StoredList.TEMPORARY_LIST_ID);
+                        }, true, StoredList.TEMPORARY_LIST.id);
             } else {
-                storeCache(StoredList.TEMPORARY_LIST_ID);
+                storeCache(StoredList.TEMPORARY_LIST.id);
             }
         }
 
diff --git a/main/src/cgeo/geocaching/DataStore.java b/main/src/cgeo/geocaching/DataStore.java
index 02f4a27..d58a78a 100644
--- a/main/src/cgeo/geocaching/DataStore.java
+++ b/main/src/cgeo/geocaching/DataStore.java
@@ -1010,7 +1010,7 @@ public class DataStore {
             }
             synchronized (listId) {
                 listId.bindString(1, value);
-                return listId.simpleQueryForLong() != StoredList.TEMPORARY_LIST_ID;
+                return listId.simpleQueryForLong() != StoredList.TEMPORARY_LIST.id;
             }
         } catch (final SQLiteDoneException e) {
             // Do nothing, it only means we have no information on the cache
@@ -2998,7 +2998,7 @@ public class DataStore {
     }
 
     public static void markDropped(final List<Geocache> caches) {
-        moveToList(caches, StoredList.TEMPORARY_LIST_ID);
+        moveToList(caches, StoredList.TEMPORARY_LIST.id);
     }
 
     public static Viewport getBounds(final String geocode) {
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index be888a6..2ad2020 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -88,7 +88,7 @@ public class Geocache implements ICache, IWaypoint {
     private long updated = 0;
     private long detailedUpdate = 0;
     private long visitedDate = 0;
-    private int listId = StoredList.TEMPORARY_LIST_ID;
+    private int listId = StoredList.TEMPORARY_LIST.id;
     private boolean detailed = false;
     private String geocode = "";
     private String cacheId = "";
@@ -251,7 +251,7 @@ public class Geocache implements ICache, IWaypoint {
         if (visitedDate == 0) {
             visitedDate = other.visitedDate;
         }
-        if (listId == StoredList.TEMPORARY_LIST_ID) {
+        if (listId == StoredList.TEMPORARY_LIST.id) {
             listId = other.listId;
         }
         if (StringUtils.isBlank(geocode)) {
@@ -1432,7 +1432,7 @@ public class Geocache implements ICache, IWaypoint {
     }
 
     public void store(final CancellableHandler handler) {
-        store(StoredList.TEMPORARY_LIST_ID, handler);
+        store(StoredList.TEMPORARY_LIST.id, handler);
     }
 
     public void store(final int listId, final CancellableHandler handler) {
@@ -1627,7 +1627,7 @@ public class Geocache implements ICache, IWaypoint {
             return null;
         }
 
-        if (!forceReload && listId == StoredList.TEMPORARY_LIST_ID && (DataStore.isOffline(geocode, guid) || DataStore.isThere(geocode, guid, true, true))) {
+        if (!forceReload && listId == StoredList.TEMPORARY_LIST.id && (DataStore.isOffline(geocode, guid) || DataStore.isThere(geocode, guid, true, true))) {
             final SearchResult search = new SearchResult();
             final String realGeocode = StringUtils.isNotBlank(geocode) ? geocode : DataStore.getGeocodeForGuid(guid);
             search.addGeocode(realGeocode);
diff --git a/main/src/cgeo/geocaching/connector/ec/ECApi.java b/main/src/cgeo/geocaching/connector/ec/ECApi.java
index 421d112..a0da825 100644
--- a/main/src/cgeo/geocaching/connector/ec/ECApi.java
+++ b/main/src/cgeo/geocaching/connector/ec/ECApi.java
@@ -161,7 +161,7 @@ public class ECApi {
         }
 
         try {
-            return new GPX10Parser(StoredList.TEMPORARY_LIST_ID).parse(response.getEntity().getContent(), null);
+            return new GPX10Parser(StoredList.TEMPORARY_LIST.id).parse(response.getEntity().getContent(), null);
         } catch (Exception e) {
             Log.e("Error importing gpx from extremcaching.com", e);
             return Collections.emptyList();
diff --git a/main/src/cgeo/geocaching/connector/ox/OpenCachingApi.java b/main/src/cgeo/geocaching/connector/ox/OpenCachingApi.java
index 23ccf8e..21207ec 100644
--- a/main/src/cgeo/geocaching/connector/ox/OpenCachingApi.java
+++ b/main/src/cgeo/geocaching/connector/ox/OpenCachingApi.java
@@ -50,7 +50,7 @@ public class OpenCachingApi {
         }
         Collection<Geocache> caches;
         try {
-            caches = new OXGPXParser(StoredList.TEMPORARY_LIST_ID, isDetailed).parse(response.getEntity().getContent(), null);
+            caches = new OXGPXParser(StoredList.TEMPORARY_LIST.id, isDetailed).parse(response.getEntity().getContent(), null);
         } catch (Exception e) {
             Log.e("Error importing from OpenCaching.com", e);
             return Collections.emptyList();
diff --git a/main/src/cgeo/geocaching/files/AbstractFileListActivity.java b/main/src/cgeo/geocaching/files/AbstractFileListActivity.java
index 2a05cbc..fa84df9 100644
--- a/main/src/cgeo/geocaching/files/AbstractFileListActivity.java
+++ b/main/src/cgeo/geocaching/files/AbstractFileListActivity.java
@@ -38,7 +38,7 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
         private String searchInfo;
 
         @Override
-        public void handleMessage(Message msg) {
+        public void handleMessage(final Message msg) {
             if (msg.obj != null && waitDialog != null) {
                 if (searchInfo == null) {
                     searchInfo = res.getString(R.string.file_searching_in) + " ";
@@ -52,7 +52,7 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
 
         private String getDefaultFolders() {
             final ArrayList<String> names = new ArrayList<>();
-            for (File dir : getExistingBaseFolders()) {
+            for (final File dir : getExistingBaseFolders()) {
                 names.add(dir.getPath());
             }
             return StringUtils.join(names, '\n');
@@ -62,7 +62,7 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
     final private Handler loadFilesHandler = new Handler() {
 
         @Override
-        public void handleMessage(Message msg) {
+        public void handleMessage(final Message msg) {
             if (waitDialog != null) {
                 waitDialog.dismiss();
             }
@@ -76,17 +76,17 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
     };
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setTheme();
         setContentView(R.layout.gpx);
 
-        Bundle extras = getIntent().getExtras();
+        final Bundle extras = getIntent().getExtras();
         if (extras != null) {
             listId = extras.getInt(Intents.EXTRA_LIST_ID);
         }
-        if (listId <= StoredList.TEMPORARY_LIST_ID) {
+        if (listId <= StoredList.TEMPORARY_LIST.id) {
             listId = StoredList.STANDARD_LIST_ID;
         }
 
@@ -100,7 +100,7 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
                 true,
                 new DialogInterface.OnCancelListener() {
                     @Override
-                    public void onCancel(DialogInterface arg0) {
+                    public void onCancel(final DialogInterface arg0) {
                         if (searchingThread != null && searchingThread.isAlive()) {
                             searchingThread.notifyEnd();
                         }
@@ -171,7 +171,7 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
                 } else {
                     Log.w("No external media mounted.");
                 }
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 Log.e("AbstractFileListActivity.loadFiles.run", e);
             }
 
@@ -181,7 +181,7 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
             Collections.sort(files, new Comparator<File>() {
 
                 @Override
-                public int compare(File lhs, File rhs) {
+                public int compare(final File lhs, final File rhs) {
                     return lhs.getName().compareToIgnoreCase(rhs.getName());
                 }
             });
@@ -189,7 +189,7 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
             loadFilesHandler.sendMessage(Message.obtain(loadFilesHandler));
         }
 
-        private void listDirs(List<File> list, List<File> directories, FileListSelector selector, Handler feedbackHandler) {
+        private void listDirs(final List<File> list, final List<File> directories, final FileListSelector selector, final Handler feedbackHandler) {
             for (final File dir : directories) {
                 FileUtils.listDir(list, dir, selector, feedbackHandler);
             }
@@ -204,7 +204,7 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
      * @return <code>true</code> if the filename belongs to the list
      */
     protected boolean filenameBelongsToList(final String filename) {
-        for (String ext : extensions) {
+        for (final String ext : extensions) {
             if (StringUtils.endsWithIgnoreCase(filename, ext)) {
                 return true;
             }
@@ -213,7 +213,7 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
     }
 
     protected List<File> getExistingBaseFolders() {
-        ArrayList<File> result = new ArrayList<>();
+        final ArrayList<File> result = new ArrayList<>();
         for (final File dir : getBaseFolders()) {
             if (dir.exists() && dir.isDirectory()) {
                 result.add(dir);
@@ -245,7 +245,7 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
         boolean shouldEnd = false;
 
         @Override
-        public boolean isSelected(File file) {
+        public boolean isSelected(final File file) {
             return filenameBelongsToList(file.getName());
         }
 
@@ -254,7 +254,7 @@ public abstract class AbstractFileListActivity<T extends ArrayAdapter<File>> ext
             return shouldEnd;
         }
 
-        public synchronized void setShouldEnd(boolean shouldEnd) {
+        public synchronized void setShouldEnd(final boolean shouldEnd) {
             this.shouldEnd = shouldEnd;
         }
     }
diff --git a/main/src/cgeo/geocaching/list/StoredList.java b/main/src/cgeo/geocaching/list/StoredList.java
index cb4fb4a..abb6af1 100644
--- a/main/src/cgeo/geocaching/list/StoredList.java
+++ b/main/src/cgeo/geocaching/list/StoredList.java
@@ -24,7 +24,7 @@ import java.util.Comparator;
 import java.util.List;
 
 public final class StoredList extends AbstractList {
-    public static final int TEMPORARY_LIST_ID = 0;
+    private static final int TEMPORARY_LIST_ID = 0;
     public static final StoredList TEMPORARY_LIST = new StoredList(TEMPORARY_LIST_ID, "<temporary>", 0); // Never displayed
     public static final int STANDARD_LIST_ID = 1;
     private final int count; // this value is only valid as long as the list is not changed by other database operations
@@ -106,7 +106,7 @@ public final class StoredList extends AbstractList {
             final List<AbstractList> lists = new ArrayList<>();
             lists.addAll(getSortedLists());
 
-            if (exceptListId > StoredList.TEMPORARY_LIST_ID) {
+            if (exceptListId > StoredList.TEMPORARY_LIST.id) {
                 final StoredList exceptList = DataStore.getList(exceptListId);
                 if (exceptList != null) {
                     lists.remove(exceptList);
@@ -222,7 +222,7 @@ public final class StoredList extends AbstractList {
      * Return the given list, if it is a concrete list. Return the default list otherwise.
      */
     public static int getConcreteList(final int listId) {
-        if (listId == PseudoList.ALL_LIST.id || listId == TEMPORARY_LIST_ID || listId == PseudoList.HISTORY_LIST.id) {
+        if (listId == PseudoList.ALL_LIST.id || listId == TEMPORARY_LIST.id || listId == PseudoList.HISTORY_LIST.id) {
             return STANDARD_LIST_ID;
         }
         return listId;
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 59ac4d7..5b1461b 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -693,7 +693,7 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
                                     public void call(final Integer selectedListId) {
                                         storeCaches(geocodes, selectedListId);
                                     }
-                                }, true, StoredList.TEMPORARY_LIST_ID);
+                                }, true, StoredList.TEMPORARY_LIST.id);
                     } else {
                         storeCaches(geocodes, StoredList.STANDARD_LIST_ID);
                     }
diff --git a/main/src/cgeo/geocaching/ui/ImagesList.java b/main/src/cgeo/geocaching/ui/ImagesList.java
index 8bd4ac2..458f8db 100644
--- a/main/src/cgeo/geocaching/ui/ImagesList.java
+++ b/main/src/cgeo/geocaching/ui/ImagesList.java
@@ -102,7 +102,7 @@ public class ImagesList {
 
         imagesView = ButterKnife.findById(parentView, R.id.spoiler_list);
 
-        final HtmlImage imgGetter = new HtmlImage(geocode, true, offline ? StoredList.STANDARD_LIST_ID : StoredList.TEMPORARY_LIST_ID, false);
+        final HtmlImage imgGetter = new HtmlImage(geocode, true, offline ? StoredList.STANDARD_LIST_ID : StoredList.TEMPORARY_LIST.id, false);
 
         for (final Image img : images) {
             final LinearLayout rowView = (LinearLayout) inflater.inflate(R.layout.cache_image_item, imagesView, false);