aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-09-01 00:36:46 +0200
committerSamuel Tardieu <sam@rfc1149.net>2014-09-01 00:36:46 +0200
commit46bfa0c0340780d76259a1d71401f3d6bb908123 (patch)
tree557e0a0b8a681bcdc6ac8368d727a397cd5efcba
parent6b794ef25bd8aaec8649519009de7b8df6afb148 (diff)
parentf1645c109f02d41ce76c0fd9b2ed226fa135f745 (diff)
downloadcgeo-46bfa0c0340780d76259a1d71401f3d6bb908123.zip
cgeo-46bfa0c0340780d76259a1d71401f3d6bb908123.tar.gz
cgeo-46bfa0c0340780d76259a1d71401f3d6bb908123.tar.bz2
Merge branch 'issue-4287' into release
-rw-r--r--main/src/cgeo/geocaching/Geocache.java2
-rw-r--r--main/src/cgeo/geocaching/connector/AbstractConnector.java2
-rw-r--r--main/src/cgeo/geocaching/connector/IConnector.java2
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCConnector.java4
4 files changed, 5 insertions, 5 deletions
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index e0daae1..d9b2856 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -536,7 +536,7 @@ public class Geocache implements ICache, IWaypoint {
}
public boolean supportsFavoritePoints() {
- return getConnector().supportsFavoritePoints();
+ return getConnector().supportsFavoritePoints(this);
}
public boolean supportsLogging() {
diff --git a/main/src/cgeo/geocaching/connector/AbstractConnector.java b/main/src/cgeo/geocaching/connector/AbstractConnector.java
index 7e1ca13..9729e06 100644
--- a/main/src/cgeo/geocaching/connector/AbstractConnector.java
+++ b/main/src/cgeo/geocaching/connector/AbstractConnector.java
@@ -76,7 +76,7 @@ public abstract class AbstractConnector implements IConnector {
}
@Override
- public boolean supportsFavoritePoints() {
+ public boolean supportsFavoritePoints(final Geocache cache) {
return false;
}
diff --git a/main/src/cgeo/geocaching/connector/IConnector.java b/main/src/cgeo/geocaching/connector/IConnector.java
index fbade5a..e6b6674 100644
--- a/main/src/cgeo/geocaching/connector/IConnector.java
+++ b/main/src/cgeo/geocaching/connector/IConnector.java
@@ -72,7 +72,7 @@ public interface IConnector {
*
* @return
*/
- public boolean supportsFavoritePoints();
+ public boolean supportsFavoritePoints(final Geocache cache);
/**
* enable/disable logging controls in cache details
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
index 420fd34..3b7c31e 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
@@ -285,8 +285,8 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode,
}
@Override
- public boolean supportsFavoritePoints() {
- return true;
+ public boolean supportsFavoritePoints(final Geocache cache) {
+ return !cache.getType().isEvent();
}
@Override