Refactoring: rename cgImage into Image

15 files changed, 63 insertions, 63 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 4c1aa19..c230948 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -2031,7 +2031,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                         holder.images.setOnClickListener(new View.OnClickListener() {
                             @Override
                             public void onClick(View v) {
-                                ImagesActivity.startActivityLogImages(CacheDetailActivity.this, cache.getGeocode(), new ArrayList<cgImage>(log.getLogImages()));
+                                ImagesActivity.startActivityLogImages(CacheDetailActivity.this, cache.getGeocode(), new ArrayList<Image>(log.getLogImages()));
                             }
                         });
                     } else {
diff --git a/main/src/cgeo/geocaching/ICache.java b/main/src/cgeo/geocaching/ICache.java
index 815e516..030c53f 100644
--- a/main/src/cgeo/geocaching/ICache.java
+++ b/main/src/cgeo/geocaching/ICache.java
@@ -117,7 +117,7 @@ public interface ICache extends IBasicCache {
     /**
      * @return the list of spoiler images
      */
-    public List<cgImage> getSpoilers();
+    public List<Image> getSpoilers();
 
     /**
      * @return a statistic how often the caches has been found, disabled, archived etc.
diff --git a/main/src/cgeo/geocaching/cgImage.java b/main/src/cgeo/geocaching/Image.java
index b313ef5..22c76aa 100644
--- a/main/src/cgeo/geocaching/cgImage.java
+++ b/main/src/cgeo/geocaching/Image.java
@@ -8,22 +8,22 @@ import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-public class cgImage implements Parcelable {
+public class Image implements Parcelable {
     private final String url;
     private final String title;
     private final String description;
 
-    public cgImage(final String url, final String title, final String description) {
+    public Image(final String url, final String title, final String description) {
         this.url = url;
         this.title = title;
         this.description = description;
     }
 
-    public cgImage(final String url, final String title) {
+    public Image(final String url, final String title) {
         this(url, title, null);
     }
 
-    public cgImage(final Parcel in) {
+    public Image(final Parcel in) {
         url = in.readString();
         title = in.readString();
         description = in.readString();
@@ -41,15 +41,15 @@ public class cgImage implements Parcelable {
         dest.writeString(description);
     }
 
-    public static final Parcelable.Creator<cgImage> CREATOR = new Parcelable.Creator<cgImage>() {
+    public static final Parcelable.Creator<Image> CREATOR = new Parcelable.Creator<Image>() {
         @Override
-        public cgImage createFromParcel(Parcel in) {
-            return new cgImage(in);
+        public Image createFromParcel(Parcel in) {
+            return new Image(in);
         }
 
         @Override
-        public cgImage[] newArray(int size) {
-            return new cgImage[size];
+        public Image[] newArray(int size) {
+            return new Image[size];
         }
     };
 
diff --git a/main/src/cgeo/geocaching/ImagesActivity.java b/main/src/cgeo/geocaching/ImagesActivity.java
index 82902b5..71be14c 100644
--- a/main/src/cgeo/geocaching/ImagesActivity.java
+++ b/main/src/cgeo/geocaching/ImagesActivity.java
@@ -24,7 +24,7 @@ public class ImagesActivity extends AbstractActivity {
     private static final String EXTRAS_GEOCODE = "geocode";
 
     private boolean offline;
-    private ArrayList<cgImage> imageNames;
+    private ArrayList<Image> imageNames;
     private ImagesList imagesList;
     private ImageType imgType = ImageType.SpoilerImages;
 
@@ -78,11 +78,11 @@ public class ImagesActivity extends AbstractActivity {
         super.onStop();
     }
 
-    public static void startActivityLogImages(final Context fromActivity, final String geocode, List<cgImage> logImages) {
+    public static void startActivityLogImages(final Context fromActivity, final String geocode, List<Image> logImages) {
         startActivity(fromActivity, geocode, logImages, ImageType.LogImages);
     }
 
-    private static void startActivity(final Context fromActivity, final String geocode, List<cgImage> logImages, ImageType imageType) {
+    private static void startActivity(final Context fromActivity, final String geocode, List<Image> logImages, ImageType imageType) {
         final Intent logImgIntent = new Intent(fromActivity, ImagesActivity.class);
         // if resuming our app within this activity, finish it and return to the cache activity
         logImgIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET)
@@ -90,12 +90,12 @@ public class ImagesActivity extends AbstractActivity {
                 .putExtra(EXTRAS_TYPE, imageType);
 
         // avoid forcing the array list as parameter type
-        final ArrayList<cgImage> arrayList = new ArrayList<cgImage>(logImages);
+        final ArrayList<Image> arrayList = new ArrayList<Image>(logImages);
         logImgIntent.putParcelableArrayListExtra(EXTRAS_IMAGES, arrayList);
         fromActivity.startActivity(logImgIntent);
     }
 
-    public static void startActivitySpoilerImages(final Context fromActivity, String geocode, List<cgImage> spoilers) {
+    public static void startActivitySpoilerImages(final Context fromActivity, String geocode, List<Image> spoilers) {
         startActivity(fromActivity, geocode, spoilers, ImageType.SpoilerImages);
     }
 
diff --git a/main/src/cgeo/geocaching/LogEntry.java b/main/src/cgeo/geocaching/LogEntry.java
index 1cb3de3..060478f 100644
--- a/main/src/cgeo/geocaching/LogEntry.java
+++ b/main/src/cgeo/geocaching/LogEntry.java
@@ -25,7 +25,7 @@ public final class LogEntry {
     public int found = -1;
     /** Friend's log entry */
     public boolean friend = false;
-    private List<cgImage> logImages = null;
+    private List<Image> logImages = null;
     public String cacheName = ""; // used for trackables
     public String cacheGuid = ""; // used for trackables
 
@@ -64,9 +64,9 @@ public final class LogEntry {
                 log.compareTo(otherLog.log) == 0;
     }
 
-    public void addLogImage(final cgImage image) {
+    public void addLogImage(final Image image) {
         if (logImages == null) {
-            logImages = new ArrayList<cgImage>();
+            logImages = new ArrayList<Image>();
         }
         logImages.add(image);
     }
@@ -74,7 +74,7 @@ public final class LogEntry {
     /**
      * @return the log images or an empty list, never <code>null</code>
      */
-    public List<cgImage> getLogImages() {
+    public List<Image> getLogImages() {
         if (logImages == null) {
             return Collections.emptyList();
         }
@@ -87,7 +87,7 @@ public final class LogEntry {
 
     public CharSequence getImageTitles() {
         final List<String> titles = new ArrayList<String>(5);
-        for (cgImage image : getLogImages()) {
+        for (Image image : getLogImages()) {
             if (StringUtils.isNotBlank(image.getTitle())) {
                 titles.add(image.getTitle());
             }
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index a5d9230..df3c6e4 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -486,7 +486,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
 
             if (log.hasLogImages()) {
 
-                final ArrayList<cgImage> logImages = new ArrayList<cgImage>(log.getLogImages());
+                final ArrayList<Image> logImages = new ArrayList<Image>(log.getLogImages());
 
                 final View.OnClickListener listener = new View.OnClickListener() {
                     @Override
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index 073cb63..6ef6d06 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -107,7 +107,7 @@ public class cgCache implements ICache, IWaypoint {
             return cgData.loadWaypoints(geocode);
         }
     };
-    private List<cgImage> spoilers = null;
+    private List<Image> spoilers = null;
     private LazyInitializedList<LogEntry> logs = new LazyInitializedList<LogEntry>() {
         @Override
         protected List<LogEntry> loadFromDatabase() {
@@ -728,15 +728,15 @@ public class cgCache implements ICache, IWaypoint {
         return inventory;
     }
 
-    public void addSpoiler(final cgImage spoiler) {
+    public void addSpoiler(final Image spoiler) {
         if (spoilers == null) {
-            spoilers = new ArrayList<cgImage>();
+            spoilers = new ArrayList<Image>();
         }
         spoilers.add(spoiler);
     }
 
     @Override
-    public List<cgImage> getSpoilers() {
+    public List<Image> getSpoilers() {
         if (spoilers == null) {
             return Collections.emptyList();
         }
@@ -1085,7 +1085,7 @@ public class cgCache implements ICache, IWaypoint {
         this.attributes.set(attributes);
     }
 
-    public void setSpoilers(List<cgImage> spoilers) {
+    public void setSpoilers(List<Image> spoilers) {
         this.spoilers = spoilers;
     }
 
@@ -1492,7 +1492,7 @@ public class cgCache implements ICache, IWaypoint {
 
             // store spoilers
             if (CollectionUtils.isNotEmpty(cache.getSpoilers())) {
-                for (cgImage oneSpoiler : cache.getSpoilers()) {
+                for (Image oneSpoiler : cache.getSpoilers()) {
                     imgGetter.getDrawable(oneSpoiler.getUrl());
                 }
             }
@@ -1505,7 +1505,7 @@ public class cgCache implements ICache, IWaypoint {
             if (Settings.isStoreLogImages()) {
                 for (LogEntry log : cache.getLogs()) {
                     if (log.hasLogImages()) {
-                        for (cgImage oneLogImg : log.getLogImages()) {
+                        for (Image oneLogImg : log.getLogImages()) {
                             imgGetter.getDrawable(oneLogImg.getUrl());
                         }
                     }
@@ -1624,8 +1624,8 @@ public class cgCache implements ICache, IWaypoint {
         return StaticMapsProvider.hasStaticMap(this);
     }
 
-    public List<cgImage> getImages() {
-        List<cgImage> result = new ArrayList<cgImage>();
+    public List<Image> getImages() {
+        List<Image> result = new ArrayList<Image>();
         result.addAll(getSpoilers());
         for (LogEntry log : getLogs()) {
             result.addAll(log.getLogImages());
diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index 3c8ddc6..b9adafe 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -1223,11 +1223,11 @@ public class cgData {
         String geocode = cache.getGeocode();
         database.delete(dbTableSpoilers, "geocode = ?", new String[]{geocode});
 
-        List<cgImage> spoilers = cache.getSpoilers();
+        List<Image> spoilers = cache.getSpoilers();
         if (CollectionUtils.isNotEmpty(spoilers)) {
             SQLiteStatement insertSpoiler = PreparedStatements.getInsertSpoiler();
             final long timestamp = System.currentTimeMillis();
-            for (cgImage spoiler : spoilers) {
+            for (Image spoiler : spoilers) {
                 insertSpoiler.bindString(1, geocode);
                 insertSpoiler.bindLong(2, timestamp);
                 insertSpoiler.bindString(3, spoiler.getUrl());
@@ -1266,7 +1266,7 @@ public class cgData {
             long logId = insertLog.executeInsert();
             if (log.hasLogImages()) {
                 SQLiteStatement insertImage = PreparedStatements.getInsertLogImage();
-                for (cgImage img : log.getLogImages()) {
+                for (Image img : log.getLogImages()) {
                     insertImage.bindLong(1, logId);
                     insertImage.bindString(2, img.getTitle());
                     insertImage.bindString(3, img.getUrl());
@@ -1480,7 +1480,7 @@ public class cgData {
                 }
 
                 if (loadFlags.contains(LoadFlag.LOAD_SPOILERS)) {
-                    final List<cgImage> spoilers = loadSpoilers(cache.getGeocode());
+                    final List<Image> spoilers = loadSpoilers(cache.getGeocode());
                     cache.setSpoilers(spoilers);
                 }
 
@@ -1754,14 +1754,14 @@ public class cgData {
         return waypoint;
     }
 
-    private static List<cgImage> loadSpoilers(final String geocode) {
+    private static List<Image> loadSpoilers(final String geocode) {
         if (StringUtils.isBlank(geocode)) {
             return null;
         }
 
         init();
 
-        final List<cgImage> spoilers = new ArrayList<cgImage>();
+        final List<Image> spoilers = new ArrayList<Image>();
 
         final Cursor cursor = database.query(
                 dbTableSpoilers,
@@ -1774,7 +1774,7 @@ public class cgData {
                 "100");
 
         while (cursor.moveToNext()) {
-            spoilers.add(new cgImage(cursor.getString(0), cursor.getString(1), cursor.getString(2)));
+            spoilers.add(new Image(cursor.getString(0), cursor.getString(1), cursor.getString(2)));
         }
 
         cursor.close();
@@ -1863,7 +1863,7 @@ public class cgData {
                 logs.add(log);
             }
             if (!cursor.isNull(7)) {
-                log.addLogImage(new cgImage(cursor.getString(10), cursor.getString(9)));
+                log.addLogImage(new Image(cursor.getString(10), cursor.getString(9)));
             }
         }
 
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index 0121cdf..0417409 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -9,7 +9,7 @@ import cgeo.geocaching.TrackableLog;
 import cgeo.geocaching.Waypoint;
 import cgeo.geocaching.cgCache;
 import cgeo.geocaching.cgData;
-import cgeo.geocaching.cgImage;
+import cgeo.geocaching.Image;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.enumerations.CacheType;
@@ -547,7 +547,7 @@ public abstract class GCParser {
                 if (matcherSpoilersInside.group(4) != null) {
                     description = matcherSpoilersInside.group(4);
                 }
-                cache.addSpoiler(new cgImage(url, title, description));
+                cache.addSpoiler(new Image(url, title, description));
             }
         } catch (Exception e) {
             // failed to parse cache spoilers
@@ -1401,7 +1401,7 @@ public abstract class GCParser {
                  * 2. Image title
                  */
                 while (matcherLogImages.find()) {
-                    final cgImage logImage = new cgImage(matcherLogImages.group(1), matcherLogImages.group(2));
+                    final Image logImage = new Image(matcherLogImages.group(1), matcherLogImages.group(2));
                     logDone.addLogImage(logImage);
                 }
 
@@ -1523,7 +1523,7 @@ public abstract class GCParser {
                     final JSONObject image = images.getJSONObject(i);
                     String url = "http://img.geocaching.com/cache/log/" + image.getString("FileName");
                     String title = image.getString("Name");
-                    final cgImage logImage = new cgImage(url, title);
+                    final Image logImage = new Image(url, title);
                     logDone.addLogImage(logImage);
                 }
 
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index 55a33e9..508d0b5 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -1,9 +1,9 @@
 package cgeo.geocaching.connector.oc;
 
+import cgeo.geocaching.Image;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.cgCache;
 import cgeo.geocaching.cgData;
-import cgeo.geocaching.cgImage;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.connector.IConnector;
 import cgeo.geocaching.enumerations.CacheSize;
@@ -158,7 +158,7 @@ final public class OkapiClient {
                     if (imageResponse.getBoolean(CACHE_IMAGE_IS_SPOILER)) {
                         final String title = imageResponse.getString(CACHE_IMAGE_CAPTION);
                         final String url = absoluteUrl(imageResponse.getString(CACHE_IMAGE_URL), cache.getGeocode());
-                        cache.addSpoiler(new cgImage(url, title));
+                        cache.addSpoiler(new Image(url, title));
                     }
                 }
             }
diff --git a/main/src/cgeo/geocaching/ui/ImagesList.java b/main/src/cgeo/geocaching/ui/ImagesList.java
index 8313f2f..e3332a0 100644
--- a/main/src/cgeo/geocaching/ui/ImagesList.java
+++ b/main/src/cgeo/geocaching/ui/ImagesList.java
@@ -1,8 +1,8 @@
 package cgeo.geocaching.ui;
 
+import cgeo.geocaching.Image;
 import cgeo.geocaching.R;
 import cgeo.geocaching.StoredList;
-import cgeo.geocaching.cgImage;
 import cgeo.geocaching.files.LocalStorage;
 import cgeo.geocaching.network.HtmlImage;
 import cgeo.geocaching.utils.Log;
@@ -43,7 +43,7 @@ public class ImagesList {
     private static final int MENU_BROWSER = 202;
 
     private BitmapDrawable currentDrawable;
-    private cgImage currentImage;
+    private Image currentImage;
 
     public enum ImageType {
         LogImages(R.string.cache_log_images_title, R.string.cache_log_images_loading),
@@ -73,7 +73,7 @@ public class ImagesList {
     /**
      * map image view id to image
      */
-    private final SparseArray<cgImage> images = new SparseArray<cgImage>();
+    private final SparseArray<Image> images = new SparseArray<Image>();
     private final String geocode;
     private LinearLayout imagesView;
 
@@ -83,7 +83,7 @@ public class ImagesList {
         inflater = activity.getLayoutInflater();
     }
 
-    public void loadImages(final View parentView, final List<cgImage> images, ImageType imageType, final boolean offline) {
+    public void loadImages(final View parentView, final List<Image> images, ImageType imageType, final boolean offline) {
 
         imagesView = (LinearLayout) parentView.findViewById(R.id.spoiler_list);
 
@@ -95,7 +95,7 @@ public class ImagesList {
         progressDialog.setMax(count);
         progressDialog.show();
 
-        for (final cgImage img : images) {
+        for (final Image img : images) {
             LinearLayout rowView = (LinearLayout) inflater.inflate(R.layout.cache_image_item, null);
 
             if (StringUtils.isNotBlank(img.getTitle())) {
@@ -117,10 +117,10 @@ public class ImagesList {
     private class AsyncImgLoader extends AsyncTask<Void, Void, BitmapDrawable> {
 
         final private LinearLayout view;
-        final private cgImage img;
+        final private Image img;
         final boolean offline;
 
-        public AsyncImgLoader(final LinearLayout view, final cgImage img, final boolean offline) {
+        public AsyncImgLoader(final LinearLayout view, final Image img, final boolean offline) {
             this.view = view;
             this.img = img;
             this.offline = offline;
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java b/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
index 80aa545..6a49c95 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
@@ -1,9 +1,9 @@
 package cgeo.geocaching.connector.gc;
 
+import cgeo.geocaching.Image;
 import cgeo.geocaching.SearchResult;
 import cgeo.geocaching.Settings;
 import cgeo.geocaching.cgCache;
-import cgeo.geocaching.cgImage;
 import cgeo.geocaching.Waypoint;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.enumerations.StatusCode;
@@ -65,7 +65,7 @@ public class GCParserTest extends AbstractResourceInstrumentationTestCase {
         assertNotNull(cache);
         assertTrue(CollectionUtils.isNotEmpty(cache.getSpoilers()));
         assertEquals(1, cache.getSpoilers().size());
-        final cgImage spoiler = cache.getSpoilers().get(0);
+        final Image spoiler = cache.getSpoilers().get(0);
         assertEquals("http://img.geocaching.com/cache/large/3f9365c3-f55c-4e55-9992-ee0e5175712c.jpg", spoiler.getUrl());
         assertEquals("SPOILER", spoiler.getTitle());
         assertNull(spoiler.getDescription());
diff --git a/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java b/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java
index 0c2c997..ea430ac 100644
--- a/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java
@@ -1,8 +1,8 @@
 package cgeo.geocaching.connector.gc;
 
+import cgeo.geocaching.Image;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.TrackableLog;
-import cgeo.geocaching.cgImage;
 import cgeo.geocaching.Trackable;
 import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase;
@@ -50,7 +50,7 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase {
         assertEquals(10, log.size());
         // log entry 4 has several images; just check first two
 
-        final List<cgImage> log4Images = log.get(4).getLogImages();
+        final List<Image> log4Images = log.get(4).getLogImages();
         assertNotNull(log4Images);
         assertEquals(5, log4Images.size());
         assertEquals("http://img.geocaching.com/track/log/large/f2e24c50-394c-4d74-8fb4-87298d8bff1d.jpg", log4Images.get(0).getUrl());
@@ -59,7 +59,7 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase {
         assertEquals("8 Crater Lake Natl Park Oregon", log4Images.get(1).getTitle());
 
         // third log entry has one image
-        final List<cgImage> log5Images = log.get(5).getLogImages();
+        final List<Image> log5Images = log.get(5).getLogImages();
         assertNotNull(log5Images);
         assertEquals(1, log5Images.size());
         assertEquals("http://img.geocaching.com/track/log/large/0096b42d-4d10-45fa-9be2-2d08c0d5cc61.jpg", log5Images.get(0).getUrl());
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
index 64ff51a..5e8a1d7 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.test.mock;
 
+import cgeo.geocaching.Image;
 import cgeo.geocaching.Trackable;
-import cgeo.geocaching.cgImage;
 import cgeo.geocaching.connector.gc.Login;
 import cgeo.geocaching.enumerations.CacheSize;
 import cgeo.geocaching.enumerations.CacheType;
@@ -140,9 +140,9 @@ public class GC2JVEH extends MockedCache {
     }
 
     @Override
-    public List<cgImage> getSpoilers() {
-        final ArrayList<cgImage> spoilers = new ArrayList<cgImage>();
-        final cgImage mockedImage = new cgImage(null, null, null);
+    public List<Image> getSpoilers() {
+        final ArrayList<Image> spoilers = new ArrayList<Image>();
+        final Image mockedImage = new Image(null, null, null);
         spoilers.add(mockedImage);
         spoilers.add(mockedImage);
         spoilers.add(mockedImage);
diff --git a/tests/src/cgeo/geocaching/test/mock/MockedCache.java b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
index 1a1127b..f667264 100644
--- a/tests/src/cgeo/geocaching/test/mock/MockedCache.java
+++ b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.test.mock;
 
 import cgeo.geocaching.ICache;
-import cgeo.geocaching.cgImage;
+import cgeo.geocaching.Image;
 import cgeo.geocaching.Trackable;
 import cgeo.geocaching.connector.gc.GCConstants;
 import cgeo.geocaching.geopoint.Geopoint;
@@ -139,7 +139,7 @@ public abstract class MockedCache implements ICache {
     }
 
     @Override
-    public List<cgImage> getSpoilers() {
+    public List<Image> getSpoilers() {
         return null;
     }