Use a standard Callable interface for lazy initialized lists

2 files changed, 3 insertions, 6 deletions

diff --git a/tests/src/cgeo/geocaching/test/mock/MockedLazyInitializedList.java b/tests/src/cgeo/geocaching/test/mock/MockedLazyInitializedList.java
index 4dd0797..b67efda 100644
--- a/tests/src/cgeo/geocaching/test/mock/MockedLazyInitializedList.java
+++ b/tests/src/cgeo/geocaching/test/mock/MockedLazyInitializedList.java
@@ -9,15 +9,12 @@ import java.util.List;
 class MockedLazyInitializedList<ElementType> extends LazyInitializedList<ElementType> {
 
     public MockedLazyInitializedList(ElementType[] elements) {
-        final List<ElementType> elements1 = Arrays.asList(elements);
         clear();
-        if (elements1 != null) {
-            addAll(elements1);
-        }
+        addAll(Arrays.asList(elements));
     }
 
     @Override
-    protected List<ElementType> loadFromDatabase() {
+    public List<ElementType> call() {
         return new ArrayList<ElementType>();
     }
 
diff --git a/tests/src/cgeo/geocaching/utils/LazyInitializedListTest.java b/tests/src/cgeo/geocaching/utils/LazyInitializedListTest.java
index 6c19c32..c0be156 100644
--- a/tests/src/cgeo/geocaching/utils/LazyInitializedListTest.java
+++ b/tests/src/cgeo/geocaching/utils/LazyInitializedListTest.java
@@ -9,7 +9,7 @@ public class LazyInitializedListTest extends TestCase {
 
     private static final class MockedLazyInitializedList extends LazyInitializedList<String> {
         @Override
-        protected List<String> loadFromDatabase() {
+        public List<String> call() {
             return new ArrayList<String>();
         }
     }