refactoring: cgeoapplication -> CgeoApplication

6 files changed, 13 insertions, 13 deletions

diff --git a/tests/src/cgeo/CGeoTestCase.java b/tests/src/cgeo/CGeoTestCase.java
index fa2c7b5..7dd5956 100644
--- a/tests/src/cgeo/CGeoTestCase.java
+++ b/tests/src/cgeo/CGeoTestCase.java
@@ -1,7 +1,7 @@
 package cgeo;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.DataStore;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.enumerations.LoadFlags.RemoveFlag;
 import cgeo.geocaching.settings.Settings;
@@ -11,14 +11,14 @@ import android.test.ApplicationTestCase;
 
 import java.util.EnumSet;
 
-public abstract class CGeoTestCase extends ApplicationTestCase<cgeoapplication> {
+public abstract class CGeoTestCase extends ApplicationTestCase<CgeoApplication> {
 
     private boolean oldStoreMapsFlag;
     private boolean oldStoreWpMapsFlag;
     private boolean oldMapStoreFlagsRecorded = false;
 
     public CGeoTestCase() {
-        super(cgeoapplication.class);
+        super(CgeoApplication.class);
     }
 
     @Override
diff --git a/tests/src/cgeo/geocaching/GeocacheTest.java b/tests/src/cgeo/geocaching/GeocacheTest.java
index 5850c4f..e1c0769 100644
--- a/tests/src/cgeo/geocaching/GeocacheTest.java
+++ b/tests/src/cgeo/geocaching/GeocacheTest.java
@@ -78,7 +78,7 @@ public class GeocacheTest extends CGeoTestCase {
                 final Waypoint waypoint = waypoints.get(0);
                 assertEquals(new Geopoint("N51 13.888 E007 03.444"), waypoint.getCoords());
                 //            assertEquals("Test", waypoint.getNote());
-                assertEquals(cgeoapplication.getInstance().getString(R.string.cache_personal_note) + " 1", waypoint.getName());
+                assertEquals(CgeoApplication.getInstance().getString(R.string.cache_personal_note) + " 1", waypoint.getName());
                 cache.store(StoredList.TEMPORARY_LIST_ID, null);
             }
             removeCacheCompletely(geocode);
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java b/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
index de52171..dacbba6 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
@@ -1,11 +1,11 @@
 package cgeo.geocaching.connector.gc;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.Image;
 import cgeo.geocaching.SearchResult;
 import cgeo.geocaching.Trackable;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.enumerations.StatusCode;
 import cgeo.geocaching.enumerations.WaypointType;
@@ -220,7 +220,7 @@ public class GCParserTest extends AbstractResourceInstrumentationTestCase {
         final Trackable trackable = GCParser.parseTrackable(page, "TB123E");
         assertNotNull(trackable);
         assertEquals("TB123E", trackable.getGeocode());
-        final String expectedDetails = cgeoapplication.getInstance().getString(cgeo.geocaching.R.string.trackable_not_activated);
+        final String expectedDetails = CgeoApplication.getInstance().getString(cgeo.geocaching.R.string.trackable_not_activated);
         assertEquals(expectedDetails, trackable.getDetails());
     }
 }
diff --git a/tests/src/cgeo/geocaching/connector/trackable/GeokretyParserTest.java b/tests/src/cgeo/geocaching/connector/trackable/GeokretyParserTest.java
index 3915993..8f21342 100644
--- a/tests/src/cgeo/geocaching/connector/trackable/GeokretyParserTest.java
+++ b/tests/src/cgeo/geocaching/connector/trackable/GeokretyParserTest.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.connector.trackable;
 
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.Trackable;
-import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase;
 import cgeo.geocaching.test.R;
 
@@ -13,7 +13,7 @@ public class GeokretyParserTest extends AbstractResourceInstrumentationTestCase
         assertEquals("WeltenbummlerKret", trackable.getName());
         assertEquals("GK008D", trackable.getGeocode());
         assertEquals(2235f, trackable.getDistance());
-        assertEquals(cgeoapplication.getInstance().getString(cgeo.geocaching.R.string.geokret_type_traditional), trackable.getType());
+        assertEquals(CgeoApplication.getInstance().getString(cgeo.geocaching.R.string.geokret_type_traditional), trackable.getType());
     }
 
 }
diff --git a/tests/src/cgeo/geocaching/speech/TextFactoryTest.java b/tests/src/cgeo/geocaching/speech/TextFactoryTest.java
index 864757b..ec8e1b0 100644
--- a/tests/src/cgeo/geocaching/speech/TextFactoryTest.java
+++ b/tests/src/cgeo/geocaching/speech/TextFactoryTest.java
@@ -1,6 +1,6 @@
 package cgeo.geocaching.speech;
 
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.settings.TestSettings;
@@ -29,7 +29,7 @@ public class TextFactoryTest extends AndroidTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        final Resources resources = cgeoapplication.getInstance().getResources();
+        final Resources resources = CgeoApplication.getInstance().getResources();
         final Configuration config = resources.getConfiguration();
         defaultLocale1 = config.locale;
         defaultLocale2 = Locale.getDefault();
@@ -149,7 +149,7 @@ public class TextFactoryTest extends AndroidTestCase {
     private static void setLocale(Locale locale1, Locale locale2, boolean metric) {
         final Configuration config = new Configuration();
         config.locale = locale1;
-        final Resources resources = cgeoapplication.getInstance().getResources();
+        final Resources resources = CgeoApplication.getInstance().getResources();
         resources.updateConfiguration(config, resources.getDisplayMetrics());
 
         Locale.setDefault(locale2);
diff --git a/tests/src/cgeo/geocaching/ui/FormatterTest.java b/tests/src/cgeo/geocaching/ui/FormatterTest.java
index e65f425..53aba0f 100644
--- a/tests/src/cgeo/geocaching/ui/FormatterTest.java
+++ b/tests/src/cgeo/geocaching/ui/FormatterTest.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.ui;
 
 import cgeo.geocaching.R;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.enumerations.WaypointType;
 
 import android.test.AndroidTestCase;
@@ -20,7 +20,7 @@ public class FormatterTest extends AndroidTestCase {
     public static void testOwnWaypoint() {
         final Waypoint own = new Waypoint("my own", WaypointType.OWN, true);
         own.setPrefix(Waypoint.PREFIX_OWN);
-        assertFormatting(own, cgeoapplication.getInstance().getString(R.string.waypoint_custom));
+        assertFormatting(own, CgeoApplication.getInstance().getString(R.string.waypoint_custom));
     }
 
     private static void assertFormatting(Waypoint waypoint, String expected) {