From afa01f7267f35acfa2f13d80ff0a6d864aa47e83 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Mon, 6 Jan 2014 13:56:39 +0100
Subject: Revert "refactoring: remove dead enumeration items and dead code"

This reverts commit e2443f151d4d2bcd7574c19dcb3b4aedbd262a75.

The enumeration items were used in a range expression.
---
 main/src/cgeo/geocaching/DataStore.java            | 29 ++++++++++++++++++++++
 .../cgeo/geocaching/enumerations/LoadFlags.java    |  3 +++
 2 files changed, 32 insertions(+)

(limited to 'main/src')

diff --git a/main/src/cgeo/geocaching/DataStore.java b/main/src/cgeo/geocaching/DataStore.java
index 962f68f..3abeff3 100644
--- a/main/src/cgeo/geocaching/DataStore.java
+++ b/main/src/cgeo/geocaching/DataStore.java
@@ -1555,6 +1555,9 @@ public class DataStore {
         if (loadFlags.contains(LoadFlag.LOAD_DB_MINIMAL) ||
                 loadFlags.contains(LoadFlag.LOAD_ATTRIBUTES) ||
                 loadFlags.contains(LoadFlag.LOAD_WAYPOINTS) ||
+                loadFlags.contains(LoadFlag.LOAD_SPOILERS) ||
+                loadFlags.contains(LoadFlag.LOAD_LOGS) ||
+                loadFlags.contains(LoadFlag.LOAD_INVENTORY) ||
                 loadFlags.contains(LoadFlag.LOAD_OFFLINE_LOG)) {
 
             final Set<Geocache> cachesFromDB = loadCachesFromGeocodes(remaining, loadFlags);
@@ -1627,6 +1630,32 @@ public class DataStore {
                     }
                 }
 
+                if (loadFlags.contains(LoadFlag.LOAD_SPOILERS)) {
+                    final List<Image> spoilers = loadSpoilers(cache.getGeocode());
+                    cache.setSpoilers(spoilers);
+                }
+
+                if (loadFlags.contains(LoadFlag.LOAD_LOGS)) {
+                    cache.setLogs(loadLogs(cache.getGeocode()));
+                    final Map<LogType, Integer> logCounts = loadLogCounts(cache.getGeocode());
+                    if (MapUtils.isNotEmpty(logCounts)) {
+                        cache.getLogCounts().clear();
+                        cache.getLogCounts().putAll(logCounts);
+                    }
+                }
+
+                if (loadFlags.contains(LoadFlag.LOAD_INVENTORY)) {
+                    final List<Trackable> inventory = loadInventory(cache.getGeocode());
+                    if (CollectionUtils.isNotEmpty(inventory)) {
+                        if (cache.getInventory() == null) {
+                            cache.setInventory(new ArrayList<Trackable>());
+                        } else {
+                            cache.getInventory().clear();
+                        }
+                        cache.getInventory().addAll(inventory);
+                    }
+                }
+
                 if (loadFlags.contains(LoadFlag.LOAD_OFFLINE_LOG)) {
                     if (logIndex < 0) {
                         logIndex = cursor.getColumnIndex("log");
diff --git a/main/src/cgeo/geocaching/enumerations/LoadFlags.java b/main/src/cgeo/geocaching/enumerations/LoadFlags.java
index af274e7..fb894ac 100644
--- a/main/src/cgeo/geocaching/enumerations/LoadFlags.java
+++ b/main/src/cgeo/geocaching/enumerations/LoadFlags.java
@@ -13,6 +13,9 @@ public interface LoadFlags {
         LOAD_DB_MINIMAL, // load minimal informations from DataBase
         LOAD_ATTRIBUTES,
         LOAD_WAYPOINTS,
+        LOAD_SPOILERS,
+        LOAD_LOGS,
+        LOAD_INVENTORY,
         LOAD_OFFLINE_LOG
     }
 
-- 
cgit v1.1