Merge remote branch 'blafoo/cachetype'

Conflicts:
	main/src/cgeo/geocaching/cgBase.java
	main/src/cgeo/geocaching/cgeocaches.java
	main/src/cgeo/geocaching/filter/cgFilterByType.java
	main/src/cgeo/geocaching/maps/CachesOverlay.java

5 files changed, 7 insertions, 7 deletions

diff --git a/tests/src/cgeo/geocaching/cgBaseTest.java b/tests/src/cgeo/geocaching/cgBaseTest.java
index a1cec58..c4ab0aa 100644
--- a/tests/src/cgeo/geocaching/cgBaseTest.java
+++ b/tests/src/cgeo/geocaching/cgBaseTest.java
@@ -32,7 +32,7 @@ public class cgBaseTest extends AndroidTestCase {
             cgCacheWrap caches = cgBase.parseCacheFromText(cache.getData(), 0, null);
             cgCache cacheParsed = caches.cacheList.get(0);
             Assert.assertEquals(cache.getGeocode(), cacheParsed.getGeocode());
-            Assert.assertTrue(cache.getCacheType() == cacheParsed.getCacheType());
+            Assert.assertTrue(cache.getType() == cacheParsed.getType());
             Assert.assertEquals(cache.getOwner(), cacheParsed.getOwner());
             Assert.assertEquals(cache.getDifficulty(), cacheParsed.getDifficulty());
             Assert.assertEquals(cache.getTerrain(), cacheParsed.getTerrain());
diff --git a/tests/src/cgeo/geocaching/files/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java
index efc7db8..577c516 100644
--- a/tests/src/cgeo/geocaching/files/GPXParserTest.java
+++ b/tests/src/cgeo/geocaching/files/GPXParserTest.java
@@ -33,7 +33,7 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase {
         final cgCache cache = caches.get(0);
         assertEquals("GC1BKP3", cache.getGeocode());
         assertEquals("9946f030-a514-46d8-a050-a60e92fd2e1a", cache.getGuid());
-        assertEquals(CacheType.TRADITIONAL, cache.getCacheType());
+        assertEquals(CacheType.TRADITIONAL, cache.getType());
         assertEquals(false, cache.isArchived());
         assertEquals(false, cache.isDisabled());
         assertEquals("Die Schatzinsel / treasure island", cache.getName());
@@ -57,7 +57,7 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase {
         final List<cgCache> caches = readGPX10(R.raw.oc5952_gpx);
         final cgCache cache = caches.get(0);
         assertEquals("OC5952", cache.getGeocode());
-        assertEquals(CacheType.TRADITIONAL, cache.getCacheType());
+        assertEquals(CacheType.TRADITIONAL, cache.getType());
         assertEquals(false, cache.isArchived());
         assertEquals(false, cache.isDisabled());
         assertEquals("Die Schatzinsel / treasure island", cache.getName());
@@ -119,7 +119,7 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase {
         assertEquals(refCoordinates.format(GeopointFormatter.Format.LON_DECMINUTE), cache.getLongitude());
         assertEquals("vptsz", cache.getOwner());
         assertEquals(CacheSize.SMALL, cache.getSize());
-        assertEquals(CacheType.MULTI, cache.getCacheType());
+        assertEquals(CacheType.MULTI, cache.getType());
         assertFalse(cache.isArchived());
         assertFalse(cache.isDisabled());
         assertFalse(cache.isEventCache());
diff --git a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
index 168b7e7..deeeb44 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
@@ -50,7 +50,7 @@ public class GC1ZXX2 extends MockedCache {
     }
 
     @Override
-    public CacheType getCacheType() {
+    public CacheType getType() {
         return CacheType.TRADITIONAL;
     }
 
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
index b07d62c..db7270d 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
@@ -54,7 +54,7 @@ public class GC2CJPF extends MockedCache {
     }
 
     @Override
-    public CacheType getCacheType() {
+    public CacheType getType() {
         return CacheType.MULTI;
     }
 
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
index a837929..8b4a1bb 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
@@ -67,7 +67,7 @@ public class GC2JVEH extends MockedCache {
     }
 
     @Override
-    public CacheType getCacheType() {
+    public CacheType getType() {
         return CacheType.MYSTERY;
     }