fix #120: make settings static (no singleton)

* Settings can no longer be instantiated, everything is static instead.
* Most option values are no longer cached in fields. This has been done
for clarity during the refactoring. I will add some performance tests
afterwards and may re-introduce those fields for caching the option
values.

Sorry, if anyone gets merge issues afterwards. There was no easier way
to implement this...

1 files changed, 8 insertions, 8 deletions

diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index c56d0f7..1ff1f96 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -252,10 +252,10 @@ public class cgCache implements ICache {
         Pattern patternOk = Pattern.compile(guid, Pattern.CASE_INSENSITIVE);
         Matcher matcherOk = patternOk.matcher(page);
         if (matcherOk.find()) {
-            Log.i(cgSettings.tag, "cgCache.isGuidContainedInPage: guid '" + guid + "' found");
+            Log.i(Settings.tag, "cgCache.isGuidContainedInPage: guid '" + guid + "' found");
             return true;
         } else {
-            Log.i(cgSettings.tag, "cgCache.isGuidContainedInPage: guid '" + guid + "' not found");
+            Log.i(Settings.tag, "cgCache.isGuidContainedInPage: guid '" + guid + "' not found");
             return false;
         }
     }
@@ -279,11 +279,11 @@ public class cgCache implements ICache {
         return true;
     }
 
-    public boolean logOffline(final IAbstractActivity fromActivity, final int logType, final cgSettings settings, final cgBase base) {
+    public boolean logOffline(final IAbstractActivity fromActivity, final int logType, final cgBase base) {
         String log = "";
-        if (StringUtils.isNotBlank(settings.getSignature())
-                && settings.signatureAutoinsert) {
-            log = LogTemplateProvider.applyTemplates(settings.getSignature(), base, true);
+        if (StringUtils.isNotBlank(Settings.getSignature())
+                && Settings.isAutoInsertSignature()) {
+            log = LogTemplateProvider.applyTemplates(Settings.getSignature(), base, true);
         }
         logOffline(fromActivity, log, Calendar.getInstance(), logType);
         return true;
@@ -305,8 +305,8 @@ public class cgCache implements ICache {
         }
     }
 
-    public List<Integer> getPossibleLogTypes(cgSettings settings) {
-        boolean isOwner = owner != null && owner.equalsIgnoreCase(settings.getUsername());
+    public List<Integer> getPossibleLogTypes() {
+        boolean isOwner = owner != null && owner.equalsIgnoreCase(Settings.getUsername());
         List<Integer> types = new ArrayList<Integer>();
         if ("event".equals(type) || "mega".equals(type) || "cito".equals(type) || "lostfound".equals(type)) {
             types.add(cgBase.LOG_WILL_ATTEND);