diff options
19 files changed, 82 insertions, 82 deletions
diff --git a/main/src/cgeo/geocaching/AbstractLoggingActivity.java b/main/src/cgeo/geocaching/AbstractLoggingActivity.java index 4816dee..eaeffb0 100644 --- a/main/src/cgeo/geocaching/AbstractLoggingActivity.java +++ b/main/src/cgeo/geocaching/AbstractLoggingActivity.java @@ -55,7 +55,7 @@ public abstract class AbstractLoggingActivity extends AbstractActivity { if (cache != null && ConnectorFactory.getConnector(cache).equals(GCConnector.getInstance())) { smileyVisible = true; } - final cgTrackable trackable = getLogContext().getTrackable(); + final Trackable trackable = getLogContext().getTrackable(); if (trackable != null && ConnectorFactory.getConnector(trackable).equals(GCConnector.getInstance())) { smileyVisible = true; } diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index e63f48d..4c1aa19 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -2196,13 +2196,13 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc // TODO: fix layout, then switch back to Android-resource and delete copied one // this copy is modified to respect the text color - view.setAdapter(new ArrayAdapter<cgTrackable>(CacheDetailActivity.this, R.layout.simple_list_item_1, cache.getInventory())); + view.setAdapter(new ArrayAdapter<Trackable>(CacheDetailActivity.this, R.layout.simple_list_item_1, cache.getInventory())); view.setOnItemClickListener(new OnItemClickListener() { @Override public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) { Object selection = arg0.getItemAtPosition(arg2); - if (selection instanceof cgTrackable) { - cgTrackable trackable = (cgTrackable) selection; + if (selection instanceof Trackable) { + Trackable trackable = (Trackable) selection; TrackableActivity.startActivity(CacheDetailActivity.this, trackable.getGuid(), trackable.getGeocode(), trackable.getName()); } } diff --git a/main/src/cgeo/geocaching/ICache.java b/main/src/cgeo/geocaching/ICache.java index 8f8baf9..815e516 100644 --- a/main/src/cgeo/geocaching/ICache.java +++ b/main/src/cgeo/geocaching/ICache.java @@ -112,7 +112,7 @@ public interface ICache extends IBasicCache { /** * @return the list of trackables in this cache */ - public List<cgTrackable> getInventory(); + public List<Trackable> getInventory(); /** * @return the list of spoiler images diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java index a4677d0..168b1ee 100644 --- a/main/src/cgeo/geocaching/LogTrackableActivity.java +++ b/main/src/cgeo/geocaching/LogTrackableActivity.java @@ -47,7 +47,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat private int attempts = 0; private CheckBox tweetCheck = null; private LinearLayout tweetBox = null; - private cgTrackable trackable; + private Trackable trackable; private Handler showProgressHandler = new Handler() { @Override @@ -207,7 +207,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat tweetCheck.setChecked(true); if (CollectionUtils.isEmpty(possibleLogTypes)) { - possibleLogTypes = cgTrackable.getPossibleLogTypes(); + possibleLogTypes = Trackable.getPossibleLogTypes(); } final Button buttonPost = (Button) findViewById(R.id.post); @@ -355,7 +355,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat return StatusCode.LOG_POST_ERROR; } - public static void startActivity(final Context context, final cgTrackable trackable) { + public static void startActivity(final Context context, final Trackable trackable) { final Intent logTouchIntent = new Intent(context, LogTrackableActivity.class); logTouchIntent.putExtra("geocode", trackable.getGeocode()); logTouchIntent.putExtra("guid", trackable.getGuid()); diff --git a/main/src/cgeo/geocaching/cgTrackable.java b/main/src/cgeo/geocaching/Trackable.java index b03a783..f777351 100644 --- a/main/src/cgeo/geocaching/cgTrackable.java +++ b/main/src/cgeo/geocaching/Trackable.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -public class cgTrackable implements ILogable { +public class Trackable implements ILogable { static final public int SPOTTED_UNSET = 0; static final public int SPOTTED_CACHE = 1; static final public int SPOTTED_USER = 2; @@ -44,7 +44,7 @@ public class cgTrackable implements ILogable { int id = Integer.parseInt(hex, 16); return "http://geokrety.org/konkret.php?id=" + id; } catch (NumberFormatException e) { - Log.e("cgTrackable.getUrl", e); + Log.e("Trackable.getUrl", e); return null; } } diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java index d5b4f9f..a5d9230 100644 --- a/main/src/cgeo/geocaching/TrackableActivity.java +++ b/main/src/cgeo/geocaching/TrackableActivity.java @@ -58,7 +58,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi } private static final int MENU_LOG_TOUCH = 1; private static final int MENU_BROWSER_TRACKABLE = 2; - private cgTrackable trackable = null; + private Trackable trackable = null; private String geocode = null; private String name = null; private String guid = null; @@ -545,18 +545,18 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi // trackable spotted if (StringUtils.isNotBlank(trackable.getSpottedName()) || - trackable.getSpottedType() == cgTrackable.SPOTTED_UNKNOWN || - trackable.getSpottedType() == cgTrackable.SPOTTED_OWNER) { + trackable.getSpottedType() == Trackable.SPOTTED_UNKNOWN || + trackable.getSpottedType() == Trackable.SPOTTED_OWNER) { boolean showTimeSpan = true; StringBuilder text; - if (trackable.getSpottedType() == cgTrackable.SPOTTED_CACHE) { + if (trackable.getSpottedType() == Trackable.SPOTTED_CACHE) { text = new StringBuilder(res.getString(R.string.trackable_spotted_in_cache) + ' ' + Html.fromHtml(trackable.getSpottedName()).toString()); - } else if (trackable.getSpottedType() == cgTrackable.SPOTTED_USER) { + } else if (trackable.getSpottedType() == Trackable.SPOTTED_USER) { text = new StringBuilder(res.getString(R.string.trackable_spotted_at_user) + ' ' + Html.fromHtml(trackable.getSpottedName()).toString()); - } else if (trackable.getSpottedType() == cgTrackable.SPOTTED_UNKNOWN) { + } else if (trackable.getSpottedType() == Trackable.SPOTTED_UNKNOWN) { text = new StringBuilder(res.getString(R.string.trackable_spotted_unknown_location)); - } else if (trackable.getSpottedType() == cgTrackable.SPOTTED_OWNER) { + } else if (trackable.getSpottedType() == Trackable.SPOTTED_OWNER) { text = new StringBuilder(res.getString(R.string.trackable_spotted_owner)); } else { text = new StringBuilder("N/A"); @@ -576,14 +576,14 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi final TextView spotted = details.add(R.string.trackable_spotted, text.toString()); spotted.setClickable(true); - if (cgTrackable.SPOTTED_CACHE == trackable.getSpottedType()) { + if (Trackable.SPOTTED_CACHE == trackable.getSpottedType()) { spotted.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View arg0) { CacheDetailActivity.startActivityGuid(TrackableActivity.this, trackable.getSpottedGuid(), trackable.getSpottedName()); } }); - } else if (cgTrackable.SPOTTED_USER == trackable.getSpottedType()) { + } else if (Trackable.SPOTTED_USER == trackable.getSpottedType()) { spotted.setOnClickListener(new UserActionsListener()); } } diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java index de35008..073cb63 100644 --- a/main/src/cgeo/geocaching/cgCache.java +++ b/main/src/cgeo/geocaching/cgCache.java @@ -114,7 +114,7 @@ public class cgCache implements ICache, IWaypoint { return cgData.loadLogs(geocode); } }; - private List<cgTrackable> inventory = null; + private List<Trackable> inventory = null; private Map<LogType, Integer> logCounts = new HashMap<LogType, Integer>(); private boolean logOffline = false; private boolean userModifiedCoords = false; @@ -724,7 +724,7 @@ public class cgCache implements ICache, IWaypoint { } @Override - public List<cgTrackable> getInventory() { + public List<Trackable> getInventory() { return inventory; } @@ -1089,7 +1089,7 @@ public class cgCache implements ICache, IWaypoint { this.spoilers = spoilers; } - public void setInventory(List<cgTrackable> inventory) { + public void setInventory(List<Trackable> inventory) { this.inventory = inventory; } diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java index 1042959..3c8ddc6 100644 --- a/main/src/cgeo/geocaching/cgData.java +++ b/main/src/cgeo/geocaching/cgData.java @@ -1296,7 +1296,7 @@ public class cgData { } } - public static boolean saveTrackable(final cgTrackable trackable) { + public static boolean saveTrackable(final Trackable trackable) { init(); database.beginTransaction(); @@ -1310,7 +1310,7 @@ public class cgData { return true; } - private static void saveInventoryWithoutTransaction(final String geocode, final List<cgTrackable> trackables) { + private static void saveInventoryWithoutTransaction(final String geocode, final List<Trackable> trackables) { if (geocode != null) { database.delete(dbTableTrackables, "geocode = ?", new String[]{geocode}); } @@ -1318,7 +1318,7 @@ public class cgData { if (CollectionUtils.isNotEmpty(trackables)) { ContentValues values = new ContentValues(); long timeStamp = System.currentTimeMillis(); - for (cgTrackable trackable : trackables) { + for (Trackable trackable : trackables) { final String tbCode = trackable.getGeocode(); if (StringUtils.isNotBlank(tbCode)) { database.delete(dbTableTrackables, "tbcode = ?", new String[] { tbCode }); @@ -1494,10 +1494,10 @@ public class cgData { } if (loadFlags.contains(LoadFlag.LOAD_INVENTORY)) { - final List<cgTrackable> inventory = loadInventory(cache.getGeocode()); + final List<Trackable> inventory = loadInventory(cache.getGeocode()); if (CollectionUtils.isNotEmpty(inventory)) { if (cache.getInventory() == null) { - cache.setInventory(new ArrayList<cgTrackable>()); + cache.setInventory(new ArrayList<Trackable>()); } else { cache.getInventory().clear(); } @@ -1900,14 +1900,14 @@ public class cgData { return logCounts; } - private static List<cgTrackable> loadInventory(String geocode) { + private static List<Trackable> loadInventory(String geocode) { if (StringUtils.isBlank(geocode)) { return null; } init(); - final List<cgTrackable> trackables = new ArrayList<cgTrackable>(); + final List<Trackable> trackables = new ArrayList<Trackable>(); final Cursor cursor = database.query( dbTableTrackables, @@ -1928,7 +1928,7 @@ public class cgData { return trackables; } - public static cgTrackable loadTrackable(final String geocode) { + public static Trackable loadTrackable(final String geocode) { if (StringUtils.isBlank(geocode)) { return null; } @@ -1945,15 +1945,15 @@ public class cgData { null, "1"); - final cgTrackable trackable = cursor.moveToFirst() ? createTrackableFromDatabaseContent(cursor) : null; + final Trackable trackable = cursor.moveToFirst() ? createTrackableFromDatabaseContent(cursor) : null; cursor.close(); return trackable; } - private static cgTrackable createTrackableFromDatabaseContent(final Cursor cursor) { - final cgTrackable trackable = new cgTrackable(); + private static Trackable createTrackableFromDatabaseContent(final Cursor cursor) { + final Trackable trackable = new Trackable(); trackable.setGeocode(cursor.getString(cursor.getColumnIndex("tbcode"))); trackable.setGuid(cursor.getString(cursor.getColumnIndex("guid"))); trackable.setName(cursor.getString(cursor.getColumnIndex("title"))); diff --git a/main/src/cgeo/geocaching/connector/ConnectorFactory.java b/main/src/cgeo/geocaching/connector/ConnectorFactory.java index 4802c3e..6c8b7d9 100644 --- a/main/src/cgeo/geocaching/connector/ConnectorFactory.java +++ b/main/src/cgeo/geocaching/connector/ConnectorFactory.java @@ -2,7 +2,7 @@ package cgeo.geocaching.connector; import cgeo.geocaching.ICache; import cgeo.geocaching.SearchResult; -import cgeo.geocaching.cgTrackable; +import cgeo.geocaching.Trackable; import cgeo.geocaching.connector.capability.ISearchByCenter; import cgeo.geocaching.connector.capability.ISearchByViewPort; import cgeo.geocaching.connector.gc.GCConnector; @@ -84,7 +84,7 @@ public final class ConnectorFactory { return getConnector(cache.getGeocode()); } - public static IConnector getConnector(cgTrackable trackable) { + public static IConnector getConnector(Trackable trackable) { return getConnector(trackable.getGeocode()); } diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index 323d65c..0121cdf 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -4,12 +4,12 @@ import cgeo.geocaching.LogEntry; import cgeo.geocaching.R; import cgeo.geocaching.SearchResult; import cgeo.geocaching.Settings; +import cgeo.geocaching.Trackable; import cgeo.geocaching.TrackableLog; import cgeo.geocaching.Waypoint; import cgeo.geocaching.cgCache; import cgeo.geocaching.cgData; import cgeo.geocaching.cgImage; -import cgeo.geocaching.cgTrackable; import cgeo.geocaching.cgeoapplication; import cgeo.geocaching.enumerations.CacheSize; import cgeo.geocaching.enumerations.CacheType; @@ -561,7 +561,7 @@ public abstract class GCParser { final MatcherWrapper matcherInventory = new MatcherWrapper(GCConstants.PATTERN_INVENTORY, page); if (matcherInventory.find()) { if (cache.getInventory() == null) { - cache.setInventory(new ArrayList<cgTrackable>()); + cache.setInventory(new ArrayList<Trackable>()); } if (matcherInventory.groupCount() > 1) { @@ -572,7 +572,7 @@ public abstract class GCParser { while (matcherInventoryInside.find()) { if (matcherInventoryInside.groupCount() > 0) { - final cgTrackable inventoryItem = new cgTrackable(); + final Trackable inventoryItem = new Trackable(); inventoryItem.setGuid(matcherInventoryInside.group(1)); inventoryItem.setName(matcherInventoryInside.group(2)); @@ -884,13 +884,13 @@ public abstract class GCParser { return null; } - public static cgTrackable searchTrackable(final String geocode, final String guid, final String id) { + public static Trackable searchTrackable(final String geocode, final String guid, final String id) { if (StringUtils.isBlank(geocode) && StringUtils.isBlank(guid) && StringUtils.isBlank(id)) { Log.w("GCParser.searchTrackable: No geocode nor guid nor id given"); return null; } - cgTrackable trackable = new cgTrackable(); + Trackable trackable = new Trackable(); final Parameters params = new Parameters(); if (StringUtils.isNotBlank(geocode)) { @@ -1244,13 +1244,13 @@ public abstract class GCParser { } /** - * Parse a trackable HTML description into a cgTrackable object + * Parse a trackable HTML description into a Trackable object * * @param page * the HTML page to parse, already processed through {@link BaseUtils#replaceWhitespace} * @return the parsed trackable, or null if none could be parsed */ - static cgTrackable parseTrackable(final String page, final String possibleTrackingcode) { + static Trackable parseTrackable(final String page, final String possibleTrackingcode) { if (StringUtils.isBlank(page)) { Log.e("GCParser.parseTrackable: No page given"); return null; @@ -1260,7 +1260,7 @@ public abstract class GCParser { return null; } - final cgTrackable trackable = new cgTrackable(); + final Trackable trackable = new Trackable(); // trackable geocode trackable.setGeocode(BaseUtils.getMatch(page, GCConstants.PATTERN_TRACKABLE_GEOCODE, true, trackable.getGeocode())); @@ -1300,22 +1300,22 @@ public abstract class GCParser { if (matcherSpottedCache.find() && matcherSpottedCache.groupCount() > 0) { trackable.setSpottedGuid(matcherSpottedCache.group(1)); trackable.setSpottedName(matcherSpottedCache.group(2).trim()); - trackable.setSpottedType(cgTrackable.SPOTTED_CACHE); + trackable.setSpottedType(Trackable.SPOTTED_CACHE); } final MatcherWrapper matcherSpottedUser = new MatcherWrapper(GCConstants.PATTERN_TRACKABLE_SPOTTEDUSER, page); if (matcherSpottedUser.find() && matcherSpottedUser.groupCount() > 0) { trackable.setSpottedGuid(matcherSpottedUser.group(1)); trackable.setSpottedName(matcherSpottedUser.group(2).trim()); - trackable.setSpottedType(cgTrackable.SPOTTED_USER); + trackable.setSpottedType(Trackable.SPOTTED_USER); } if (BaseUtils.matches(page, GCConstants.PATTERN_TRACKABLE_SPOTTEDUNKNOWN)) { - trackable.setSpottedType(cgTrackable.SPOTTED_UNKNOWN); + trackable.setSpottedType(Trackable.SPOTTED_UNKNOWN); } if (BaseUtils.matches(page, GCConstants.PATTERN_TRACKABLE_SPOTTEDOWNER)) { - trackable.setSpottedType(cgTrackable.SPOTTED_OWNER); + trackable.setSpottedType(Trackable.SPOTTED_OWNER); } } catch (Exception e) { // failed to parse trackable last known place diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java index 809eb80..8207455 100644 --- a/main/src/cgeo/geocaching/files/GPXParser.java +++ b/main/src/cgeo/geocaching/files/GPXParser.java @@ -6,7 +6,7 @@ import cgeo.geocaching.StoredList; import cgeo.geocaching.Waypoint; import cgeo.geocaching.cgCache; import cgeo.geocaching.cgData; -import cgeo.geocaching.cgTrackable; +import cgeo.geocaching.Trackable; import cgeo.geocaching.cgeoapplication; import cgeo.geocaching.connector.ConnectorFactory; import cgeo.geocaching.enumerations.CacheSize; @@ -81,7 +81,7 @@ public abstract class GPXParser extends FileParser { final private String version; private cgCache cache; - private cgTrackable trackable = new cgTrackable(); + private Trackable trackable = new Trackable(); private LogEntry log = null; private String type = null; @@ -661,7 +661,7 @@ public abstract class GPXParser extends FileParser { @Override public void start(Attributes attrs) { - trackable = new cgTrackable(); + trackable = new Trackable(); try { if (attrs.getIndex("ref") > -1) { @@ -679,7 +679,7 @@ public abstract class GPXParser extends FileParser { public void end() { if (StringUtils.isNotBlank(trackable.getGeocode()) && StringUtils.isNotBlank(trackable.getName())) { if (cache.getInventory() == null) { - cache.setInventory(new ArrayList<cgTrackable>()); + cache.setInventory(new ArrayList<Trackable>()); } cache.getInventory().add(trackable); } diff --git a/main/src/cgeo/geocaching/twitter/Twitter.java b/main/src/cgeo/geocaching/twitter/Twitter.java index c86c633..399f852 100644 --- a/main/src/cgeo/geocaching/twitter/Twitter.java +++ b/main/src/cgeo/geocaching/twitter/Twitter.java @@ -1,9 +1,9 @@ package cgeo.geocaching.twitter; import cgeo.geocaching.Settings; +import cgeo.geocaching.Trackable; import cgeo.geocaching.cgCache; import cgeo.geocaching.cgData; -import cgeo.geocaching.cgTrackable; import cgeo.geocaching.cgeoapplication; import cgeo.geocaching.enumerations.LoadFlags; import cgeo.geocaching.geopoint.Geopoint; @@ -77,7 +77,7 @@ public final class Twitter { } public static void postTweetTrackable(String geocode) { - final cgTrackable trackable = cgData.loadTrackable(geocode); + final Trackable trackable = cgData.loadTrackable(geocode); String name = trackable.getName(); if (name.length() > 82) { name = name.substring(0, 81) + '…'; diff --git a/main/src/cgeo/geocaching/utils/LogTemplateProvider.java b/main/src/cgeo/geocaching/utils/LogTemplateProvider.java index 7cacd9d..7171fde 100644 --- a/main/src/cgeo/geocaching/utils/LogTemplateProvider.java +++ b/main/src/cgeo/geocaching/utils/LogTemplateProvider.java @@ -2,8 +2,8 @@ package cgeo.geocaching.utils; import cgeo.geocaching.R; import cgeo.geocaching.Settings; +import cgeo.geocaching.Trackable; import cgeo.geocaching.cgCache; -import cgeo.geocaching.cgTrackable; import cgeo.geocaching.connector.gc.GCConstants; import cgeo.geocaching.connector.gc.Login; import cgeo.geocaching.network.Network; @@ -29,14 +29,14 @@ public class LogTemplateProvider { */ public static class LogContext { private cgCache cache; - private cgTrackable trackable; + private Trackable trackable; private boolean offline = false; public LogContext(final cgCache cache) { this(cache, false); } - public LogContext(final cgTrackable trackable) { + public LogContext(final Trackable trackable) { this.trackable = trackable; } @@ -53,7 +53,7 @@ public class LogTemplateProvider { return cache; } - public cgTrackable getTrackable() { + public Trackable getTrackable() { return trackable; } @@ -148,7 +148,7 @@ public class LogTemplateProvider { @Override public String getValue(final LogContext context) { - cgTrackable trackable = context.getTrackable(); + Trackable trackable = context.getTrackable(); if (trackable != null) { return trackable.getOwner(); } diff --git a/tests/src/cgeo/geocaching/TrackableTest.java b/tests/src/cgeo/geocaching/TrackableTest.java index b52139a..c18d1ea 100644 --- a/tests/src/cgeo/geocaching/TrackableTest.java +++ b/tests/src/cgeo/geocaching/TrackableTest.java @@ -5,13 +5,13 @@ import android.test.AndroidTestCase; public class TrackableTest extends AndroidTestCase { public static void testGetGeocode() { - cgTrackable trackable = new cgTrackable(); + Trackable trackable = new Trackable(); trackable.setGeocode("tb1234"); assertEquals("TB1234", trackable.getGeocode()); } public static void testSetLogsNull() { - cgTrackable trackable = new cgTrackable(); + Trackable trackable = new Trackable(); trackable.setLogs(null); assertNotNull("Trackable logs must not be null!", trackable.getLogs()); } diff --git a/tests/src/cgeo/geocaching/cgDataTest.java b/tests/src/cgeo/geocaching/cgDataTest.java index f4b71f3..1c8a0e0 100644 --- a/tests/src/cgeo/geocaching/cgDataTest.java +++ b/tests/src/cgeo/geocaching/cgDataTest.java @@ -107,9 +107,9 @@ public class cgDataTest extends CGeoTestCase { final cgCache cache = new cgCache(); cache.setGeocode(GEOCODE_CACHE); cache.setDetailed(true); - final cgTrackable trackable = new cgTrackable(); + final Trackable trackable = new Trackable(); trackable.setLogs(null); - final List<cgTrackable> inventory = new ArrayList<cgTrackable>(); + final List<Trackable> inventory = new ArrayList<Trackable>(); inventory.add(trackable); cache.setInventory(inventory); diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java index 5e23d98..81c97ee 100644 --- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java +++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java @@ -56,7 +56,7 @@ public class cgeoApplicationTest extends CGeoTestCase { */ @MediumTest public static void testSearchTrackableNotExisting() { - cgTrackable tb = GCParser.searchTrackable("123456", null, null); + Trackable tb = GCParser.searchTrackable("123456", null, null); assertNull(tb); } @@ -65,7 +65,7 @@ public class cgeoApplicationTest extends CGeoTestCase { */ @MediumTest public static void testSearchTrackable() { - final cgTrackable tb = GCParser.searchTrackable("TB2J1VZ", null, null); + final Trackable tb = GCParser.searchTrackable("TB2J1VZ", null, null); // fix data assertEquals("aefffb86-099f-444f-b132-605436163aa8", tb.getGuid()); assertEquals("TB2J1VZ", tb.getGeocode()); @@ -82,7 +82,7 @@ public class cgeoApplicationTest extends CGeoTestCase { // Following data can change over time assertTrue(tb.getDistance() >= 10617.8f); assertTrue(tb.getLogs().size() >= 10); - assertTrue(cgTrackable.SPOTTED_CACHE == tb.getSpottedType() || cgTrackable.SPOTTED_USER == tb.getSpottedType()); + assertTrue(Trackable.SPOTTED_CACHE == tb.getSpottedType() || Trackable.SPOTTED_USER == tb.getSpottedType()); // no assumption possible: assertEquals("faa2d47d-19ea-422f-bec8-318fc82c8063", tb.getSpottedGuid()); // no assumption possible: assertEquals("Nice place for a break cache", tb.getSpottedName()); diff --git a/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java b/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java index 4c2655d..0c2c997 100644 --- a/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java +++ b/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java @@ -3,7 +3,7 @@ package cgeo.geocaching.connector.gc; import cgeo.geocaching.LogEntry; import cgeo.geocaching.TrackableLog; import cgeo.geocaching.cgImage; -import cgeo.geocaching.cgTrackable; +import cgeo.geocaching.Trackable; import cgeo.geocaching.enumerations.LogType; import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase; import cgeo.geocaching.test.R; @@ -29,20 +29,20 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase { } public void testTrackable() { - final cgTrackable trackable = getTB2R124(); + final Trackable trackable = getTB2R124(); assertEquals("TB2R124", trackable.getGeocode()); assertEquals("Bor. Dortmund - FC Schalke 04", trackable.getName()); assertEquals("Spiridon Lui", trackable.getOwner()); } public void testTrackableWithoutImage() { - final cgTrackable trackable = getTB2R124(); + final Trackable trackable = getTB2R124(); assertNull(trackable.getImage()); assertNotNull(trackable.getDetails()); } public void testTrackableWithLogImages() { - final cgTrackable trackable = getTBXATG(); + final Trackable trackable = getTBXATG(); assertEquals("TBXATG", trackable.getGeocode()); List<LogEntry> log = trackable.getLogs(); @@ -72,7 +72,7 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase { } public void testParseTrackableWithoutReleaseDate() { - cgTrackable trackable = parseTrackable(R.raw.tb14wfv); + Trackable trackable = parseTrackable(R.raw.tb14wfv); assertNotNull(trackable); assertEquals("The Brickster", trackable.getName()); assertEquals("Adrian C", trackable.getOwner()); @@ -85,7 +85,7 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase { } public void testParseRelativeLink() { - final cgTrackable trackable = parseTrackable(R.raw.tb4cwjx); + final Trackable trackable = parseTrackable(R.raw.tb4cwjx); assertNotNull(trackable); assertEquals("The Golden Lisa", trackable.getName()); final String goal = trackable.getGoal(); @@ -94,13 +94,13 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase { assertTrue(goal.contains("href=\"http://www.geocaching.com/seek/cache_details.aspx?wp=GC3B7PD#\"")); } - private cgTrackable parseTrackable(int trackablePage) { + private Trackable parseTrackable(int trackablePage) { String pageContent = getFileContent(trackablePage); return GCParser.parseTrackable(BaseUtils.replaceWhitespace(pageContent), null); } public void testParseMarkMissing() { - final cgTrackable trackable = parseTrackable(R.raw.tb29ggq); + final Trackable trackable = parseTrackable(R.raw.tb29ggq); assertNotNull(trackable); final List<LogEntry> logs = trackable.getLogs(); assertNotNull(logs); @@ -109,16 +109,16 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase { assertEquals(LogType.MARKED_MISSING, marked.type); } - private cgTrackable getTB2R124() { + private Trackable getTB2R124() { return parseTrackable(R.raw.trackable_tb2r124); } - private cgTrackable getTBXATG() { + private Trackable getTBXATG() { return parseTrackable(R.raw.trackable_tbxatg); } public void testParseTrackableNotExisting() { - cgTrackable trackable = GCParser.parseTrackable(getFileContent(R.raw.tb_not_existing), null); + Trackable trackable = GCParser.parseTrackable(getFileContent(R.raw.tb_not_existing), null); assertNull(trackable); } diff --git a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java index 9aa18f9..64ff51a 100644 --- a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java +++ b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java @@ -1,7 +1,7 @@ package cgeo.geocaching.test.mock; +import cgeo.geocaching.Trackable; import cgeo.geocaching.cgImage; -import cgeo.geocaching.cgTrackable; import cgeo.geocaching.connector.gc.Login; import cgeo.geocaching.enumerations.CacheSize; import cgeo.geocaching.enumerations.CacheType; @@ -133,9 +133,9 @@ public class GC2JVEH extends MockedCache { } @Override - public List<cgTrackable> getInventory() { - final ArrayList<cgTrackable> inventory = new ArrayList<cgTrackable>(); - inventory.add(new cgTrackable()); + public List<Trackable> getInventory() { + final ArrayList<Trackable> inventory = new ArrayList<Trackable>(); + inventory.add(new Trackable()); return inventory; } diff --git a/tests/src/cgeo/geocaching/test/mock/MockedCache.java b/tests/src/cgeo/geocaching/test/mock/MockedCache.java index 8517c81..1a1127b 100644 --- a/tests/src/cgeo/geocaching/test/mock/MockedCache.java +++ b/tests/src/cgeo/geocaching/test/mock/MockedCache.java @@ -2,7 +2,7 @@ package cgeo.geocaching.test.mock; import cgeo.geocaching.ICache; import cgeo.geocaching.cgImage; -import cgeo.geocaching.cgTrackable; +import cgeo.geocaching.Trackable; import cgeo.geocaching.connector.gc.GCConstants; import cgeo.geocaching.geopoint.Geopoint; import cgeo.geocaching.utils.BaseUtils; @@ -134,7 +134,7 @@ public abstract class MockedCache implements ICache { } @Override - public List<cgTrackable> getInventory() { + public List<Trackable> getInventory() { return null; } |