refactoring: some nullness cleanups

4 files changed, 15 insertions, 7 deletions

diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index d96b97c..127a21d 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -304,7 +304,6 @@ public class MainActivity extends AbstractActivity {
             default:
                 return super.onOptionsItemSelected(item);
         }
-
     }
 
     private void startScannerApplication() {
diff --git a/main/src/cgeo/geocaching/connector/AbstractConnector.java b/main/src/cgeo/geocaching/connector/AbstractConnector.java
index ffb1b1f..2ead406 100644
--- a/main/src/cgeo/geocaching/connector/AbstractConnector.java
+++ b/main/src/cgeo/geocaching/connector/AbstractConnector.java
@@ -128,6 +128,7 @@ public abstract class AbstractConnector implements IConnector {
     public String getGeocodeFromUrl(final String url) {
         final String urlPrefix = getCacheUrlPrefix();
         if (StringUtils.startsWith(url, urlPrefix)) {
+            @NonNull
             String geocode = url.substring(urlPrefix.length());
             if (canHandle(geocode)) {
                 return geocode;
diff --git a/main/src/cgeo/geocaching/connector/ConnectorFactory.java b/main/src/cgeo/geocaching/connector/ConnectorFactory.java
index 3df98e0..16f5e0e 100644
--- a/main/src/cgeo/geocaching/connector/ConnectorFactory.java
+++ b/main/src/cgeo/geocaching/connector/ConnectorFactory.java
@@ -24,6 +24,7 @@ import cgeo.geocaching.geopoint.Viewport;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -103,7 +104,10 @@ public final class ConnectorFactory {
         return liveConns.toArray(new ILogin[liveConns.size()]);
     }
 
-    public static boolean canHandle(final String geocode) {
+    public static boolean canHandle(final @Nullable String geocode) {
+        if (geocode == null) {
+            return false;
+        }
         if (isInvalidGeocode(geocode)) {
             return false;
         }
diff --git a/main/src/cgeo/geocaching/geopoint/Viewport.java b/main/src/cgeo/geocaching/geopoint/Viewport.java
index 4aca538..21dc7fa 100644
--- a/main/src/cgeo/geocaching/geopoint/Viewport.java
+++ b/main/src/cgeo/geocaching/geopoint/Viewport.java
@@ -2,6 +2,8 @@ package cgeo.geocaching.geopoint;
 
 import cgeo.geocaching.ICoordinates;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 import java.util.Locale;
 import java.util.Set;
 
@@ -9,9 +11,9 @@ import java.util.Set;
 
 public class Viewport {
 
-    public final Geopoint center;
-    public final Geopoint bottomLeft;
-    public final Geopoint topRight;
+    public final @NonNull Geopoint center;
+    public final @NonNull Geopoint bottomLeft;
+    public final @NonNull Geopoint topRight;
 
     public Viewport(final ICoordinates point1, final ICoordinates point2) {
         final Geopoint gp1 = point1.getCoords();
@@ -50,7 +52,8 @@ public class Viewport {
         return topRight.getLongitude();
     }
 
-    public Geopoint getCenter() {
+    public @NonNull
+    Geopoint getCenter() {
         return center;
     }
 
@@ -115,7 +118,8 @@ public class Viewport {
      *            multiplicative factor for the latitude and longitude span (> 1 to widen, < 1 to shrink)
      * @return a widened or shrunk viewport
      */
-    public Viewport resize(final double factor) {
+    public @NonNull
+    Viewport resize(final double factor) {
         return new Viewport(getCenter(), getLatitudeSpan() * factor, getLongitudeSpan() * factor);
     }