diff options
Diffstat (limited to 'main/src/cgeo/geocaching/connector/gc')
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCConstants.java | 10 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/Tile.java | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConstants.java b/main/src/cgeo/geocaching/connector/gc/GCConstants.java index a598bad..e6608d7 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCConstants.java +++ b/main/src/cgeo/geocaching/connector/gc/GCConstants.java @@ -1,5 +1,7 @@ package cgeo.geocaching.connector.gc; +import org.eclipse.jdt.annotation.NonNull; + import java.util.Locale; import java.util.regex.Pattern; @@ -15,13 +17,13 @@ public final class GCConstants { static final String GC_URL = "http://www.geocaching.com/"; static final String GC_TILE_URL = "http://tiles.geocaching.com/"; /** Live Map */ - public final static String URL_LIVE_MAP = GC_URL + "map/default.aspx"; + public final static @NonNull String URL_LIVE_MAP = GC_URL + "map/default.aspx"; /** Live Map pop-up */ - public final static String URL_LIVE_MAP_DETAILS = GC_TILE_URL + "map.details"; + public final static @NonNull String URL_LIVE_MAP_DETAILS = GC_TILE_URL + "map.details"; /** Caches in a tile */ - public final static String URL_MAP_INFO = GC_TILE_URL + "map.info"; + public final static @NonNull String URL_MAP_INFO = GC_TILE_URL + "map.info"; /** Tile itself */ - public final static String URL_MAP_TILE = GC_TILE_URL + "map.png"; + public final static @NonNull String URL_MAP_TILE = GC_TILE_URL + "map.png"; /** * Patterns for parsing the result of a (detailed) search diff --git a/main/src/cgeo/geocaching/connector/gc/Tile.java b/main/src/cgeo/geocaching/connector/gc/Tile.java index 623730a..6a257cd 100644 --- a/main/src/cgeo/geocaching/connector/gc/Tile.java +++ b/main/src/cgeo/geocaching/connector/gc/Tile.java @@ -10,6 +10,8 @@ import cgeo.geocaching.utils.Log; import ch.boye.httpclientandroidlib.HttpResponse; +import org.eclipse.jdt.annotation.NonNull; + import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -110,6 +112,7 @@ public class Tile { * @see <a * href="http://developers.cloudmade.com/projects/tiles/examples/convert-coordinates-to-tile-numbers">Cloudmade</a> */ + @NonNull public Geopoint getCoord(UTFGridPosition pos) { double pixX = tileX * TILE_SIZE + pos.x * 4; @@ -244,7 +247,7 @@ public class Tile { return null; } - public boolean containsPoint(final ICoordinates point) { + public boolean containsPoint(final @NonNull ICoordinates point) { return viewPort.contains(point); } |
