X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fio%2Fcache%2FAppCache.java;h=eaf6ecd65b25423572a18958c5287a29ad1de902;hb=4194c2c98f734d6d43f64a66e506995b5a0f64da;hp=111a99bc7923b59073b776d2cdce660941284980;hpb=ddaf8294122cf6dd080339726113f9f54175f413;p=jalview.git
diff --git a/src/jalview/io/cache/AppCache.java b/src/jalview/io/cache/AppCache.java
index 111a99b..eaf6ecd 100644
--- a/src/jalview/io/cache/AppCache.java
+++ b/src/jalview/io/cache/AppCache.java
@@ -1,14 +1,46 @@
+/*
+ * 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.io.cache;
+import jalview.bin.Cache;
import java.util.Hashtable;
import java.util.LinkedHashSet;
-import java.util.Set;
-public class AppCache implements AppCacheI
+/**
+ * A singleton class used for querying and persisting cache items.
+ *
+ * @author tcnofoegbu
+ *
+ */
+public class AppCache
{
+ public static final String DEFAULT_LIMIT = "99";
+
+ public static final String CACHE_DELIMITER = ";";
+
private static AppCache instance = null;
+ private static final String DEFAULT_LIMIT_KEY = ".DEFAULT_LIMIT";
+
private Hashtable> cacheItems;
private AppCache()
@@ -16,7 +48,12 @@ public class AppCache implements AppCacheI
cacheItems = new Hashtable>();
}
- @Override
+ /**
+ * Method to obtain all the cache items for a given cache key
+ *
+ * @param cacheKey
+ * @return
+ */
public LinkedHashSet getAllCachedItemsFor(String cacheKey)
{
LinkedHashSet foundCache = cacheItems.get(cacheKey);
@@ -28,7 +65,11 @@ public class AppCache implements AppCacheI
return foundCache;
}
-
+ /**
+ * Returns a singleton instance of AppCache
+ *
+ * @return
+ */
public static AppCache getInstance()
{
if (instance == null)
@@ -38,47 +79,89 @@ public class AppCache implements AppCacheI
return instance;
}
- @Override
- public void updateCache(Cacheable cacheable)
+ /**
+ * Method for persisting cache items for a given cache key
+ *
+ * @param cacheKey
+ */
+ public void persistCache(String cacheKey)
{
- CacheBoxI cacheComboBox = cacheable.getCacheComboBox();
- String cacheKey = cacheable.getCacheKey();
- cacheComboBox.looseFocus();
- String userInput = cacheComboBox.getUserInput();
-
- if (userInput != null && !userInput.isEmpty())
+ LinkedHashSet foundCacheItems = getAllCachedItemsFor(cacheKey);
+ StringBuffer delimitedCacheBuf = new StringBuffer();
+ for (String cacheItem : foundCacheItems)
{
- LinkedHashSet foundCache = getAllCachedItemsFor(cacheKey);
- foundCache.add(userInput);
- cacheItems.put(cacheKey, foundCache);
+ delimitedCacheBuf.append(CACHE_DELIMITER).append(cacheItem);
}
-
- String lastSearch = userInput;
- if (cacheComboBox.getItemCount() > 0)
+ if (delimitedCacheBuf.length() > 0)
{
- cacheComboBox.removeAllItems();
+ delimitedCacheBuf.deleteCharAt(0);
}
+ String delimitedCacheString = delimitedCacheBuf.toString();
- Set cacheItems = getAllCachedItemsFor(cacheKey);
- if (cacheItems != null && !cacheItems.isEmpty())
- {
- for (String cacheItem : cacheItems)
- {
- cacheComboBox.addItem(cacheItem);
- }
- }
+ Cache.setProperty(cacheKey, delimitedCacheString);
+ }
- if (!lastSearch.isEmpty())
- {
- cacheComboBox.setSelectedItem(lastSearch);
- cacheComboBox.requestFocus();
- }
- else
+ /**
+ * 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());
+ persistCache(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);
+ }
+
+ /**
+ * 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 = getCacheLimit(cacheKey);
+ if (newLimit != null && !newLimit.isEmpty()
+ && !formerLimit.equals(newLimit))
{
- cacheable.init();
- cacheComboBox.addItem("");
- cacheComboBox.setSelectedItem("");
+ Cache.setProperty(uniqueKey, newLimit);
+ formerLimit = newLimit;
}
+ return Integer.valueOf(formerLimit);
+ }
+
+ /**
+ * Method for inserting cache items for given cache key into the cache data
+ * structure
+ *
+ * @param cacheKey
+ * the cache key
+ * @param cacheItems
+ * the items to add to the cache
+ */
+ public void putCache(String cacheKey, LinkedHashSet newCacheItems)
+ {
+ cacheItems.put(cacheKey, newCacheItems);
}
}