Merge branch 'issue-2322' into upstream

Conflicts:
	main/src/cgeo/geocaching/connector/IConnector.java
	main/src/cgeo/geocaching/connector/gc/GCParser.java
	main/src/cgeo/geocaching/maps/CGeoMap.java

5 files changed, 20 insertions, 20 deletions

diff --git a/tests/src/cgeo/geocaching/connector/gc/IconDecoderTest.java b/tests/src/cgeo/geocaching/connector/gc/IconDecoderTest.java
index af5d1bc..33f936e 100644
--- a/tests/src/cgeo/geocaching/connector/gc/IconDecoderTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/IconDecoderTest.java
@@ -106,25 +106,25 @@ public class IconDecoderTest extends AbstractResourceInstrumentationTestCase {
 
         assertTrue(parseMapPNG(bitmap, 132, 136, 12).isFound()); // GC3JDBW
         assertTrue(parseMapPNG(bitmap, 68, 24, 12).isFound()); // GC2T0AH
-        assertTrue(parseMapPNG(bitmap, 176, 232, 12).isOwn()); // GC2RPBX
+        assertTrue(parseMapPNG(bitmap, 176, 232, 12).isOwner()); // GC2RPBX
         assertTrue(parseMapPNG(bitmap, 148, 60, 12).isFound()); // GC31FY6
         assertTrue(parseMapPNG(bitmap, 216, 20, 12).isFound()); // GC2KP3M
-        assertTrue(parseMapPNG(bitmap, 212, 184, 12).isOwn()); // GC30W3K
-        assertTrue(parseMapPNG(bitmap, 148, 72, 12).isOwn()); // GC2RPAZ
-        assertTrue(parseMapPNG(bitmap, 216, 48, 12).isOwn()); // GC2RP8W
+        assertTrue(parseMapPNG(bitmap, 212, 184, 12).isOwner()); // GC30W3K
+        assertTrue(parseMapPNG(bitmap, 148, 72, 12).isOwner()); // GC2RPAZ
+        assertTrue(parseMapPNG(bitmap, 216, 48, 12).isOwner()); // GC2RP8W
         assertTrue(parseMapPNG(bitmap, 212, 60, 12).isFound()); // GC3CC97
-        assertTrue(parseMapPNG(bitmap, 148, 100, 12).isOwn()); // GC2RPAT
+        assertTrue(parseMapPNG(bitmap, 148, 100, 12).isOwner()); // GC2RPAT
         assertTrue(parseMapPNG(bitmap, 104, 136, 12).isFound()); // GC3AE31
-        assertTrue(parseMapPNG(bitmap, 52, 96, 12).isOwn()); // GC2RPCH
-        assertTrue(parseMapPNG(bitmap, 172, 156, 12).isOwn()); // GC2RQ07
+        assertTrue(parseMapPNG(bitmap, 52, 96, 12).isOwner()); // GC2RPCH
+        assertTrue(parseMapPNG(bitmap, 172, 156, 12).isOwner()); // GC2RQ07
         assertTrue(parseMapPNG(bitmap, 116, 56, 12).isFound()); // GC3AYR2
-        assertTrue(parseMapPNG(bitmap, 208, 68, 12).isOwn()); // GC2RP93
-        assertTrue(parseMapPNG(bitmap, 200, 52, 12).isOwn()); // GC2RPAA
+        assertTrue(parseMapPNG(bitmap, 208, 68, 12).isOwner()); // GC2RP93
+        assertTrue(parseMapPNG(bitmap, 200, 52, 12).isOwner()); // GC2RPAA
         assertTrue(parseMapPNG(bitmap, 208, 44, 12).isFound()); // GC3HE15
-        assertTrue(parseMapPNG(bitmap, 112, 76, 12).isOwn()); // GC2RPBE
-        assertTrue(parseMapPNG(bitmap, 232, 192, 12).isOwn()); // GC2E1KF
+        assertTrue(parseMapPNG(bitmap, 112, 76, 12).isOwner()); // GC2RPBE
+        assertTrue(parseMapPNG(bitmap, 232, 192, 12).isOwner()); // GC2E1KF
         assertTrue(parseMapPNG(bitmap, 184, 76, 12).isFound()); // GC2NK5R
-        assertTrue(parseMapPNG(bitmap, 132, 148, 12).isOwn()); // GC2RPBC
+        assertTrue(parseMapPNG(bitmap, 132, 148, 12).isOwner()); // GC2RPBC
     }
 
     public void testParseExtraMap3() {
@@ -389,9 +389,9 @@ public class IconDecoderTest extends AbstractResourceInstrumentationTestCase {
         assertTrue(parseMapPNG(bitmap, 72, 16, 14).isFound());
         assertTrue(parseMapPNG(bitmap, 100, 16, 14).isFound());
         assertTrue(parseMapPNG(bitmap, 128, 16, 14).isFound());
-        assertTrue(parseMapPNG(bitmap, 44, 44, 14).isOwn());
-        assertTrue(parseMapPNG(bitmap, 76, 44, 14).isOwn());
-        assertTrue(parseMapPNG(bitmap, 132, 44, 14).isOwn());
+        assertTrue(parseMapPNG(bitmap, 44, 44, 14).isOwner());
+        assertTrue(parseMapPNG(bitmap, 76, 44, 14).isOwner());
+        assertTrue(parseMapPNG(bitmap, 132, 44, 14).isOwner());
         assertEquals(CacheType.MULTI, parseMapPNG(bitmap, 40, 72, 14).getType());
         assertEquals(CacheType.MULTI, parseMapPNG(bitmap, 72, 72, 14).getType());
         assertEquals(CacheType.MULTI, parseMapPNG(bitmap, 100, 72, 14).getType());
diff --git a/tests/src/cgeo/geocaching/files/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java
index db29813..ecca308 100644
--- a/tests/src/cgeo/geocaching/files/GPXParserTest.java
+++ b/tests/src/cgeo/geocaching/files/GPXParserTest.java
@@ -141,7 +141,7 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase {
         assertFalse(cache.isDisabled());
         assertFalse(cache.isEventCache());
         assertFalse(cache.isPremiumMembersOnly());
-        assertFalse(cache.isOwn());
+        assertFalse(cache.isOwner());
         assertTrue(cache.isFound());
         assertEquals("Station3: Der zerbrochene Stein zählt doppelt.\nFinal: Oben neben dem Tor", cache.getHint());
         // logs
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
index cc19eb3..d6601d5 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
@@ -103,11 +103,11 @@ public class GC2CJPF extends MockedCache {
      * @see cgeo.geocaching.test.mock.MockedCache#isOwn()
      */
     @Override
-    public boolean isOwn() {
+    public boolean isOwner() {
         if ("Tom03".equals(Settings.getUsername())) {
             return true;
         }
-        return super.isOwn();
+        return super.isOwner();
     }
 
     @Override
diff --git a/tests/src/cgeo/geocaching/test/mock/MockedCache.java b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
index f667264..7ad566a 100644
--- a/tests/src/cgeo/geocaching/test/mock/MockedCache.java
+++ b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
@@ -94,7 +94,7 @@ public abstract class MockedCache implements ICache {
     }
 
     @Override
-    public boolean isOwn() {
+    public boolean isOwner() {
         return false;
     }
 
diff --git a/tests/src/cgeo/test/Compare.java b/tests/src/cgeo/test/Compare.java
index 4d0e08e..71c0976 100644
--- a/tests/src/cgeo/test/Compare.java
+++ b/tests/src/cgeo/test/Compare.java
@@ -27,7 +27,7 @@ public abstract class Compare {
         if (all) {
             assertEquals(expected.getCoords(), actual.getCoords());
             assertTrue(actual.isReliableLatLon());
-            assertEquals(expected.isOwn(), actual.isOwn());
+            assertEquals(expected.isOwner(), actual.isOwner());
             assertEquals(expected.getOwnerUserId(), actual.getOwnerUserId());
             assertEquals(expected.getHint(), actual.getHint());
             assertTrue(actual.getDescription().startsWith(expected.getDescription()));