more null annotations

33 files changed, 99 insertions, 46 deletions

diff --git a/main/src/cgeo/geocaching/CacheMenuHandler.java b/main/src/cgeo/geocaching/CacheMenuHandler.java
index fa2f994..fbd8771 100644
--- a/main/src/cgeo/geocaching/CacheMenuHandler.java
+++ b/main/src/cgeo/geocaching/CacheMenuHandler.java
@@ -6,6 +6,8 @@ import cgeo.geocaching.apps.cache.navi.NavigationSelectionActionProvider;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.ui.AbstractUIFactory;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 import android.app.Activity;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.MenuItemCompat;
@@ -38,7 +40,7 @@ public final class CacheMenuHandler extends AbstractUIFactory {
 
     }
 
-    public static boolean onMenuItemSelected(final MenuItem item, final CacheMenuHandler.ActivityInterface activityInterface, final Geocache cache) {
+    public static boolean onMenuItemSelected(final MenuItem item, @NonNull final CacheMenuHandler.ActivityInterface activityInterface, final Geocache cache) {
         assert activityInterface instanceof Activity || activityInterface instanceof Fragment;
         final Activity activity;
         if (activityInterface instanceof Activity) {
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 92efbb6..e47730b 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -85,6 +85,8 @@ public class Geocache implements IWaypoint {
     private long visitedDate = 0;
     private int listId = StoredList.TEMPORARY_LIST.id;
     private boolean detailed = false;
+
+    @NonNull
     private String geocode = "";
     private String cacheId = "";
     private String guid = "";
@@ -699,11 +701,7 @@ public class Geocache implements IWaypoint {
         return getConnector() instanceof ISearchByCenter;
     }
 
-    public void shareCache(final Activity fromActivity, final Resources res) {
-        if (geocode == null) {
-            return;
-        }
-
+    public void shareCache(@NonNull final Activity fromActivity, final Resources res) {
         final Intent intent = getShareIntent();
 
         fromActivity.startActivity(Intent.createChooser(intent, res.getText(R.string.cache_menu_share)));
@@ -1063,7 +1061,7 @@ public class Geocache implements IWaypoint {
         this.directionImg = directionImg;
     }
 
-    public void setGeocode(final String geocode) {
+    public void setGeocode(@NonNull final String geocode) {
         this.geocode = StringUtils.upperCase(geocode);
     }
 
diff --git a/main/src/cgeo/geocaching/connector/AbstractConnector.java b/main/src/cgeo/geocaching/connector/AbstractConnector.java
index 7e21366..0583aa1 100644
--- a/main/src/cgeo/geocaching/connector/AbstractConnector.java
+++ b/main/src/cgeo/geocaching/connector/AbstractConnector.java
@@ -130,7 +130,8 @@ public abstract class AbstractConnector implements IConnector {
     }
 
     @Override
-    public String getGeocodeFromUrl(final String url) {
+    @Nullable
+    public String getGeocodeFromUrl(@NonNull final String url) {
         final String urlPrefix = getCacheUrlPrefix();
         if (StringUtils.isEmpty(urlPrefix) || StringUtils.startsWith(url, urlPrefix)) {
             @NonNull final String geocode = url.substring(urlPrefix.length());
@@ -202,7 +203,7 @@ public abstract class AbstractConnector implements IConnector {
     }
 
     @Override
-    public String getWaypointGpxId(final String prefix, final String geocode) {
+    public String getWaypointGpxId(final String prefix, @NonNull final String geocode) {
         // Default: just return the prefix
         return prefix;
     }
diff --git a/main/src/cgeo/geocaching/connector/ConnectorFactory.java b/main/src/cgeo/geocaching/connector/ConnectorFactory.java
index f8806de..10417d2 100644
--- a/main/src/cgeo/geocaching/connector/ConnectorFactory.java
+++ b/main/src/cgeo/geocaching/connector/ConnectorFactory.java
@@ -214,9 +214,12 @@ public final class ConnectorFactory {
     }
 
     @Nullable
-    public static String getGeocodeFromURL(final String url) {
+    public static String getGeocodeFromURL(@Nullable final String url) {
+        if (url == null) {
+            return null;
+        }
         for (final IConnector connector : CONNECTORS) {
-            final String geocode = connector.getGeocodeFromUrl(url);
+            @Nullable final String geocode = connector.getGeocodeFromUrl(url);
             if (StringUtils.isNotBlank(geocode)) {
                 return geocode;
             }
diff --git a/main/src/cgeo/geocaching/connector/IConnector.java b/main/src/cgeo/geocaching/connector/IConnector.java
index ce98605..dc4bb6a 100644
--- a/main/src/cgeo/geocaching/connector/IConnector.java
+++ b/main/src/cgeo/geocaching/connector/IConnector.java
@@ -139,7 +139,8 @@ public interface IConnector {
      * @param url
      * @return
      */
-    public String getGeocodeFromUrl(final String url);
+    @Nullable
+    public String getGeocodeFromUrl(@NonNull final String url);
 
     /**
      * enable/disable uploading personal note
@@ -232,7 +233,7 @@ public interface IConnector {
      * @param prefix
      * @return
      */
-    public String getWaypointGpxId(String prefix, String geocode);
+    public String getWaypointGpxId(String prefix, @NonNull String geocode);
 
     /**
      * Get the 'prefix' (key) for a waypoint from the 'name' in the GPX file
diff --git a/main/src/cgeo/geocaching/connector/UnknownConnector.java b/main/src/cgeo/geocaching/connector/UnknownConnector.java
index 1ef1aff..cabf03e 100644
--- a/main/src/cgeo/geocaching/connector/UnknownConnector.java
+++ b/main/src/cgeo/geocaching/connector/UnknownConnector.java
@@ -43,7 +43,8 @@ class UnknownConnector extends AbstractConnector {
     }
 
     @Override
-    public String getGeocodeFromUrl(final String url) {
+    @Nullable
+    public String getGeocodeFromUrl(@NonNull final String url) {
         return null;
     }
 
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
index e43b9b5..3ad8117 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
@@ -305,7 +305,8 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode,
     }
 
     @Override
-    public String getGeocodeFromUrl(final String url) {
+    @Nullable
+    public String getGeocodeFromUrl(@NonNull final String url) {
         // coord.info URLs
         String code = StringUtils.substringAfterLast(url, "coord.info/");
         if (code != null && canHandle(code)) {
@@ -375,7 +376,7 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode,
     }
 
     @Override
-    public String getWaypointGpxId(final String prefix, final String geocode) {
+    public String getWaypointGpxId(final String prefix, @NonNull final String geocode) {
         String gpxId = prefix;
         if (StringUtils.isNotBlank(geocode) && geocode.length() > 2) {
             gpxId += geocode.substring(2);
diff --git a/main/src/cgeo/geocaching/connector/trackable/GeokretyConnector.java b/main/src/cgeo/geocaching/connector/trackable/GeokretyConnector.java
index b6792f0..c2c9876 100644
--- a/main/src/cgeo/geocaching/connector/trackable/GeokretyConnector.java
+++ b/main/src/cgeo/geocaching/connector/trackable/GeokretyConnector.java
@@ -26,6 +26,7 @@ public class GeokretyConnector extends AbstractTrackableConnector {
     }
 
     @Override
+    @Nullable
     public Trackable searchTrackable(final String geocode, final String guid, final String id) {
         final String page = Network.getResponseData(Network.getRequest("http://geokrety.org/export2.php?gkid=" + getId(geocode)));
         if (page == null) {
diff --git a/main/src/cgeo/geocaching/connector/trackable/SwaggieConnector.java b/main/src/cgeo/geocaching/connector/trackable/SwaggieConnector.java
index 01688c7..dcd618c 100644
--- a/main/src/cgeo/geocaching/connector/trackable/SwaggieConnector.java
+++ b/main/src/cgeo/geocaching/connector/trackable/SwaggieConnector.java
@@ -25,6 +25,7 @@ public final class SwaggieConnector extends AbstractTrackableConnector {
     }
 
     @Override
+    @Nullable
     public Trackable searchTrackable(final String geocode, final String guid, final String id) {
         final String page = Network.getResponseData(Network.getRequest(getUrl(geocode)));
         if (page == null) {
diff --git a/main/src/cgeo/geocaching/connector/trackable/TrackableConnector.java b/main/src/cgeo/geocaching/connector/trackable/TrackableConnector.java
index 01c1897..1281683 100644
--- a/main/src/cgeo/geocaching/connector/trackable/TrackableConnector.java
+++ b/main/src/cgeo/geocaching/connector/trackable/TrackableConnector.java
@@ -21,6 +21,7 @@ public interface TrackableConnector {
 
     public boolean isLoggable();
 
+    @Nullable
     public Trackable searchTrackable(String geocode, String guid, String id);
 
     @Nullable
diff --git a/main/src/cgeo/geocaching/connector/trackable/TravelBugConnector.java b/main/src/cgeo/geocaching/connector/trackable/TravelBugConnector.java
index 5d825a3..665ebea 100644
--- a/main/src/cgeo/geocaching/connector/trackable/TravelBugConnector.java
+++ b/main/src/cgeo/geocaching/connector/trackable/TravelBugConnector.java
@@ -36,6 +36,7 @@ public class TravelBugConnector extends AbstractTrackableConnector {
     }
 
     @Override
+    @Nullable
     public Trackable searchTrackable(final String geocode, final String guid, final String id) {
         return GCParser.searchTrackable(geocode, guid, id);
     }
diff --git a/main/src/cgeo/geocaching/connector/trackable/UnknownTrackableConnector.java b/main/src/cgeo/geocaching/connector/trackable/UnknownTrackableConnector.java
index 7e7e1b6..5fc7bf1 100644
--- a/main/src/cgeo/geocaching/connector/trackable/UnknownTrackableConnector.java
+++ b/main/src/cgeo/geocaching/connector/trackable/UnknownTrackableConnector.java
@@ -3,6 +3,7 @@ package cgeo.geocaching.connector.trackable;
 import cgeo.geocaching.Trackable;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
 public class UnknownTrackableConnector extends AbstractTrackableConnector {
 
@@ -18,6 +19,7 @@ public class UnknownTrackableConnector extends AbstractTrackableConnector {
     }
 
     @Override
+    @Nullable
     public Trackable searchTrackable(final String geocode, final String guid, final String id) {
         return null;
     }
diff --git a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
index 585b890..770b63b 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheAttribute.java
@@ -130,19 +130,22 @@ public enum CacheAttribute {
     // THIS LIST IS GENERATED: don't change anything here but read
     // project/attributes/readme.txt
 
+    @NonNull
     private static final String INTERNAL_YES = "_yes";
+    @NonNull
     private static final String INTERNAL_NO = "_no";
 
     public static final int NO_ID = -1;
 
     public final int gcid;
     public final int ocacode;
+    @NonNull
     public final String rawName;
     public final int drawableId;
     public final int stringIdYes;
     public final int stringIdNo;
 
-    CacheAttribute(final int gcid, final int ocacode, final String rawName,
+    CacheAttribute(final int gcid, final int ocacode, @NonNull final String rawName,
             final int drawableId, final int stringIdYes, final int stringIdNo) {
         this.gcid = gcid;
         this.ocacode = ocacode;
@@ -159,12 +162,15 @@ public enum CacheAttribute {
      *            true: for positive text, false: for negative text
      * @return the localized text
      */
+    @NonNull
     public String getL10n(final boolean enabled) {
         return CgeoApplication.getInstance().getResources().getString(
                 enabled ? stringIdYes : stringIdNo);
     }
 
+    @NonNull
     private final static Map<String, CacheAttribute> FIND_BY_GCRAWNAME = new HashMap<>();
+    @NonNull
     private final static SparseArray<CacheAttribute> FIND_BY_OCACODE = new SparseArray<>();
     static {
         for (final CacheAttribute attr : values()) {
@@ -176,7 +182,7 @@ public enum CacheAttribute {
     }
 
     @Nullable
-    public static CacheAttribute getByRawName(final String rawName) {
+    public static CacheAttribute getByRawName(@Nullable final String rawName) {
         return rawName != null ? FIND_BY_GCRAWNAME.get(rawName) : null;
     }
 
@@ -186,14 +192,14 @@ public enum CacheAttribute {
     }
 
     @NonNull
-    public static String trimAttributeName(final String attributeName) {
+    public static String trimAttributeName(@Nullable final String attributeName) {
         if (null == attributeName) {
             return "";
         }
         return attributeName.replace(INTERNAL_YES, "").replace(INTERNAL_NO, "").trim();
     }
 
-    public static boolean isEnabled(final String attributeName) {
+    public static boolean isEnabled(@Nullable final String attributeName) {
         return !StringUtils.endsWithIgnoreCase(attributeName, INTERNAL_NO);
     }
 
diff --git a/main/src/cgeo/geocaching/enumerations/CacheListType.java b/main/src/cgeo/geocaching/enumerations/CacheListType.java
index 1fce282..297e1be 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheListType.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheListType.java
@@ -2,6 +2,8 @@ package cgeo.geocaching.enumerations;
 
 import cgeo.geocaching.loaders.AbstractSearchLoader.CacheListLoaderType;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 public enum CacheListType {
     OFFLINE(true, CacheListLoaderType.OFFLINE),
     POCKET(false, CacheListLoaderType.POCKET),
@@ -19,9 +21,9 @@ public enum CacheListType {
      */
     public final boolean canSwitch;
 
-    public final CacheListLoaderType loaderType;
+    @NonNull public final CacheListLoaderType loaderType;
 
-    CacheListType(final boolean canSwitch, final CacheListLoaderType loaderType) {
+    CacheListType(final boolean canSwitch, @NonNull final CacheListLoaderType loaderType) {
         this.canSwitch = canSwitch;
         this.loaderType = loaderType;
     }
diff --git a/main/src/cgeo/geocaching/enumerations/CacheSize.java b/main/src/cgeo/geocaching/enumerations/CacheSize.java
index 54e12e0..10c8c9f 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheSize.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheSize.java
@@ -4,6 +4,7 @@ import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.Locale;
@@ -24,6 +25,7 @@ public enum CacheSize {
     OTHER("Other", 8, R.string.cache_size_other, "other"),
     UNKNOWN("Unknown", -1, R.string.cache_size_unknown, ""); // CacheSize not init. yet
 
+    @NonNull
     public final String id;
     public final int comparable;
     private final int stringId;
@@ -32,13 +34,14 @@ public enum CacheSize {
      */
     private final String ocSize2;
 
-    CacheSize(final String id, final int comparable, final int stringId, final String ocSize2) {
+    CacheSize(@NonNull final String id, final int comparable, final int stringId, final String ocSize2) {
         this.id = id;
         this.comparable = comparable;
         this.stringId = stringId;
         this.ocSize2 = ocSize2;
     }
 
+    @NonNull
     final private static Map<String, CacheSize> FIND_BY_ID = new HashMap<>();
     static {
         for (final CacheSize cs : values()) {
@@ -50,7 +53,7 @@ public enum CacheSize {
     }
 
     @NonNull
-    public static CacheSize getById(final String id) {
+    public static CacheSize getById(@Nullable final String id) {
         if (id == null) {
             return UNKNOWN;
         }
@@ -87,6 +90,7 @@ public enum CacheSize {
         return UNKNOWN;
     }
 
+    @NonNull
     public final String getL10n() {
         return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
     }
diff --git a/main/src/cgeo/geocaching/enumerations/CacheType.java b/main/src/cgeo/geocaching/enumerations/CacheType.java
index e66c742..4e3b33a 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheType.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheType.java
@@ -57,8 +57,11 @@ public enum CacheType {
         this.markerId = markerId;
     }
 
+    @NonNull
     private final static Map<String, CacheType> FIND_BY_ID = new HashMap<>();
+    @NonNull
     private final static Map<String, CacheType> FIND_BY_PATTERN = new HashMap<>();
+    @NonNull
     private final static Map<String, CacheType> FIND_BY_GUID = new HashMap<>();
 
     static {
@@ -102,6 +105,7 @@ public enum CacheType {
         return result;
     }
 
+    @NonNull
     public final String getL10n() {
         return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
     }
diff --git a/main/src/cgeo/geocaching/enumerations/LoadFlags.java b/main/src/cgeo/geocaching/enumerations/LoadFlags.java
index 69d8df2..0f08690 100644
--- a/main/src/cgeo/geocaching/enumerations/LoadFlags.java
+++ b/main/src/cgeo/geocaching/enumerations/LoadFlags.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching.enumerations;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 import java.util.EnumSet;
 
 /**
@@ -33,6 +35,7 @@ public interface LoadFlags {
         DB // include saving to CacheCache
     }
 
+    @NonNull
     public final static EnumSet<SaveFlag> SAVE_ALL = EnumSet.allOf(SaveFlag.class);
 
     public enum RemoveFlag {
@@ -41,6 +44,7 @@ public interface LoadFlags {
         OWN_WAYPOINTS_ONLY_FOR_TESTING // only to be used in unit testing (as we never delete own waypoints)
     }
 
+    @NonNull
     public final static EnumSet<RemoveFlag> REMOVE_ALL = EnumSet.of(RemoveFlag.CACHE, RemoveFlag.DB);
 
 }
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java b/main/src/cgeo/geocaching/enumerations/LogType.java
index a27ec1a..bf0d66c 100644
--- a/main/src/cgeo/geocaching/enumerations/LogType.java
+++ b/main/src/cgeo/geocaching/enumerations/LogType.java
@@ -4,6 +4,7 @@ import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.Locale;
@@ -47,13 +48,16 @@ public enum LogType {
     UNKNOWN(0, "unknown", "", "", R.string.err_unknown, R.drawable.mark_red); // LogType not init. yet
 
     public final int id;
+    @Nullable
     public final String iconName;
+    @NonNull
     public final String type;
+    @NonNull
     public final String oc_type;
     private final int stringId;
     public final int markerId;
 
-    LogType(final int id, final String iconName, final String type, final String oc_type, final int stringId, final int markerId) {
+    LogType(final int id, @Nullable final String iconName, @NonNull final String type, @NonNull final String oc_type, final int stringId, final int markerId) {
         this.id = id;
         this.iconName = iconName;
         this.type = type;
@@ -110,6 +114,7 @@ public enum LogType {
         return result;
     }
 
+    @NonNull
     public final String getL10n() {
         return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
     }
diff --git a/main/src/cgeo/geocaching/enumerations/LogTypeTrackable.java b/main/src/cgeo/geocaching/enumerations/LogTypeTrackable.java
index fefeb62..05ce6fd 100644
--- a/main/src/cgeo/geocaching/enumerations/LogTypeTrackable.java
+++ b/main/src/cgeo/geocaching/enumerations/LogTypeTrackable.java
@@ -18,6 +18,7 @@ public enum LogTypeTrackable {
         this.resourceId = resourceId;
     }
 
+    @NonNull
     public String getLabel() {
         return CgeoApplication.getInstance().getString(resourceId);
     }
diff --git a/main/src/cgeo/geocaching/enumerations/StatusCode.java b/main/src/cgeo/geocaching/enumerations/StatusCode.java
index 9030e2b..37d027f 100644
--- a/main/src/cgeo/geocaching/enumerations/StatusCode.java
+++ b/main/src/cgeo/geocaching/enumerations/StatusCode.java
@@ -2,6 +2,8 @@ package cgeo.geocaching.enumerations;
 
 import cgeo.geocaching.R;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 import android.content.res.Resources;
 
 public enum StatusCode {
@@ -35,6 +37,7 @@ public enum StatusCode {
         return error_string;
     }
 
+    @NonNull
     public String getErrorString(final Resources res) {
         return res.getString(error_string);
     }
diff --git a/main/src/cgeo/geocaching/enumerations/WaypointType.java b/main/src/cgeo/geocaching/enumerations/WaypointType.java
index 732a665..d2281ef 100644
--- a/main/src/cgeo/geocaching/enumerations/WaypointType.java
+++ b/main/src/cgeo/geocaching/enumerations/WaypointType.java
@@ -49,6 +49,7 @@ public enum WaypointType {
             }
         }
     }
+    @NonNull
     public static final Set<WaypointType> ALL_TYPES_EXCEPT_OWN_AND_ORIGINAL = Collections.unmodifiableSet(ALL_TYPES_EXCEPT_OWN_AND_ORIGINAL_TMP);
 
     /**
@@ -67,6 +68,7 @@ public enum WaypointType {
         return waypointType;
     }
 
+    @NonNull
     public final String getL10n() {
         return CgeoApplication.getInstance().getBaseContext().getResources().getString(stringId);
     }
diff --git a/main/src/cgeo/geocaching/filter/AbstractFilter.java b/main/src/cgeo/geocaching/filter/AbstractFilter.java
index 248c9c2..dff8b4b 100644
--- a/main/src/cgeo/geocaching/filter/AbstractFilter.java
+++ b/main/src/cgeo/geocaching/filter/AbstractFilter.java
@@ -8,9 +8,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 abstract class AbstractFilter implements IFilter {
+    @NonNull
     private final String name;
 
-    protected AbstractFilter(final String name) {
+    protected AbstractFilter(@NonNull final String name) {
         this.name = name;
     }
 
@@ -26,6 +27,7 @@ abstract class AbstractFilter implements IFilter {
     }
 
     @Override
+    @NonNull
     public String getName() {
         return name;
     }
diff --git a/main/src/cgeo/geocaching/filter/AttributeFilter.java b/main/src/cgeo/geocaching/filter/AttributeFilter.java
index 2fc6eb2..6ed4a8f 100644
--- a/main/src/cgeo/geocaching/filter/AttributeFilter.java
+++ b/main/src/cgeo/geocaching/filter/AttributeFilter.java
@@ -15,7 +15,7 @@ class AttributeFilter extends AbstractFilter {
 
     private final String attribute;
 
-    public AttributeFilter(final String name, final String attribute) {
+    public AttributeFilter(@NonNull final String name, final String attribute) {
         super(name);
         this.attribute = attribute;
     }
diff --git a/main/src/cgeo/geocaching/filter/DistanceFilter.java b/main/src/cgeo/geocaching/filter/DistanceFilter.java
index f1ba7f8..b352f5d 100644
--- a/main/src/cgeo/geocaching/filter/DistanceFilter.java
+++ b/main/src/cgeo/geocaching/filter/DistanceFilter.java
@@ -17,7 +17,7 @@ class DistanceFilter extends AbstractFilter {
     private final int minDistance;
     private final int maxDistance;
 
-    public DistanceFilter(final String name, final int minDistance, final int maxDistance) {
+    public DistanceFilter(@NonNull final String name, final int minDistance, final int maxDistance) {
         super(name);
         this.minDistance = minDistance;
         this.maxDistance = maxDistance;
diff --git a/main/src/cgeo/geocaching/filter/FilterUserInterface.java b/main/src/cgeo/geocaching/filter/FilterUserInterface.java
index 590a726..7c5713d 100644
--- a/main/src/cgeo/geocaching/filter/FilterUserInterface.java
+++ b/main/src/cgeo/geocaching/filter/FilterUserInterface.java
@@ -6,6 +6,9 @@ import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.utils.Log;
 
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+
 import rx.functions.Action1;
 
 import android.app.Activity;
@@ -22,10 +25,10 @@ import java.util.List;
 public final class FilterUserInterface {
 
     private static class FactoryEntry {
-        private final String name;
-        private final Class<? extends IFilterFactory> filterFactory;
+        @NonNull private final String name;
+        @Nullable private final Class<? extends IFilterFactory> filterFactory;
 
-        public FactoryEntry(final String name, final Class<? extends IFilterFactory> filterFactory) {
+        public FactoryEntry(@NonNull final String name, @Nullable final Class<? extends IFilterFactory> filterFactory) {
             this.name = name;
             this.filterFactory = filterFactory;
         }
@@ -74,7 +77,7 @@ public final class FilterUserInterface {
         register(R.string.caches_filter_clear, null);
     }
 
-    private void register(final int resourceId, final Class<? extends IFilterFactory> factoryClass) {
+    private void register(final int resourceId, @Nullable final Class<? extends IFilterFactory> factoryClass) {
         registry.add(new FactoryEntry(res.getString(resourceId), factoryClass));
     }
 
@@ -89,12 +92,13 @@ public final class FilterUserInterface {
             public void onClick(final DialogInterface dialog, final int itemIndex) {
                 final FactoryEntry entry = adapter.getItem(itemIndex);
                 // reset?
-                if (entry.filterFactory == null) {
+                final Class<? extends IFilterFactory> filterFactory = entry.filterFactory;
+                if (filterFactory == null) {
                     runAfterwards.call(null);
                 }
                 else {
                     try {
-                        final IFilterFactory factoryInstance = entry.filterFactory.newInstance();
+                        final IFilterFactory factoryInstance = filterFactory.newInstance();
                         selectFromFactory(factoryInstance, entry.name, runAfterwards);
                     } catch (final Exception e) {
                         Log.e("selectFilter", e);
@@ -106,7 +110,7 @@ public final class FilterUserInterface {
         builder.create().show();
     }
 
-    private void selectFromFactory(final IFilterFactory factory, final String menuTitle, final Action1<IFilter> runAfterwards) {
+    private void selectFromFactory(@NonNull final IFilterFactory factory, final String menuTitle, final Action1<IFilter> runAfterwards) {
         final List<IFilter> filters = Collections.unmodifiableList(factory.getFilters());
         if (filters.size() == 1) {
             runAfterwards.call(filters.get(0));
diff --git a/main/src/cgeo/geocaching/filter/IFilter.java b/main/src/cgeo/geocaching/filter/IFilter.java
index de39e5a..eea1303 100644
--- a/main/src/cgeo/geocaching/filter/IFilter.java
+++ b/main/src/cgeo/geocaching/filter/IFilter.java
@@ -8,6 +8,7 @@ import java.util.List;
 
 public interface IFilter {
 
+    @NonNull
     String getName();
 
     /**
diff --git a/main/src/cgeo/geocaching/filter/OriginFilter.java b/main/src/cgeo/geocaching/filter/OriginFilter.java
index 4fb3301..d51b02c 100644
--- a/main/src/cgeo/geocaching/filter/OriginFilter.java
+++ b/main/src/cgeo/geocaching/filter/OriginFilter.java
@@ -15,7 +15,7 @@ public class OriginFilter extends AbstractFilter {
 
     private final IConnector connector;
 
-    public OriginFilter(final IConnector connector) {
+    public OriginFilter(@NonNull final IConnector connector) {
         super(connector.getName());
         this.connector = connector;
     }
diff --git a/main/src/cgeo/geocaching/filter/PopularityFilter.java b/main/src/cgeo/geocaching/filter/PopularityFilter.java
index bb564e8..eabc533 100644
--- a/main/src/cgeo/geocaching/filter/PopularityFilter.java
+++ b/main/src/cgeo/geocaching/filter/PopularityFilter.java
@@ -13,7 +13,7 @@ class PopularityFilter extends AbstractFilter {
     private final int minFavorites;
     private final int maxFavorites;
 
-    public PopularityFilter(final String name, final int minFavorites, final int maxFavorites) {
+    public PopularityFilter(@NonNull final String name, final int minFavorites, final int maxFavorites) {
         super(name);
         this.minFavorites = minFavorites;
         this.maxFavorites = maxFavorites;
diff --git a/main/src/cgeo/geocaching/filter/PopularityRatioFilter.java b/main/src/cgeo/geocaching/filter/PopularityRatioFilter.java
index 53904f1..0548345 100644
--- a/main/src/cgeo/geocaching/filter/PopularityRatioFilter.java
+++ b/main/src/cgeo/geocaching/filter/PopularityRatioFilter.java
@@ -18,7 +18,7 @@ class PopularityRatioFilter extends AbstractFilter {
     private final int minRatio;
     private final int maxRatio;
 
-    public PopularityRatioFilter(final String name, final int minRatio, final int maxRatio) {
+    public PopularityRatioFilter(@NonNull final String name, final int minRatio, final int maxRatio) {
         super(name);
         this.minRatio = minRatio;
         this.maxRatio = maxRatio;
diff --git a/main/src/cgeo/geocaching/filter/SizeFilter.java b/main/src/cgeo/geocaching/filter/SizeFilter.java
index 4c7c122..a48da2c 100644
--- a/main/src/cgeo/geocaching/filter/SizeFilter.java
+++ b/main/src/cgeo/geocaching/filter/SizeFilter.java
@@ -11,7 +11,7 @@ import java.util.List;
 class SizeFilter extends AbstractFilter {
     private final CacheSize cacheSize;
 
-    public SizeFilter(final CacheSize cacheSize) {
+    public SizeFilter(@NonNull final CacheSize cacheSize) {
         super(cacheSize.id);
         this.cacheSize = cacheSize;
     }
@@ -22,6 +22,7 @@ class SizeFilter extends AbstractFilter {
     }
 
     @Override
+    @NonNull
     public String getName() {
         return cacheSize.getL10n();
     }
diff --git a/main/src/cgeo/geocaching/filter/StateFilter.java b/main/src/cgeo/geocaching/filter/StateFilter.java
index f574045..8d6893e 100644
--- a/main/src/cgeo/geocaching/filter/StateFilter.java
+++ b/main/src/cgeo/geocaching/filter/StateFilter.java
@@ -17,7 +17,7 @@ abstract class StateFilter extends AbstractFilter {
 
     static final Resources res = CgeoApplication.getInstance().getResources();
 
-    protected StateFilter(final String name) {
+    protected StateFilter(@NonNull final String name) {
         super(name);
     }
 
diff --git a/main/src/cgeo/geocaching/filter/TypeFilter.java b/main/src/cgeo/geocaching/filter/TypeFilter.java
index 412cbc2..70a8068 100644
--- a/main/src/cgeo/geocaching/filter/TypeFilter.java
+++ b/main/src/cgeo/geocaching/filter/TypeFilter.java
@@ -11,7 +11,7 @@ import java.util.List;
 class TypeFilter extends AbstractFilter {
     private final CacheType cacheType;
 
-    public TypeFilter(final CacheType cacheType) {
+    public TypeFilter(@NonNull final CacheType cacheType) {
         super(cacheType.id);
         this.cacheType = cacheType;
     }
@@ -22,6 +22,7 @@ class TypeFilter extends AbstractFilter {
     }
 
     @Override
+    @NonNull
     public String getName() {
         return cacheType.getL10n();
     }
diff --git a/main/src/cgeo/geocaching/ui/logs/CacheLogsViewCreator.java b/main/src/cgeo/geocaching/ui/logs/CacheLogsViewCreator.java
index 7e49c97..c29e1e8 100644
--- a/main/src/cgeo/geocaching/ui/logs/CacheLogsViewCreator.java
+++ b/main/src/cgeo/geocaching/ui/logs/CacheLogsViewCreator.java
@@ -25,7 +25,7 @@ public class CacheLogsViewCreator extends LogsViewCreator {
     private final boolean allLogs;
     private final Resources res = CgeoApplication.getInstance().getResources();
 
-    public CacheLogsViewCreator(CacheDetailActivity cacheDetailActivity, boolean allLogs) {
+    public CacheLogsViewCreator(final CacheDetailActivity cacheDetailActivity, final boolean allLogs) {
         super(cacheDetailActivity);
         this.allLogs = allLogs;
     }
@@ -37,7 +37,7 @@ public class CacheLogsViewCreator extends LogsViewCreator {
      */
     private Geocache getCache() {
         if (this.activity instanceof CacheDetailActivity) {
-            CacheDetailActivity details = (CacheDetailActivity) this.activity;
+            final CacheDetailActivity details = (CacheDetailActivity) this.activity;
             return details.getCache();
         }
         return null;
@@ -56,7 +56,7 @@ public class CacheLogsViewCreator extends LogsViewCreator {
             final List<Entry<LogType, Integer>> sortedLogCounts = new ArrayList<>(logCounts.size());
             for (final Entry<LogType, Integer> entry : logCounts.entrySet()) {
                 // it may happen that the label is unknown -> then avoid any output for this type
-                if (entry.getKey() != LogType.PUBLISH_LISTING && entry.getKey().getL10n() != null && entry.getValue() != 0) {
+                if (entry.getKey() != LogType.PUBLISH_LISTING && entry.getValue() != 0) {
                     sortedLogCounts.add(entry);
                 }
             }
@@ -66,7 +66,7 @@ public class CacheLogsViewCreator extends LogsViewCreator {
                 Collections.sort(sortedLogCounts, new Comparator<Entry<LogType, Integer>>() {
 
                     @Override
-                    public int compare(Entry<LogType, Integer> logCountItem1, Entry<LogType, Integer> logCountItem2) {
+                    public int compare(final Entry<LogType, Integer> logCountItem1, final Entry<LogType, Integer> logCountItem2) {
                         return logCountItem1.getKey().compareTo(logCountItem2.getKey());
                     }
                 });
@@ -84,7 +84,7 @@ public class CacheLogsViewCreator extends LogsViewCreator {
     }
 
     @Override
-    protected void fillCountOrLocation(LogViewHolder holder, final LogEntry log) {
+    protected void fillCountOrLocation(final LogViewHolder holder, final LogEntry log) {
         // finds count
         if (log.found == -1) {
             holder.countOrLocation.setVisibility(View.GONE);