aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/connector/AbstractConnector.java
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2013-12-29 16:00:08 +0100
committerSamuel Tardieu <sam@rfc1149.net>2013-12-29 16:00:08 +0100
commit6c2d17c455245cc4f9dbdd76262a0da09dafcad5 (patch)
treef49fa13942cc51f22c548950fcdbefbf856ec11f /main/src/cgeo/geocaching/connector/AbstractConnector.java
parent102b5cb2fa4779af97076ed2d6afe6a0349e5329 (diff)
downloadcgeo-6c2d17c455245cc4f9dbdd76262a0da09dafcad5.zip
cgeo-6c2d17c455245cc4f9dbdd76262a0da09dafcad5.tar.gz
cgeo-6c2d17c455245cc4f9dbdd76262a0da09dafcad5.tar.bz2
fix #3492: empty strings added to capability list
Diffstat (limited to 'main/src/cgeo/geocaching/connector/AbstractConnector.java')
-rw-r--r--main/src/cgeo/geocaching/connector/AbstractConnector.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/main/src/cgeo/geocaching/connector/AbstractConnector.java b/main/src/cgeo/geocaching/connector/AbstractConnector.java
index 2ead406..9e1d17a 100644
--- a/main/src/cgeo/geocaching/connector/AbstractConnector.java
+++ b/main/src/cgeo/geocaching/connector/AbstractConnector.java
@@ -214,10 +214,10 @@ public abstract class AbstractConnector implements IConnector {
@Override
public final Collection<String> getCapabilities() {
ArrayList<String> builder = new ArrayList<String>();
- builder.add(capability(ISearchByViewPort.class, R.string.feature_search_live_map));
- builder.add(capability(ISearchByKeyword.class, R.string.feature_search_keyword));
- builder.add(capability(ISearchByCenter.class, R.string.feature_search_center));
- builder.add(capability(ISearchByGeocode.class, R.string.feature_search_geocode));
+ addCapability(builder, ISearchByViewPort.class, R.string.feature_search_live_map);
+ addCapability(builder, ISearchByKeyword.class, R.string.feature_search_keyword);
+ addCapability(builder, ISearchByCenter.class, R.string.feature_search_center);
+ addCapability(builder, ISearchByGeocode.class, R.string.feature_search_geocode);
if (supportsUserActions()) {
builder.add(feature(R.string.feature_search_user));
}
@@ -239,11 +239,10 @@ public abstract class AbstractConnector implements IConnector {
return builder;
}
- private String capability(Class<? extends IConnector> clazz, final int featureResourceId) {
+ private void addCapability(final ArrayList<String> capabilities, final Class<? extends IConnector> clazz, final int featureResourceId) {
if (clazz.isInstance(this)) {
- return feature(featureResourceId);
+ capabilities.add(feature(featureResourceId));
}
- return StringUtils.EMPTY;
}
private static String feature(int featureResourceId) {