fix several name shadowing occurrences

1 files changed, 19 insertions, 19 deletions

diff --git a/main/src/cgeo/geocaching/enumerations/LoadFlags.java b/main/src/cgeo/geocaching/enumerations/LoadFlags.java
index fb894ac..c781f4b 100644
--- a/main/src/cgeo/geocaching/enumerations/LoadFlags.java
+++ b/main/src/cgeo/geocaching/enumerations/LoadFlags.java
@@ -8,39 +8,39 @@ import java.util.EnumSet;
 public interface LoadFlags {
 
     public enum LoadFlag {
-        LOAD_CACHE_BEFORE, // load from CacheCache
-        LOAD_CACHE_AFTER, // load from CacheCache
-        LOAD_DB_MINIMAL, // load minimal informations from DataBase
-        LOAD_ATTRIBUTES,
-        LOAD_WAYPOINTS,
-        LOAD_SPOILERS,
-        LOAD_LOGS,
-        LOAD_INVENTORY,
-        LOAD_OFFLINE_LOG
+        CACHE_BEFORE, // load from CacheCache
+        CACHE_AFTER, // load from CacheCache
+        DB_MINIMAL, // load minimal informations from DataBase
+        ATTRIBUTES,
+        WAYPOINTS,
+        SPOILERS,
+        LOGS,
+        INVENTORY,
+        OFFLINE_LOG
     }
 
     /** Retrieve cache from CacheCache only. Do not load from DB */
-    public final static EnumSet<LoadFlag> LOAD_CACHE_ONLY = EnumSet.of(LoadFlag.LOAD_CACHE_BEFORE);
+    public final static EnumSet<LoadFlag> LOAD_CACHE_ONLY = EnumSet.of(LoadFlag.CACHE_BEFORE);
     /** Retrieve cache from CacheCache first. If not found load from DB */
-    public final static EnumSet<LoadFlag> LOAD_CACHE_OR_DB = EnumSet.of(LoadFlag.LOAD_CACHE_BEFORE, LoadFlag.LOAD_DB_MINIMAL, LoadFlag.LOAD_OFFLINE_LOG);
+    public final static EnumSet<LoadFlag> LOAD_CACHE_OR_DB = EnumSet.of(LoadFlag.CACHE_BEFORE, LoadFlag.DB_MINIMAL, LoadFlag.OFFLINE_LOG);
     /** Retrieve cache (minimalistic information including waypoints) from DB first. If not found load from CacheCache */
-    public final static EnumSet<LoadFlag> LOAD_WAYPOINTS = EnumSet.of(LoadFlag.LOAD_CACHE_AFTER, LoadFlag.LOAD_DB_MINIMAL, LoadFlag.LOAD_WAYPOINTS, LoadFlag.LOAD_OFFLINE_LOG);
+    public final static EnumSet<LoadFlag> LOAD_WAYPOINTS = EnumSet.of(LoadFlag.CACHE_AFTER, LoadFlag.DB_MINIMAL, LoadFlag.WAYPOINTS, LoadFlag.OFFLINE_LOG);
     /** Retrieve cache (all stored informations) from DB only. Do not load from CacheCache */
-    public final static EnumSet<LoadFlag> LOAD_ALL_DB_ONLY = EnumSet.range(LoadFlag.LOAD_DB_MINIMAL, LoadFlag.LOAD_OFFLINE_LOG);
+    public final static EnumSet<LoadFlag> LOAD_ALL_DB_ONLY = EnumSet.range(LoadFlag.DB_MINIMAL, LoadFlag.OFFLINE_LOG);
 
     public enum SaveFlag {
-        SAVE_CACHE, // save only to CacheCache
-        SAVE_DB // include saving to CacheCache
+        CACHE, // save only to CacheCache
+        DB // include saving to CacheCache
     }
 
     public final static EnumSet<SaveFlag> SAVE_ALL = EnumSet.allOf(SaveFlag.class);
 
     public enum RemoveFlag {
-        REMOVE_CACHE, // save only to CacheCache
-        REMOVE_DB, // includes removing from CacheCache
-        REMOVE_OWN_WAYPOINTS_ONLY_FOR_TESTING // only to be used in unit testing (as we never delete own waypoints)
+        CACHE, // save only to CacheCache
+        DB, // includes removing from CacheCache
+        OWN_WAYPOINTS_ONLY_FOR_TESTING // only to be used in unit testing (as we never delete own waypoints)
     }
 
-    public final static EnumSet<RemoveFlag> REMOVE_ALL = EnumSet.of(RemoveFlag.REMOVE_CACHE, RemoveFlag.REMOVE_DB);
+    public final static EnumSet<RemoveFlag> REMOVE_ALL = EnumSet.of(RemoveFlag.CACHE, RemoveFlag.DB);
 
 }
\ No newline at end of file