diff options
4 files changed, 11 insertions, 6 deletions
diff --git a/main/src/cgeo/geocaching/geopoint/Geopoint.java b/main/src/cgeo/geocaching/geopoint/Geopoint.java index 8fe75ef..c718a5f 100644 --- a/main/src/cgeo/geocaching/geopoint/Geopoint.java +++ b/main/src/cgeo/geocaching/geopoint/Geopoint.java @@ -216,7 +216,7 @@ public final class Geopoint implements ICoordinates, Parcelable { * @throws GeopointException * if there is an error in distance calculation */ - public float distanceTo(final ICoordinates point) { + public float distanceTo(@NonNull final ICoordinates point) { final Geopoint otherCoords = point.getCoords(); if (DISTANCE_BROKEN) { return (float) (getDistance(latitude, longitude, otherCoords.latitude, otherCoords.longitude) / 1000); diff --git a/main/src/cgeo/geocaching/ui/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java index f30c0bd..9d9a32f 100644 --- a/main/src/cgeo/geocaching/ui/CacheListAdapter.java +++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java @@ -24,6 +24,7 @@ import cgeo.geocaching.utils.Log; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.eclipse.jdt.annotation.NonNull; import android.app.Activity; import android.content.res.Resources; @@ -279,7 +280,7 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> { notifyDataSetChanged(); } - public void setActualCoordinates(final Geopoint coords) { + public void setActualCoordinates(@NonNull final Geopoint coords) { this.coords = coords; updateSortByDistance(); diff --git a/main/src/cgeo/geocaching/ui/CompassMiniView.java b/main/src/cgeo/geocaching/ui/CompassMiniView.java index 260c990..c9f5822 100644 --- a/main/src/cgeo/geocaching/ui/CompassMiniView.java +++ b/main/src/cgeo/geocaching/ui/CompassMiniView.java @@ -5,6 +5,8 @@ import cgeo.geocaching.geopoint.Geopoint; import cgeo.geocaching.settings.Settings; import cgeo.geocaching.utils.AngleUtils; +import org.eclipse.jdt.annotation.NonNull; + import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -107,8 +109,8 @@ final public class CompassMiniView extends View { updateDirection(); } - public void updateCurrentCoords(final Geopoint currentCoords) { - if (currentCoords == null || targetCoords == null) { + public void updateCurrentCoords(@NonNull final Geopoint currentCoords) { + if (targetCoords == null) { return; } diff --git a/main/src/cgeo/geocaching/ui/DistanceView.java b/main/src/cgeo/geocaching/ui/DistanceView.java index b36166d..a61fc4d 100644 --- a/main/src/cgeo/geocaching/ui/DistanceView.java +++ b/main/src/cgeo/geocaching/ui/DistanceView.java @@ -3,6 +3,8 @@ package cgeo.geocaching.ui; import cgeo.geocaching.geopoint.Geopoint; import cgeo.geocaching.geopoint.Units; +import org.eclipse.jdt.annotation.NonNull; + import android.content.Context; import android.util.AttributeSet; import android.widget.TextView; @@ -26,8 +28,8 @@ public class DistanceView extends TextView { cacheCoords = cacheCoordsIn; } - public void update(final Geopoint coords) { - if (cacheCoords == null || coords == null) { + public void update(@NonNull final Geopoint coords) { + if (cacheCoords == null) { return; } setText(Units.getDistanceFromKilometers(coords.distanceTo(cacheCoords))); |