From 6c2d17c455245cc4f9dbdd76262a0da09dafcad5 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 29 Dec 2013 16:00:08 +0100 Subject: fix #3492: empty strings added to capability list --- main/src/cgeo/geocaching/connector/AbstractConnector.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'main/src') 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 getCapabilities() { ArrayList builder = new ArrayList(); - 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 clazz, final int featureResourceId) { + private void addCapability(final ArrayList capabilities, final Class clazz, final int featureResourceId) { if (clazz.isInstance(this)) { - return feature(featureResourceId); + capabilities.add(feature(featureResourceId)); } - return StringUtils.EMPTY; } private static String feature(int featureResourceId) { -- cgit v1.1