diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-01-23 13:25:58 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-01-23 13:25:58 +0100 |
| commit | eb8c56ec7e19538a2b96b430e3a4e0c1c8fc179e (patch) | |
| tree | 57b282849fb09aab0102a720b45b2bbc5384a34f /tests/src/cgeo/geocaching/test | |
| parent | 60c81eb3e8c58802cd5dd918a0dec0a6c97c9109 (diff) | |
| parent | 66aa9e5341c73819eb3c0e53330d4e8144f268e2 (diff) | |
| download | cgeo-eb8c56ec7e19538a2b96b430e3a4e0c1c8fc179e.zip cgeo-eb8c56ec7e19538a2b96b430e3a4e0c1c8fc179e.tar.gz cgeo-eb8c56ec7e19538a2b96b430e3a4e0c1c8fc179e.tar.bz2 | |
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
Diffstat (limited to 'tests/src/cgeo/geocaching/test')
| -rw-r--r-- | tests/src/cgeo/geocaching/test/mock/GC2CJPF.java | 4 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/test/mock/MockedCache.java | 2 |
2 files changed, 3 insertions, 3 deletions
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; } |