refactoring: rename log typ enums for easier code completion and

reading

12 files changed, 97 insertions, 97 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 878d583..895d3b7 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -2230,20 +2230,20 @@ public class CacheDetailActivity extends AbstractActivity {
 
                     // colored marker
                     holder.statusMarker.setVisibility(View.VISIBLE);
-                    if (log.type == LogType.LOG_FOUND_IT
-                            || log.type == LogType.LOG_WEBCAM_PHOTO_TAKEN
-                            || log.type == LogType.LOG_ATTENDED) {
+                    if (log.type == LogType.FOUND_IT
+                            || log.type == LogType.WEBCAM_PHOTO_TAKEN
+                            || log.type == LogType.ATTENDED) {
                         holder.statusMarker.setImageResource(R.drawable.mark_green);
-                    } else if (log.type == LogType.LOG_PUBLISH_LISTING
-                            || log.type == LogType.LOG_ENABLE_LISTING
-                            || log.type == LogType.LOG_OWNER_MAINTENANCE) {
+                    } else if (log.type == LogType.PUBLISH_LISTING
+                            || log.type == LogType.ENABLE_LISTING
+                            || log.type == LogType.OWNER_MAINTENANCE) {
                         holder.statusMarker.setImageResource(R.drawable.mark_green_more);
-                    } else if (log.type == LogType.LOG_DIDNT_FIND_IT
-                            || log.type == LogType.LOG_NEEDS_MAINTENANCE
-                            || log.type == LogType.LOG_NEEDS_ARCHIVE) {
+                    } else if (log.type == LogType.DIDNT_FIND_IT
+                            || log.type == LogType.NEEDS_MAINTENANCE
+                            || log.type == LogType.NEEDS_ARCHIVE) {
                         holder.statusMarker.setImageResource(R.drawable.mark_red);
-                    } else if (log.type == LogType.LOG_TEMP_DISABLE_LISTING
-                            || log.type == LogType.LOG_ARCHIVE) {
+                    } else if (log.type == LogType.TEMP_DISABLE_LISTING
+                            || log.type == LogType.ARCHIVE) {
                         holder.statusMarker.setImageResource(R.drawable.mark_red_more);
                     } else {
                         holder.statusMarker.setVisibility(View.GONE);
diff --git a/main/src/cgeo/geocaching/LogEntry.java b/main/src/cgeo/geocaching/LogEntry.java
index 9864f89..3130822 100644
--- a/main/src/cgeo/geocaching/LogEntry.java
+++ b/main/src/cgeo/geocaching/LogEntry.java
@@ -17,7 +17,7 @@ public final class LogEntry {
     private static final List<cgImage> EMPTY_LIST = Collections.emptyList();
 
     public int id = 0;
-    public LogType type = LogType.LOG_NOTE; // note
+    public LogType type = LogType.NOTE; // note
     public String author = "";
     public String log = "";
     public long date = 0;
diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index c5a178a..8e7385a 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -67,7 +67,7 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D
     private boolean gettingViewstate = true;
     private List<TrackableLog> trackables = null;
     private Calendar date = Calendar.getInstance();
-    private LogType typeSelected = LogType.LOG_UNKNOWN;
+    private LogType typeSelected = LogType.UNKNOWN;
     private int attempts = 0;
     private Button postButton = null;
     private Button clearButton = null;
@@ -187,7 +187,7 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D
 
     private void updatePostButtonText() {
         if (postButton.isEnabled()) {
-            if (typeSelected == LogType.LOG_FOUND_IT && Settings.isGCvoteLogin()) {
+            if (typeSelected == LogType.FOUND_IT && Settings.isGCvoteLogin()) {
                 if (rating == 0) {
                     postButton.setText(res.getString(R.string.log_post_no_rate));
                 } else {
@@ -320,7 +320,7 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D
         final boolean signatureAvailable = Settings.getSignature() != null;
         menu.findItem(MENU_SIGNATURE).setVisible(signatureAvailable);
 
-        final boolean voteAvailable = Settings.isGCvoteLogin() && typeSelected == LogType.LOG_FOUND_IT && StringUtils.isNotBlank(cache.getGuid());
+        final boolean voteAvailable = Settings.isGCvoteLogin() && typeSelected == LogType.FOUND_IT && StringUtils.isNotBlank(cache.getGuid());
         menu.findItem(SUBMENU_VOTE).setVisible(voteAvailable);
 
         return true;
@@ -490,7 +490,7 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D
 
         if (!possibleLogTypes.contains(typeSelected)) {
             if (alreadyFound) {
-                typeSelected = LogType.LOG_NOTE;
+                typeSelected = LogType.NOTE;
             } else {
                 typeSelected = possibleLogTypes.get(0);
             }
@@ -555,13 +555,13 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D
         typeSelected = type;
         typeButton.setText(typeSelected.getL10n());
 
-        if (LogType.LOG_FOUND_IT == type && !tbChanged) {
+        if (LogType.FOUND_IT == type && !tbChanged) {
             // TODO: change action
-        } else if (LogType.LOG_FOUND_IT != type && !tbChanged) {
+        } else if (LogType.FOUND_IT != type && !tbChanged) {
             // TODO: change action
         }
 
-        if (type == LogType.LOG_FOUND_IT && Settings.isUseTwitter()) {
+        if (type == LogType.FOUND_IT && Settings.isUseTwitter()) {
             tweetBox.setVisibility(View.VISIBLE);
         } else {
             tweetBox.setVisibility(View.GONE);
@@ -600,7 +600,7 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D
             app.clearLogOffline(geocode);
 
             if (alreadyFound) {
-                typeSelected = LogType.LOG_NOTE;
+                typeSelected = LogType.NOTE;
             } else {
                 typeSelected = possibleLogTypes.get(0);
             }
@@ -665,7 +665,7 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D
                 if (CollectionUtils.isNotEmpty(typesPre)) {
                     possibleLogTypes.clear();
                     possibleLogTypes.addAll(typesPre);
-                    possibleLogTypes.remove(LogType.LOG_UPDATE_COORDINATES);
+                    possibleLogTypes.remove(LogType.UPDATE_COORDINATES);
                 }
             } catch (Exception e) {
                 Log.e("cgeovisit.loadData.run: " + e.toString());
@@ -705,7 +705,7 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D
                 cache.prependLog(logNow);
                 //                app.saveLogs(cache);
 
-                if (typeSelected == LogType.LOG_FOUND_IT) {
+                if (typeSelected == LogType.FOUND_IT) {
                     cache.setFound(true);
                 }
 
@@ -716,13 +716,13 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D
                 app.clearLogOffline(geocode);
             }
 
-            if (status == StatusCode.NO_ERROR && typeSelected == LogType.LOG_FOUND_IT && Settings.isUseTwitter()
+            if (status == StatusCode.NO_ERROR && typeSelected == LogType.FOUND_IT && Settings.isUseTwitter()
                     && Settings.isTwitterLoginValid()
                     && tweetCheck.isChecked() && tweetBox.getVisibility() == View.VISIBLE) {
                 Twitter.postTweetCache(geocode);
             }
 
-            if (status == StatusCode.NO_ERROR && typeSelected == LogType.LOG_FOUND_IT && Settings.isGCvoteLogin()) {
+            if (status == StatusCode.NO_ERROR && typeSelected == LogType.FOUND_IT && Settings.isGCvoteLogin()) {
                 GCVote.setRating(cache, rating);
             }
 
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index fb44129..03c704b 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -411,7 +411,7 @@ public class cgCache implements ICache, IWaypoint {
     }
 
     void logOffline(final IAbstractActivity fromActivity, final String log, Calendar date, final LogType logType) {
-        if (logType == LogType.LOG_UNKNOWN) {
+        if (logType == LogType.UNKNOWN) {
             return;
         }
         cgeoapplication app = (cgeoapplication) ((Activity) fromActivity).getApplication();
@@ -433,32 +433,32 @@ public class cgCache implements ICache, IWaypoint {
         boolean isOwner = owner != null && owner.equalsIgnoreCase(Settings.getUsername());
         List<LogType> logTypes = new ArrayList<LogType>();
         if (isEventCache()) {
-            logTypes.add(LogType.LOG_WILL_ATTEND);
-            logTypes.add(LogType.LOG_NOTE);
-            logTypes.add(LogType.LOG_ATTENDED);
-            logTypes.add(LogType.LOG_NEEDS_ARCHIVE);
+            logTypes.add(LogType.WILL_ATTEND);
+            logTypes.add(LogType.NOTE);
+            logTypes.add(LogType.ATTENDED);
+            logTypes.add(LogType.NEEDS_ARCHIVE);
             if (isOwner) {
-                logTypes.add(LogType.LOG_ANNOUNCEMENT);
+                logTypes.add(LogType.ANNOUNCEMENT);
             }
         } else if (CacheType.WEBCAM == cacheType) {
-            logTypes.add(LogType.LOG_WEBCAM_PHOTO_TAKEN);
-            logTypes.add(LogType.LOG_DIDNT_FIND_IT);
-            logTypes.add(LogType.LOG_NOTE);
-            logTypes.add(LogType.LOG_NEEDS_ARCHIVE);
-            logTypes.add(LogType.LOG_NEEDS_MAINTENANCE);
+            logTypes.add(LogType.WEBCAM_PHOTO_TAKEN);
+            logTypes.add(LogType.DIDNT_FIND_IT);
+            logTypes.add(LogType.NOTE);
+            logTypes.add(LogType.NEEDS_ARCHIVE);
+            logTypes.add(LogType.NEEDS_MAINTENANCE);
         } else {
-            logTypes.add(LogType.LOG_FOUND_IT);
-            logTypes.add(LogType.LOG_DIDNT_FIND_IT);
-            logTypes.add(LogType.LOG_NOTE);
-            logTypes.add(LogType.LOG_NEEDS_ARCHIVE);
-            logTypes.add(LogType.LOG_NEEDS_MAINTENANCE);
+            logTypes.add(LogType.FOUND_IT);
+            logTypes.add(LogType.DIDNT_FIND_IT);
+            logTypes.add(LogType.NOTE);
+            logTypes.add(LogType.NEEDS_ARCHIVE);
+            logTypes.add(LogType.NEEDS_MAINTENANCE);
         }
         if (isOwner) {
-            logTypes.add(LogType.LOG_OWNER_MAINTENANCE);
-            logTypes.add(LogType.LOG_TEMP_DISABLE_LISTING);
-            logTypes.add(LogType.LOG_ENABLE_LISTING);
-            logTypes.add(LogType.LOG_ARCHIVE);
-            logTypes.remove(LogType.LOG_UPDATE_COORDINATES);
+            logTypes.add(LogType.OWNER_MAINTENANCE);
+            logTypes.add(LogType.TEMP_DISABLE_LISTING);
+            logTypes.add(LogType.ENABLE_LISTING);
+            logTypes.add(LogType.ARCHIVE);
+            logTypes.remove(LogType.UPDATE_COORDINATES);
         }
         return logTypes;
     }
diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index 9b83a7e..19918a3 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -2508,7 +2508,7 @@ public class cgData {
         if (StringUtils.isBlank(geocode)) {
             return false;
         }
-        if (LogType.LOG_UNKNOWN == type && StringUtils.isBlank(log)) {
+        if (LogType.UNKNOWN == type && StringUtils.isBlank(log)) {
             return false;
         }
 
diff --git a/main/src/cgeo/geocaching/cgeotouch.java b/main/src/cgeo/geocaching/cgeotouch.java
index fc6c2bf..acb7b09 100644
--- a/main/src/cgeo/geocaching/cgeotouch.java
+++ b/main/src/cgeo/geocaching/cgeotouch.java
@@ -43,7 +43,7 @@ public class cgeotouch extends AbstractActivity implements DateDialog.DateDialog
     private String[] viewstates = null;
     private boolean gettingViewstate = true;
     private Calendar date = Calendar.getInstance();
-    private LogType typeSelected = LogType.LOG_UNKNOWN;
+    private LogType typeSelected = LogType.UNKNOWN;
     private int attempts = 0;
     private CheckBox tweetCheck = null;
     private LinearLayout tweetBox = null;
@@ -263,13 +263,13 @@ public class cgeotouch extends AbstractActivity implements DateDialog.DateDialog
         }
 
         logTypes.clear();
-        logTypes.add(LogType.LOG_RETRIEVED_IT);
-        logTypes.add(LogType.LOG_GRABBED_IT);
-        logTypes.add(LogType.LOG_NOTE);
-        logTypes.add(LogType.LOG_DISCOVERED_IT);
+        logTypes.add(LogType.RETRIEVED_IT);
+        logTypes.add(LogType.GRABBED_IT);
+        logTypes.add(LogType.NOTE);
+        logTypes.add(LogType.DISCOVERED_IT);
 
-        if (LogType.LOG_UNKNOWN == typeSelected) {
-            typeSelected = LogType.LOG_RETRIEVED_IT;
+        if (LogType.UNKNOWN == typeSelected) {
+            typeSelected = LogType.RETRIEVED_IT;
         }
         setType(typeSelected);
 
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index c3325f0..9b397c9 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -601,7 +601,7 @@ public abstract class GCParser {
                     String countStr = matcherLog.group(2).replaceAll("[.,]", "");
 
                     if (StringUtils.isNotBlank(typeStr)
-                            && LogType.LOG_UNKNOWN != LogType.getByIconName(typeStr)
+                            && LogType.UNKNOWN != LogType.getByIconName(typeStr)
                             && StringUtils.isNotBlank(countStr)) {
                         cache.getLogCounts().put(LogType.getByIconName(typeStr), Integer.parseInt(countStr));
                     }
diff --git a/main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java b/main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java
index 165e277..06c97b0 100644
--- a/main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java
@@ -135,8 +135,8 @@ final public class OkapiClient {
             final JSONObject owner = response.getJSONObject(CACHE_OWNER);
             cache.setOwner(parseUser(owner));
 
-            cache.getLogCounts().put(LogType.LOG_FOUND_IT, response.getInt(CACHE_FOUNDS));
-            cache.getLogCounts().put(LogType.LOG_DIDNT_FIND_IT, response.getInt(CACHE_NOTFOUNDS));
+            cache.getLogCounts().put(LogType.FOUND_IT, response.getInt(CACHE_FOUNDS));
+            cache.getLogCounts().put(LogType.DIDNT_FIND_IT, response.getInt(CACHE_NOTFOUNDS));
             cache.setSize(getCacheSize(response));
             cache.setDifficulty((float) response.getDouble(CACHE_DIFFICULTY));
             cache.setTerrain((float) response.getDouble(CACHE_TERRAIN));
@@ -224,12 +224,12 @@ final public class OkapiClient {
 
     private static LogType parseLogType(String logType) {
         if ("Found it".equalsIgnoreCase(logType)) {
-            return LogType.LOG_FOUND_IT;
+            return LogType.FOUND_IT;
         }
         if ("Didn't find it".equalsIgnoreCase(logType)) {
-            return LogType.LOG_DIDNT_FIND_IT;
+            return LogType.DIDNT_FIND_IT;
         }
-        return LogType.LOG_NOTE;
+        return LogType.NOTE;
     }
 
     private static Date parseDate(final String date) {
diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java b/main/src/cgeo/geocaching/enumerations/LogType.java
index e4add78..e5c9d40 100644
--- a/main/src/cgeo/geocaching/enumerations/LogType.java
+++ b/main/src/cgeo/geocaching/enumerations/LogType.java
@@ -16,30 +16,30 @@ import java.util.Map;
  */
 public enum LogType {
 
-    LOG_FOUND_IT(2,"icon_smile","found it",R.string.log_found),
-    LOG_DIDNT_FIND_IT(3, "icon_sad", "didn't find it", R.string.log_dnf),
-    LOG_NOTE(4,"icon_note","write note",R.string.log_note),
-    LOG_PUBLISH_LISTING(1003, "icon_greenlight", "publish listing", R.string.log_published),
-    LOG_ENABLE_LISTING(23,"icon_enabled","enable listing",R.string.log_enabled),
-    LOG_ARCHIVE(5,"traffic_cone","archive",R.string.log_archived),
-    LOG_TEMP_DISABLE_LISTING(22,"icon_disabled","temporarily disable listing",R.string.log_disabled),
-    LOG_NEEDS_ARCHIVE(7,"icon_remove","needs archived",R.string.log_needs_archived),
-    LOG_WILL_ATTEND(9,"icon_rsvp","will attend",R.string.log_attend),
-    LOG_ATTENDED(10,"icon_attended","attended",R.string.log_attended),
-    LOG_RETRIEVED_IT(13,"picked_up","retrieved it",R.string.log_retrieved),
-    LOG_PLACED_IT(14,"dropped_off","placed it",R.string.log_placed),
-    LOG_GRABBED_IT(19,"transfer","grabbed it",R.string.log_grabbed),
-    LOG_NEEDS_MAINTENANCE(45,"icon_needsmaint","needs maintenance",R.string.log_maintenance_needed),
-    LOG_OWNER_MAINTENANCE(46,"icon_maint","owner maintenance",R.string.log_maintained),
-    LOG_UPDATE_COORDINATES(47,"coord_update","update coordinates",R.string.log_update),
-    LOG_DISCOVERED_IT(48,"icon_discovered","discovered it",R.string.log_discovered),
-    LOG_POST_REVIEWER_NOTE(18,"big_smile","post reviewer note",R.string.log_reviewed),
-    LOG_VISIT(1001, "icon_visited", "visit", R.string.log_tb_visit),
-    LOG_WEBCAM_PHOTO_TAKEN(11, "icon_camera", "webcam photo taken", R.string.log_webcam),
-    LOG_ANNOUNCEMENT(74, "icon_announcement", "announcement", R.string.log_announcement),
-    LOG_MOVE_COLLECTION(69, "conflict_collection_icon_note", "unused_collection", R.string.log_movecollection),
-    LOG_MOVE_INVENTORY(70, "conflict_inventory_icon_note", "unused_inventory", R.string.log_moveinventory),
-    LOG_UNKNOWN(0, "unknown", "", R.string.err_unknown); // LogType not init. yet
+    FOUND_IT(2,"icon_smile","found it",R.string.log_found),
+    DIDNT_FIND_IT(3, "icon_sad", "didn't find it", R.string.log_dnf),
+    NOTE(4,"icon_note","write note",R.string.log_note),
+    PUBLISH_LISTING(1003, "icon_greenlight", "publish listing", R.string.log_published),
+    ENABLE_LISTING(23,"icon_enabled","enable listing",R.string.log_enabled),
+    ARCHIVE(5,"traffic_cone","archive",R.string.log_archived),
+    TEMP_DISABLE_LISTING(22,"icon_disabled","temporarily disable listing",R.string.log_disabled),
+    NEEDS_ARCHIVE(7,"icon_remove","needs archived",R.string.log_needs_archived),
+    WILL_ATTEND(9,"icon_rsvp","will attend",R.string.log_attend),
+    ATTENDED(10,"icon_attended","attended",R.string.log_attended),
+    RETRIEVED_IT(13,"picked_up","retrieved it",R.string.log_retrieved),
+    PLACED_IT(14,"dropped_off","placed it",R.string.log_placed),
+    GRABBED_IT(19,"transfer","grabbed it",R.string.log_grabbed),
+    NEEDS_MAINTENANCE(45,"icon_needsmaint","needs maintenance",R.string.log_maintenance_needed),
+    OWNER_MAINTENANCE(46,"icon_maint","owner maintenance",R.string.log_maintained),
+    UPDATE_COORDINATES(47,"coord_update","update coordinates",R.string.log_update),
+    DISCOVERED_IT(48,"icon_discovered","discovered it",R.string.log_discovered),
+    POST_REVIEWER_NOTE(18,"big_smile","post reviewer note",R.string.log_reviewed),
+    VISIT(1001, "icon_visited", "visit", R.string.log_tb_visit),
+    WEBCAM_PHOTO_TAKEN(11, "icon_camera", "webcam photo taken", R.string.log_webcam),
+    ANNOUNCEMENT(74, "icon_announcement", "announcement", R.string.log_announcement),
+    MOVE_COLLECTION(69, "conflict_collection_icon_note", "unused_collection", R.string.log_movecollection),
+    MOVE_INVENTORY(70, "conflict_inventory_icon_note", "unused_inventory", R.string.log_moveinventory),
+    UNKNOWN(0, "unknown", "", R.string.err_unknown); // LogType not init. yet
 
     public final int id;
     public final String iconName;
@@ -72,13 +72,13 @@ public enum LogType {
                 return logType;
             }
         }
-        return LOG_UNKNOWN;
+        return UNKNOWN;
     }
 
     public static LogType getByIconName(final String imageType) {
         final LogType result = imageType != null ? LogType.FIND_BY_ICONNAME.get(imageType.toLowerCase().trim()) : null;
         if (result == null) {
-            return LOG_UNKNOWN;
+            return UNKNOWN;
         }
         return result;
     }
@@ -86,7 +86,7 @@ public enum LogType {
     public static LogType getByType(final String type) {
         final LogType result = type != null ? LogType.FIND_BY_TYPE.get(type.toLowerCase().trim()) : null;
         if (result == null) {
-            return LOG_UNKNOWN;
+            return UNKNOWN;
         }
         return result;
     }
diff --git a/main/src/cgeo/geocaching/export/FieldnoteExport.java b/main/src/cgeo/geocaching/export/FieldnoteExport.java
index babc4b6..3fb6cd9 100644
--- a/main/src/cgeo/geocaching/export/FieldnoteExport.java
+++ b/main/src/cgeo/geocaching/export/FieldnoteExport.java
@@ -129,14 +129,14 @@ class FieldnoteExport extends AbstractExport {
             // different strings than gc.com expects in the field note
             // We only need such logtypes that are possible to log via c:geo
             Map<LogType, String> logTypes = new HashMap<LogType, String>();
-            logTypes.put(LogType.LOG_FOUND_IT, "Found it");
-            logTypes.put(LogType.LOG_DIDNT_FIND_IT, "Didn't find it");
-            logTypes.put(LogType.LOG_NOTE, "Write Note");
-            logTypes.put(LogType.LOG_NEEDS_ARCHIVE, "Needs archived");
-            logTypes.put(LogType.LOG_NEEDS_MAINTENANCE, "Needs Maintenance");
-            logTypes.put(LogType.LOG_WILL_ATTEND, "Will Attend");
-            logTypes.put(LogType.LOG_ATTENDED, "Attended");
-            logTypes.put(LogType.LOG_WEBCAM_PHOTO_TAKEN, "Webcam Photo Taken");
+            logTypes.put(LogType.FOUND_IT, "Found it");
+            logTypes.put(LogType.DIDNT_FIND_IT, "Didn't find it");
+            logTypes.put(LogType.NOTE, "Write Note");
+            logTypes.put(LogType.NEEDS_ARCHIVE, "Needs archived");
+            logTypes.put(LogType.NEEDS_MAINTENANCE, "Needs Maintenance");
+            logTypes.put(LogType.WILL_ATTEND, "Will Attend");
+            logTypes.put(LogType.ATTENDED, "Attended");
+            logTypes.put(LogType.WEBCAM_PHOTO_TAKEN, "Webcam Photo Taken");
 
             for (int i = 0; i < caches.size(); i++) {
                 try {
diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java
index 7cc8fbc..c8bf2f4 100644
--- a/main/src/cgeo/geocaching/files/GPXParser.java
+++ b/main/src/cgeo/geocaching/files/GPXParser.java
@@ -674,7 +674,7 @@ public abstract class GPXParser extends FileParser {
 
                 @Override
                 public void start(Attributes attrs) {
-                    log = new LogEntry("", 0, LogType.LOG_UNKNOWN, "");
+                    log = new LogEntry("", 0, LogType.UNKNOWN, "");
 
                     try {
                         if (attrs.getIndex("id") > -1) {
@@ -690,7 +690,7 @@ public abstract class GPXParser extends FileParser {
 
                 @Override
                 public void end() {
-                    if (log.type != LogType.LOG_UNKNOWN) {
+                    if (log.type != LogType.UNKNOWN) {
                         cache.appendLog(log);
                     }
                 }
diff --git a/main/src/cgeo/geocaching/sorting/FindsComparator.java b/main/src/cgeo/geocaching/sorting/FindsComparator.java
index 98fe1dd..ad72ea3 100644
--- a/main/src/cgeo/geocaching/sorting/FindsComparator.java
+++ b/main/src/cgeo/geocaching/sorting/FindsComparator.java
@@ -29,7 +29,7 @@ public class FindsComparator extends AbstractCacheComparator {
         if (cache.getLogCounts().isEmpty()) {
             cache.setLogCounts(app.loadLogCounts(cache.getGeocode()));
         }
-        Integer logged = cache.getLogCounts().get(LogType.LOG_FOUND_IT);
+        Integer logged = cache.getLogCounts().get(LogType.FOUND_IT);
         if (logged != null) {
             finds = logged;
         }