fix findbugs issue

* refactor map tokens to be a concrete type, as we already had a bad
null check in there

2 files changed, 4 insertions, 3 deletions

diff --git a/tests/src/cgeo/geocaching/CgeoApplicationTest.java b/tests/src/cgeo/geocaching/CgeoApplicationTest.java
index 915914d..f772be6 100644
--- a/tests/src/cgeo/geocaching/CgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/CgeoApplicationTest.java
@@ -4,6 +4,7 @@ import cgeo.CGeoTestCase;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.connector.gc.GCLogin;
 import cgeo.geocaching.connector.gc.GCParser;
+import cgeo.geocaching.connector.gc.MapTokens;
 import cgeo.geocaching.connector.gc.Tile;
 import cgeo.geocaching.enumerations.CacheType;
 import cgeo.geocaching.enumerations.LiveMapStrategy.Strategy;
@@ -42,7 +43,7 @@ import junit.framework.Assert;
 
 public class CgeoApplicationTest extends CGeoTestCase {
 
-    private static final String[] INVALID_TOKEN = null;
+    private static final MapTokens INVALID_TOKEN = null;
 
     /**
      * The name 'test preconditions' is a convention to signal that if this test
@@ -298,7 +299,7 @@ public class CgeoApplicationTest extends CGeoTestCase {
                     final GC2CJPF mockedCache = new GC2CJPF();
                     deleteCacheFromDB(mockedCache.getGeocode());
 
-                    final String[] tokens = GCLogin.getMapTokens();
+                    final MapTokens tokens = GCLogin.getMapTokens();
                     final Viewport viewport = new Viewport(mockedCache, 0.003, 0.003);
 
                     // check coords for DETAILED
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
index e86678d..0caa7d4 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
@@ -22,7 +22,7 @@ public class GCConnectorTest extends AbstractResourceInstrumentationTestCase {
             Settings.setCacheType(CacheType.ALL);
             GCLogin.getInstance().login();
 
-            final String[] tokens = GCLogin.getMapTokens();
+            final MapTokens tokens = GCLogin.getMapTokens();
 
             {
                 final Viewport viewport = new Viewport(new Geopoint("N 52° 25.369 E 9° 35.499"), new Geopoint("N 52° 25.600 E 9° 36.200"));