X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2Fcache%2FAppCache.java;h=fdcad082d523e7ad5f101bf92caf49f66b7ee08c;hb=bba1381449408269047715a41a43115621d1045a;hp=8ed33e692ca1a2839165573b52280c93ebbb239c;hpb=53e3890428beabca3cdb44b90ad8e1c294d58768;p=jalview.git

diff --git a/src/jalview/io/cache/AppCache.java b/src/jalview/io/cache/AppCache.java
index 8ed33e6..fdcad08 100644
--- a/src/jalview/io/cache/AppCache.java
+++ b/src/jalview/io/cache/AppCache.java
@@ -1,12 +1,31 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.io.cache;
 
-
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
 import jalview.bin.Cache;
 
-import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.LinkedHashSet;
-import java.util.List;
 
 /**
  * A singleton class used for querying and persisting cache items.
@@ -14,23 +33,28 @@ import java.util.List;
  * @author tcnofoegbu
  *
  */
-public class AppCache
+public class AppCache implements ApplicationSingletonI
 {
-  private static AppCache instance = null;
-
-  private Hashtable<String, LinkedHashSet<String>> cacheItems;
-
-  private static final String DEFAULT_LIMIT_KEY = ".DEFAULT_LIMIT";
 
-  private static final String DEFAULT_LIMIT = "99";
-
-  private static final String CACHE_DELIMITER = ";";
+  public static AppCache getInstance()
+  {
+    return (AppCache) ApplicationSingletonProvider.getInstance(AppCache.class);
+  }
 
   private AppCache()
   {
     cacheItems = new Hashtable<String, LinkedHashSet<String>>();
   }
 
+  public static final String DEFAULT_LIMIT = "99";
+
+  public static final String CACHE_DELIMITER = ";";
+
+  private static final String DEFAULT_LIMIT_KEY = ".DEFAULT_LIMIT";
+
+  private Hashtable<String, LinkedHashSet<String>> cacheItems;
+
+
   /**
    * Method to obtain all the cache items for a given cache key
    * 
@@ -48,49 +72,6 @@ public class AppCache
     return foundCache;
   }
 
-
-  /**
-   * Returns an singleton instance of AppCache
-   * 
-   * @return
-   */
-  public static AppCache getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new AppCache();
-    }
-    return instance;
-  }
-
-  /**
-   * Method for initialising cache items for a given cache key
-   * 
-   * @param cacheKey
-   */
-  public void initCache(String cacheKey)
-  {
-    String separatedStr = Cache.getProperty(cacheKey);
-    if (separatedStr == null || separatedStr.isEmpty())
-    {
-      return;
-    }
-
-    List<String> persistedCacheItems = Arrays.asList(separatedStr.split(CACHE_DELIMITER));
-
-    LinkedHashSet<String> foundCacheItems = cacheItems.get(cacheKey);
-    if (foundCacheItems == null)
-    {
-      foundCacheItems = new LinkedHashSet<String>();
-    }
-
-    for (String cacheItem : persistedCacheItems)
-    {
-      foundCacheItems.add(cacheItem);
-    }
-    cacheItems.put(cacheKey, foundCacheItems);
-  }
-
   /**
    * Method for persisting cache items for a given cache key
    * 
@@ -113,22 +94,46 @@ public class AppCache
     Cache.setProperty(cacheKey, delimitedCacheString);
   }
 
+  /**
+   * Method for deleting cached items for a given cache key
+   * 
+   * @param cacheKey
+   *          the cache key
+   */
   public void deleteCacheItems(String cacheKey)
   {
     cacheItems.put(cacheKey, new LinkedHashSet<String>());
     persistCache(cacheKey);
   }
 
-  public String getCacheLmit(String cacheKey)
+  /**
+   * Method for obtaining the preset maximum cache limit for a given cache key
+   * 
+   * @param cacheKey
+   *          the cache key
+   * @return the max number of items that could be cached
+   */
+  public String getCacheLimit(String cacheKey)
   {
     String uniqueKey = cacheKey + DEFAULT_LIMIT_KEY;
     return Cache.getDefault(uniqueKey, DEFAULT_LIMIT);
   }
 
-  public int updateCacheLimit(String cacheKey, String newLimit)
+  /**
+   * Method for updating the preset maximum cache limit for a given cache key
+   * 
+   * @param cacheKey
+   *          the cache key
+   * @param newLimit
+   *          the max number of items that could be cached for the given cache
+   *          key
+   * @return
+   */
+  public int updateCacheLimit(String cacheKey, int newUserLimit)
   {
+    String newLimit = String.valueOf(newUserLimit);
     String uniqueKey = cacheKey + DEFAULT_LIMIT_KEY;
-    String formerLimit = getCacheLmit(cacheKey);
+    String formerLimit = getCacheLimit(cacheKey);
     if (newLimit != null && !newLimit.isEmpty()
             && !formerLimit.equals(newLimit))
     {
@@ -143,20 +148,13 @@ public class AppCache
    * structure
    * 
    * @param cacheKey
+   *          the cache key
    * @param cacheItems
+   *          the items to add to the cache
    */
-  public void putCache(String cacheKey, LinkedHashSet<String> cacheItems)
+  public void putCache(String cacheKey, LinkedHashSet<String> newCacheItems)
   {
-    getCacheItems().put(cacheKey, cacheItems);
+    cacheItems.put(cacheKey, newCacheItems);
   }
 
-  /**
-   * Getter method for obtaining cache data structure
-   * 
-   * @return
-   */
-  private Hashtable<String, LinkedHashSet<String>> getCacheItems()
-  {
-    return cacheItems;
-  }
 }