Use mixed case for cacheId

4 files changed, 13 insertions, 13 deletions

diff --git a/src/cgeo/geocaching/cgBase.java b/src/cgeo/geocaching/cgBase.java
index cbc4194..775b267 100644
--- a/src/cgeo/geocaching/cgBase.java
+++ b/src/cgeo/geocaching/cgBase.java
@@ -876,8 +876,8 @@ public class cgBase {
 				final Matcher matcherId = patternId.matcher(row);
 				while (matcherId.find()) {
 					if (matcherId.groupCount() > 0) {
-						cache.cacheid = matcherId.group(1);
-						cids.add(cache.cacheid);
+						cache.cacheId = matcherId.group(1);
+						cids.add(cache.cacheId);
 					}
 				}
 			} catch (Exception e) {
@@ -1161,7 +1161,7 @@ public class cgBase {
 		try {
 			final Matcher matcherCacheId = patternCacheId.matcher(page);
 			if (matcherCacheId.find() && matcherCacheId.groupCount() > 0) {
-				cache.cacheid = getMatch(matcherCacheId.group(1));
+				cache.cacheId = getMatch(matcherCacheId.group(1));
 			}
 		} catch (Exception e) {
 			// failed to parse cache id
@@ -3540,7 +3540,7 @@ public class cgBase {
      * @return          -1: error occured
      */
 	public int addToWatchlist(cgCache cache) {
-        String page = requestLogged(false, "www.geocaching.com", "/my/watchlist.aspx?w=" + cache.cacheid,
+        String page = requestLogged(false, "www.geocaching.com", "/my/watchlist.aspx?w=" + cache.cacheId,
                 "POST", null, false, false, false);
 
         if (StringUtils.isBlank(page)) {
@@ -3566,7 +3566,7 @@ public class cgBase {
 	 */
 	public int removeFromWatchlist(cgCache cache) {
 	    String host = "www.geocaching.com";
-	    String path = "/my/watchlist.aspx?ds=1&action=rem&id=" + cache.cacheid;
+	    String path = "/my/watchlist.aspx?ds=1&action=rem&id=" + cache.cacheId;
 	    String method = "POST";
 
 	    String page = requestLogged(false, host, path, method, null, false, false, false);
diff --git a/src/cgeo/geocaching/cgCache.java b/src/cgeo/geocaching/cgCache.java
index f065008..b51358b 100644
--- a/src/cgeo/geocaching/cgCache.java
+++ b/src/cgeo/geocaching/cgCache.java
@@ -36,7 +36,7 @@ public class cgCache implements ICache {
      * Code of the cache like GCABCD
      */
 	public String geocode = "";
-	public String cacheid = "";
+	public String cacheId = "";
 	public String guid = "";
 	public String type = "";
 	public String name = "";
@@ -105,8 +105,8 @@ public class cgCache implements ICache {
 		if (StringUtils.isBlank(geocode)) {
 			geocode = oldCache.geocode;
 		}
-		if (StringUtils.isBlank(cacheid)) {
-			cacheid = oldCache.cacheid;
+		if (StringUtils.isBlank(cacheId)) {
+			cacheId = oldCache.cacheId;
 		}
 		if (StringUtils.isBlank(guid)) {
 			guid = oldCache.guid;
@@ -262,12 +262,12 @@ public class cgCache implements ICache {
 	}
 
 	public boolean logVisit(IAbstractActivity fromActivity) {
-		if (StringUtils.isBlank(cacheid)) {
+		if (StringUtils.isBlank(cacheId)) {
 			fromActivity.showToast(((Activity)fromActivity).getResources().getString(R.string.err_cannot_log_visit));
 			return true;
 		}
 		Intent logVisitIntent = new Intent((Activity)fromActivity, cgeovisit.class);
-		logVisitIntent.putExtra(cgeovisit.EXTRAS_ID, cacheid);
+		logVisitIntent.putExtra(cgeovisit.EXTRAS_ID, cacheId);
 		logVisitIntent.putExtra(cgeovisit.EXTRAS_GEOCODE, geocode.toUpperCase());
 		logVisitIntent.putExtra(cgeovisit.EXTRAS_FOUND, found);
 
diff --git a/src/cgeo/geocaching/cgData.java b/src/cgeo/geocaching/cgData.java
index e10f30e..d83edb9 100644
--- a/src/cgeo/geocaching/cgData.java
+++ b/src/cgeo/geocaching/cgData.java
@@ -1182,7 +1182,7 @@ public class cgData {
 		values.put("detailedupdate", cache.detailedUpdate);
 		values.put("visiteddate", cache.visitedDate);
 		values.put("geocode", cache.geocode);
-		values.put("cacheid", cache.cacheid);
+		values.put("cacheid", cache.cacheId);
 		values.put("guid", cache.guid);
 		values.put("type", cache.type);
 		values.put("name", cache.name);
@@ -1978,7 +1978,7 @@ public class cgData {
 		cache.detailedUpdate = (Long) cursor.getLong(cursor.getColumnIndex("detailedupdate"));
 		cache.visitedDate = (Long) cursor.getLong(cursor.getColumnIndex("visiteddate"));
 		cache.geocode = (String) cursor.getString(cursor.getColumnIndex("geocode"));
-		cache.cacheid = (String) cursor.getString(cursor.getColumnIndex("cacheid"));
+		cache.cacheId = (String) cursor.getString(cursor.getColumnIndex("cacheid"));
 		cache.guid = (String) cursor.getString(cursor.getColumnIndex("guid"));
 		cache.type = (String) cursor.getString(cursor.getColumnIndex("type"));
 		cache.name = (String) cursor.getString(cursor.getColumnIndex("name"));
diff --git a/src/cgeo/geocaching/files/GPXParser.java b/src/cgeo/geocaching/files/GPXParser.java
index 978079d..a9978c5 100644
--- a/src/cgeo/geocaching/files/GPXParser.java
+++ b/src/cgeo/geocaching/files/GPXParser.java
@@ -402,7 +402,7 @@ public abstract class GPXParser extends FileParser {
 				public void start(Attributes attrs) {
 					try {
 						if (attrs.getIndex("id") > -1) {
-							cache.cacheid = attrs.getValue("id");
+							cache.cacheId = attrs.getValue("id");
 						}
 						if (attrs.getIndex("archived") > -1) {
 							cache.archived = attrs.getValue("archived").equalsIgnoreCase("true");