refactoring: introduce PseudoList to handle non concrete lists

* should make adding a history list entry easier
* includes some non null annotations
* moved list code into separate package

26 files changed, 96 insertions, 50 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index bf94b5f..4be0ad9 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -18,6 +18,7 @@ import cgeo.geocaching.enumerations.LoadFlags.SaveFlag;
 import cgeo.geocaching.enumerations.WaypointType;
 import cgeo.geocaching.geopoint.GeopointFormatter;
 import cgeo.geocaching.geopoint.Units;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.network.HtmlImage;
 import cgeo.geocaching.network.Network;
 import cgeo.geocaching.network.Parameters;
diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java
index 470a16a..c4c7f6e 100644
--- a/main/src/cgeo/geocaching/CacheListActivity.java
+++ b/main/src/cgeo/geocaching/CacheListActivity.java
@@ -16,6 +16,7 @@ import cgeo.geocaching.files.GPXImporter;
 import cgeo.geocaching.filter.FilterUserInterface;
 import cgeo.geocaching.filter.IFilter;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.loaders.AbstractSearchLoader;
 import cgeo.geocaching.loaders.AbstractSearchLoader.CacheListLoaderType;
 import cgeo.geocaching.loaders.AddressGeocacheListLoader;
@@ -47,6 +48,7 @@ import ch.boye.httpclientandroidlib.HttpResponse;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jdt.annotation.NonNull;
 
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -1453,6 +1455,7 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
         new StoredList.UserInterface(this).promptForListSelection(R.string.list_title, getListSwitchingRunnable());
     }
 
+    @NonNull
     private RunnableWithArgument<Integer> getListSwitchingRunnable() {
         return new RunnableWithArgument<Integer>() {
 
diff --git a/main/src/cgeo/geocaching/CachePopup.java b/main/src/cgeo/geocaching/CachePopup.java
index 873801e..683ebe7 100644
--- a/main/src/cgeo/geocaching/CachePopup.java
+++ b/main/src/cgeo/geocaching/CachePopup.java
@@ -3,6 +3,7 @@ package cgeo.geocaching;
 import cgeo.geocaching.activity.Progress;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.network.Network;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.ui.CacheDetailsCreator;
diff --git a/main/src/cgeo/geocaching/DataStore.java b/main/src/cgeo/geocaching/DataStore.java
index 93067b8..f151ce3 100644
--- a/main/src/cgeo/geocaching/DataStore.java
+++ b/main/src/cgeo/geocaching/DataStore.java
@@ -13,6 +13,8 @@ import cgeo.geocaching.enumerations.WaypointType;
 import cgeo.geocaching.files.LocalStorage;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Viewport;
+import cgeo.geocaching.list.PseudoList;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.utils.FileUtils;
 import cgeo.geocaching.utils.Log;
@@ -2019,7 +2021,7 @@ public class DataStore {
                 reasonIndex = 1;
             }
             String listKey;
-            if (list == StoredList.ALL_LIST_ID) {
+            if (list == PseudoList.ALL_LIST_ID) {
                 sql.append(" and reason > 0");
                 listKey = "all_list";
             } else {
@@ -2033,7 +2035,7 @@ public class DataStore {
             if (cacheType != CacheType.ALL) {
                 compiledStmnt.bindString(1, cacheType.id);
             }
-            if (list != StoredList.ALL_LIST_ID) {
+            if (list != PseudoList.ALL_LIST_ID) {
                 compiledStmnt.bindLong(reasonIndex, list);
             }
             return (int) compiledStmnt.simpleQueryForLong();
@@ -2076,7 +2078,7 @@ public class DataStore {
         final StringBuilder selection = new StringBuilder();
 
         selection.append("reason ");
-        selection.append(listId != StoredList.ALL_LIST_ID ? "=" + Math.max(listId, 1) : ">= " + StoredList.STANDARD_LIST_ID);
+        selection.append(listId != PseudoList.ALL_LIST_ID ? "=" + Math.max(listId, 1) : ">= " + StoredList.STANDARD_LIST_ID);
         selection.append(" and detailed = 1 ");
 
         String[] selectionArgs = null;
@@ -2537,8 +2539,8 @@ public class DataStore {
         }
 
         Resources res = CgeoApplication.getInstance().getResources();
-        if (id == StoredList.ALL_LIST_ID) {
-            return new StoredList(StoredList.ALL_LIST_ID, res.getString(R.string.list_all_lists), getAllCachesCount());
+        if (id == PseudoList.ALL_LIST_ID) {
+            return new StoredList(PseudoList.ALL_LIST_ID, res.getString(R.string.list_all_lists), getAllCachesCount());
         }
 
         // fall back to standard list in case of invalid list id
@@ -2653,7 +2655,7 @@ public class DataStore {
     }
 
     public static void moveToList(final List<Geocache> caches, final int listId) {
-        if (listId == StoredList.ALL_LIST_ID) {
+        if (listId == PseudoList.ALL_LIST_ID) {
             return;
         }
         if (caches.isEmpty()) {
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 8798539..373b232 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -21,6 +21,7 @@ import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.enumerations.WaypointType;
 import cgeo.geocaching.files.GPXParser;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.network.HtmlImage;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.utils.CancellableHandler;
diff --git a/main/src/cgeo/geocaching/GpxFileListActivity.java b/main/src/cgeo/geocaching/GpxFileListActivity.java
index 8b10d5b..dae52c4 100644
--- a/main/src/cgeo/geocaching/GpxFileListActivity.java
+++ b/main/src/cgeo/geocaching/GpxFileListActivity.java
@@ -4,6 +4,7 @@ import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.connector.IConnector;

 import cgeo.geocaching.files.AbstractFileListActivity;

 import cgeo.geocaching.files.GPXImporter;

+import cgeo.geocaching.list.StoredList;

 import cgeo.geocaching.settings.Settings;

 import cgeo.geocaching.ui.GPXListAdapter;

 

diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 1db0cd4..16ce0f9 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -10,6 +10,7 @@ import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.StatusCode;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Units;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.maps.CGeoMap;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.settings.SettingsActivity;
diff --git a/main/src/cgeo/geocaching/connector/ox/OpenCachingApi.java b/main/src/cgeo/geocaching/connector/ox/OpenCachingApi.java
index f25e289..40b27f0 100644
--- a/main/src/cgeo/geocaching/connector/ox/OpenCachingApi.java
+++ b/main/src/cgeo/geocaching/connector/ox/OpenCachingApi.java
@@ -1,9 +1,9 @@
 package cgeo.geocaching.connector.ox;
 
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.StoredList;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.GeopointFormatter;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.network.Network;
 import cgeo.geocaching.network.Parameters;
 import cgeo.geocaching.utils.CryptUtils;
diff --git a/main/src/cgeo/geocaching/files/AbstractFileListActivity.java b/main/src/cgeo/geocaching/files/AbstractFileListActivity.java
index b0aba58..012f8b3 100644
--- a/main/src/cgeo/geocaching/files/AbstractFileListActivity.java
+++ b/main/src/cgeo/geocaching/files/AbstractFileListActivity.java
@@ -2,8 +2,8 @@ package cgeo.geocaching.files;
 
 import cgeo.geocaching.Intents;
 import cgeo.geocaching.R;
-import cgeo.geocaching.StoredList;
 import cgeo.geocaching.activity.AbstractListActivity;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.utils.FileUtils;
 import cgeo.geocaching.utils.Log;
 
diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java
index 686bfb1..dc21552 100644
--- a/main/src/cgeo/geocaching/files/GPXParser.java
+++ b/main/src/cgeo/geocaching/files/GPXParser.java
@@ -4,7 +4,6 @@ import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
-import cgeo.geocaching.StoredList;
 import cgeo.geocaching.Trackable;
 import cgeo.geocaching.Waypoint;
 import cgeo.geocaching.CgeoApplication;
@@ -17,6 +16,7 @@ import cgeo.geocaching.enumerations.LoadFlags.SaveFlag;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.enumerations.WaypointType;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.utils.CancellableHandler;
 import cgeo.geocaching.utils.Log;
 import cgeo.geocaching.utils.MatcherWrapper;
diff --git a/main/src/cgeo/geocaching/list/AbstractList.java b/main/src/cgeo/geocaching/list/AbstractList.java
new file mode 100644
index 0000000..c75c6a1
--- /dev/null
+++ b/main/src/cgeo/geocaching/list/AbstractList.java
@@ -0,0 +1,15 @@
+package cgeo.geocaching.list;
+
+abstract class AbstractList {
+
+    public final int id;
+    public final String title;
+
+    public AbstractList(final int id, final String title) {
+        this.id = id;
+        this.title = title;
+    }
+
+    public abstract String getTitleAndCount();
+
+}
diff --git a/main/src/cgeo/geocaching/list/PseudoList.java b/main/src/cgeo/geocaching/list/PseudoList.java
new file mode 100644
index 0000000..c93f011
--- /dev/null
+++ b/main/src/cgeo/geocaching/list/PseudoList.java
@@ -0,0 +1,20 @@
+package cgeo.geocaching.list;
+
+import cgeo.geocaching.CgeoApplication;
+import cgeo.geocaching.R;
+
+public class PseudoList extends AbstractList {
+
+    public static final int ALL_LIST_ID = 2;
+    public static final PseudoList ALL_LIST = new PseudoList(ALL_LIST_ID, R.string.list_all_lists);
+
+    public PseudoList(int id, final int titleResourceId) {
+        super(id, CgeoApplication.getInstance().getResources().getString(titleResourceId));
+    }
+
+    @Override
+    public String getTitleAndCount() {
+        return "<" + title + ">";
+    }
+
+}
diff --git a/main/src/cgeo/geocaching/StoredList.java b/main/src/cgeo/geocaching/list/StoredList.java
index 367ddcb..f1632c4 100644
--- a/main/src/cgeo/geocaching/StoredList.java
+++ b/main/src/cgeo/geocaching/list/StoredList.java
@@ -1,5 +1,8 @@
-package cgeo.geocaching;
+package cgeo.geocaching.list;
 
+import cgeo.geocaching.CgeoApplication;
+import cgeo.geocaching.DataStore;
+import cgeo.geocaching.R;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.utils.RunnableWithArgument;
 
@@ -19,21 +22,17 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-public final class StoredList {
+public final class StoredList extends AbstractList {
     public static final int TEMPORARY_LIST_ID = 0;
     public static final int STANDARD_LIST_ID = 1;
-    public static final int ALL_LIST_ID = 2;
-
-    public final int id;
-    public final String title;
     private final int count; // this value is only valid as long as the list is not changed by other database operations
 
     public StoredList(int id, String title, int count) {
-        this.id = id;
-        this.title = title;
+        super(id, title);
         this.count = count;
     }
 
+    @Override
     public String getTitleAndCount() {
         return title + " [" + count + "]";
     }
@@ -68,16 +67,17 @@ public final class StoredList {
             res = app.getResources();
         }
 
-        public void promptForListSelection(final int titleId, final RunnableWithArgument<Integer> runAfterwards) {
+        public void promptForListSelection(final int titleId, @NonNull final RunnableWithArgument<Integer> runAfterwards) {
             promptForListSelection(titleId, runAfterwards, false, -1);
         }
 
-        public void promptForListSelection(final int titleId, final RunnableWithArgument<Integer> runAfterwards, final boolean onlyConcreteLists, final int exceptListId) {
+        public void promptForListSelection(final int titleId, @NonNull final RunnableWithArgument<Integer> runAfterwards, final boolean onlyConcreteLists, final int exceptListId) {
             promptForListSelection(titleId, runAfterwards, onlyConcreteLists, exceptListId, StringUtils.EMPTY);
         }
 
-        public void promptForListSelection(final int titleId, final RunnableWithArgument<Integer> runAfterwards, final boolean onlyConcreteLists, final int exceptListId, final String newListName) {
-            final List<StoredList> lists = getSortedLists();
+        public void promptForListSelection(final int titleId, @NonNull final RunnableWithArgument<Integer> runAfterwards, final boolean onlyConcreteLists, final int exceptListId, final String newListName) {
+            final List<AbstractList> lists = new ArrayList<AbstractList>();
+            lists.addAll(getSortedLists());
 
             if (exceptListId > StoredList.TEMPORARY_LIST_ID) {
                 StoredList exceptList = DataStore.getList(exceptListId);
@@ -86,13 +86,14 @@ public final class StoredList {
                 }
             }
 
+            if (!onlyConcreteLists) {
+                lists.add(PseudoList.ALL_LIST);
+            }
+
             final List<CharSequence> listsTitle = new ArrayList<CharSequence>();
-            for (StoredList list : lists) {
+            for (AbstractList list : lists) {
                 listsTitle.add(list.getTitleAndCount());
             }
-            if (!onlyConcreteLists) {
-                listsTitle.add("<" + res.getString(R.string.list_menu_all_lists) + ">");
-            }
             listsTitle.add("<" + res.getString(R.string.list_menu_create) + ">");
 
             final CharSequence[] items = new CharSequence[listsTitle.size()];
@@ -102,17 +103,12 @@ public final class StoredList {
             builder.setItems(listsTitle.toArray(items), new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialogInterface, int itemId) {
-                    if (itemId == lists.size() && !onlyConcreteLists) {
-                        // all lists
-                        runAfterwards.run(StoredList.ALL_LIST_ID);
-                    } else if (itemId >= lists.size()) {
+                    if (itemId >= lists.size()) {
                         // create new list on the fly
                         promptForListCreation(runAfterwards, newListName);
                     }
                     else {
-                        if (runAfterwards != null) {
-                            runAfterwards.run(lists.get(itemId).id);
-                        }
+                        runAfterwards.run(lists.get(itemId).id);
                     }
                 }
             });
@@ -141,7 +137,7 @@ public final class StoredList {
             return lists;
         }
 
-        public void promptForListCreation(final RunnableWithArgument<Integer> runAfterwards, String newListName) {
+        public void promptForListCreation(@NonNull final RunnableWithArgument<Integer> runAfterwards, String newListName) {
             handleListNameInput(newListName, R.string.list_dialog_create_title, R.string.list_dialog_create, new RunnableWithArgument<String>() {
 
                 @Override
@@ -150,9 +146,7 @@ public final class StoredList {
 
                     if (newId >= DataStore.customListIdOffset) {
                         ActivityMixin.showToast(activity, res.getString(R.string.list_dialog_create_ok));
-                        if (runAfterwards != null) {
-                            runAfterwards.run(newId);
-                        }
+                        runAfterwards.run(newId);
                     } else {
                         ActivityMixin.showToast(activity, res.getString(R.string.list_dialog_create_err));
                     }
@@ -188,16 +182,14 @@ public final class StoredList {
             alert.show();
         }
 
-        public void promptForListRename(final int listId, final Runnable runAfterRename) {
+        public void promptForListRename(final int listId, @NonNull final Runnable runAfterRename) {
             final StoredList list = DataStore.getList(listId);
             handleListNameInput(list.title, R.string.list_dialog_rename_title, R.string.list_dialog_rename, new RunnableWithArgument<String>() {
 
                 @Override
                 public void run(final String listName) {
                     DataStore.renameList(listId, listName);
-                    if (runAfterRename != null) {
-                        runAfterRename.run();
-                    }
+                    runAfterRename.run();
                 }
             });
         }
@@ -216,9 +208,10 @@ public final class StoredList {
      * Return the given list, if it is a concrete list. Return the default list otherwise.
      */
     public static int getConcreteList(int listId) {
-        if (listId == ALL_LIST_ID || listId == TEMPORARY_LIST_ID) {
+        if (listId == PseudoList.ALL_LIST_ID || listId == TEMPORARY_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 78c1571..ec90c8f 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -6,7 +6,6 @@ import cgeo.geocaching.Geocache;
 import cgeo.geocaching.IGeoData;
 import cgeo.geocaching.R;
 import cgeo.geocaching.SearchResult;
-import cgeo.geocaching.StoredList;
 import cgeo.geocaching.Waypoint;
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.CacheListActivity;
@@ -22,6 +21,7 @@ import cgeo.geocaching.enumerations.StatusCode;
 import cgeo.geocaching.enumerations.WaypointType;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Viewport;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl;
 import cgeo.geocaching.maps.interfaces.GeoPointImpl;
 import cgeo.geocaching.maps.interfaces.MapActivityImpl;
diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java
index f7fbb30..953d762 100644
--- a/main/src/cgeo/geocaching/network/HtmlImage.java
+++ b/main/src/cgeo/geocaching/network/HtmlImage.java
@@ -2,10 +2,10 @@ package cgeo.geocaching.network;
 
 import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.StoredList;
 import cgeo.geocaching.compatibility.Compatibility;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.files.LocalStorage;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.utils.FileUtils;
 import cgeo.geocaching.utils.IOUtils;
 import cgeo.geocaching.utils.ImageUtils;
diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java
index 0479311..aaf89b0 100644
--- a/main/src/cgeo/geocaching/settings/Settings.java
+++ b/main/src/cgeo/geocaching/settings/Settings.java
@@ -2,7 +2,6 @@ package cgeo.geocaching.settings;
 
 import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.StoredList;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory.NavigationAppsEnum;
 import cgeo.geocaching.connector.gc.GCConstants;
 import cgeo.geocaching.connector.gc.Login;
@@ -10,6 +9,7 @@ import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LiveMapStrategy.Strategy;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.maps.MapProviderFactory;
 import cgeo.geocaching.maps.google.GoogleMapProvider;
 import cgeo.geocaching.maps.interfaces.GeoPointImpl;
diff --git a/main/src/cgeo/geocaching/ui/DirectionImage.java b/main/src/cgeo/geocaching/ui/DirectionImage.java
index 9de360c..cd7695e 100644
--- a/main/src/cgeo/geocaching/ui/DirectionImage.java
+++ b/main/src/cgeo/geocaching/ui/DirectionImage.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.ui;
 
-import cgeo.geocaching.StoredList;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.network.HtmlImage;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/main/src/cgeo/geocaching/ui/ImagesList.java b/main/src/cgeo/geocaching/ui/ImagesList.java
index 0f860c4..fdff701 100644
--- a/main/src/cgeo/geocaching/ui/ImagesList.java
+++ b/main/src/cgeo/geocaching/ui/ImagesList.java
@@ -2,8 +2,8 @@ package cgeo.geocaching.ui;
 
 import cgeo.geocaching.Image;
 import cgeo.geocaching.R;
-import cgeo.geocaching.StoredList;
 import cgeo.geocaching.files.LocalStorage;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.network.HtmlImage;
 import cgeo.geocaching.utils.IOUtils;
 import cgeo.geocaching.utils.Log;
diff --git a/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java b/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
index 4572bc6..15634d3 100644
--- a/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
+++ b/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
@@ -4,9 +4,9 @@ import cgeo.geocaching.Image;
 import cgeo.geocaching.ImagesActivity;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
-import cgeo.geocaching.StoredList;
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.activity.Progress;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.network.HtmlImage;
 import cgeo.geocaching.ui.AbstractCachingPageViewCreator;
 import cgeo.geocaching.ui.AnchorAwareLinkMovementMethod;
diff --git a/tests/src/cgeo/geocaching/DataStoreTest.java b/tests/src/cgeo/geocaching/DataStoreTest.java
index 3f0214b..7dc3016 100644
--- a/tests/src/cgeo/geocaching/DataStoreTest.java
+++ b/tests/src/cgeo/geocaching/DataStoreTest.java
@@ -8,6 +8,7 @@ import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.enumerations.LoadFlags.SaveFlag;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Viewport;
+import cgeo.geocaching.list.StoredList;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/tests/src/cgeo/geocaching/GeocacheTest.java b/tests/src/cgeo/geocaching/GeocacheTest.java
index e1c0769..2f5281c 100644
--- a/tests/src/cgeo/geocaching/GeocacheTest.java
+++ b/tests/src/cgeo/geocaching/GeocacheTest.java
@@ -3,6 +3,7 @@ package cgeo.geocaching;
 import cgeo.CGeoTestCase;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.list.StoredList;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/tests/src/cgeo/geocaching/PersonalNoteTest.java b/tests/src/cgeo/geocaching/PersonalNoteTest.java
index c8aa8ba..c31662f 100644
--- a/tests/src/cgeo/geocaching/PersonalNoteTest.java
+++ b/tests/src/cgeo/geocaching/PersonalNoteTest.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching;
 
+import cgeo.geocaching.list.StoredList;
+
 import junit.framework.TestCase;
 
 public class PersonalNoteTest extends TestCase {
diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
index 4f45cc5..69a1b3f 100644
--- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
@@ -12,6 +12,7 @@ import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.enumerations.StatusCode;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Viewport;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.loaders.RecaptchaReceiver;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.settings.TestSettings;
diff --git a/tests/src/cgeo/geocaching/export/GpxSerializerTest.java b/tests/src/cgeo/geocaching/export/GpxSerializerTest.java
index ad1cea0..5c83b35 100644
--- a/tests/src/cgeo/geocaching/export/GpxSerializerTest.java
+++ b/tests/src/cgeo/geocaching/export/GpxSerializerTest.java
@@ -1,9 +1,9 @@
 package cgeo.geocaching.export;
 
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.StoredList;
 import cgeo.geocaching.files.GPX10Parser;
 import cgeo.geocaching.files.ParserException;
+import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase;
 import cgeo.geocaching.test.R;
 
diff --git a/tests/src/cgeo/geocaching/StoredListTest.java b/tests/src/cgeo/geocaching/list/StoredListTest.java
index ce7c963..ebe0966 100644
--- a/tests/src/cgeo/geocaching/StoredListTest.java
+++ b/tests/src/cgeo/geocaching/list/StoredListTest.java
@@ -1,4 +1,7 @@
-package cgeo.geocaching;
+package cgeo.geocaching.list;
+
+import cgeo.geocaching.DataStore;
+import cgeo.geocaching.list.StoredList;
 
 import junit.framework.TestCase;
 
diff --git a/tests/src/cgeo/geocaching/test/AbstractResourceInstrumentationTestCase.java b/tests/src/cgeo/geocaching/test/AbstractResourceInstrumentationTestCase.java
index bb03274..12e83cc 100644
--- a/tests/src/cgeo/geocaching/test/AbstractResourceInstrumentationTestCase.java
+++ b/tests/src/cgeo/geocaching/test/AbstractResourceInstrumentationTestCase.java
@@ -3,12 +3,12 @@ package cgeo.geocaching.test;
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.SearchResult;
-import cgeo.geocaching.StoredList;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.enumerations.LoadFlags.RemoveFlag;
 import cgeo.geocaching.files.GPX10Parser;
 import cgeo.geocaching.files.ParserException;
+import cgeo.geocaching.list.StoredList;
 
 import android.content.res.Resources;
 import android.test.InstrumentationTestCase;