refactoring of cgImage, cgeoimages activity

* no more public fields, use constructor instead
* allow null values for fields
* image activity startup moved to activity for better encapsulation of
fields

1 files changed, 9 insertions, 8 deletions

diff --git a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
index 1c7ac5b..5ff95b3 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
@@ -97,7 +97,7 @@ public class GC2JVEH extends MockedCache {
 
     @Override
     public List<String> getAttributes() {
-        String[] attributes = new String[] {
+        final String[] attributes = new String[] {
                 "winter_yes",
                 "flashlight_yes",
                 "stealth_yes",
@@ -111,7 +111,7 @@ public class GC2JVEH extends MockedCache {
 
     @Override
     public Map<Integer, Integer> getLogCounts() {
-        Map<Integer, Integer> logCounts = new HashMap<Integer, Integer>();
+        final Map<Integer, Integer> logCounts = new HashMap<Integer, Integer>();
         logCounts.put(cgBase.LOG_FOUND_IT, 59);
         logCounts.put(cgBase.LOG_NOTE, 7);
         logCounts.put(cgBase.LOG_TEMP_DISABLE_LISTING, 1);
@@ -122,7 +122,7 @@ public class GC2JVEH extends MockedCache {
 
     @Override
     public Integer getFavoritePoints() {
-        return new Integer(21);
+        return 21;
     }
 
     @Override
@@ -132,17 +132,18 @@ public class GC2JVEH extends MockedCache {
 
     @Override
     public List<cgTrackable> getInventory() {
-        ArrayList<cgTrackable> inventory = new ArrayList<cgTrackable>();
+        final ArrayList<cgTrackable> inventory = new ArrayList<cgTrackable>();
         inventory.add(new cgTrackable());
         return inventory;
     }
 
     @Override
     public List<cgImage> getSpoilers() {
-        ArrayList<cgImage> spoilers = new ArrayList<cgImage>();
-        spoilers.add(new cgImage());
-        spoilers.add(new cgImage());
-        spoilers.add(new cgImage());
+        final ArrayList<cgImage> spoilers = new ArrayList<cgImage>();
+        final cgImage mockedImage = new cgImage(null, null, null);
+        spoilers.add(mockedImage);
+        spoilers.add(mockedImage);
+        spoilers.add(mockedImage);
         return spoilers;
     }
 }