git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...
[jalview.git]
/
src
/
jalview
/
io
/
cache
/
AppCache.java
diff --git
a/src/jalview/io/cache/AppCache.java
b/src/jalview/io/cache/AppCache.java
index
eaf6ecd
..
2a254cc
100644
(file)
--- a/
src/jalview/io/cache/AppCache.java
+++ b/
src/jalview/io/cache/AppCache.java
@@
-21,6
+21,8
@@
package jalview.io.cache;
import jalview.bin.Cache;
package jalview.io.cache;
import jalview.bin.Cache;
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
import java.util.Hashtable;
import java.util.LinkedHashSet;
import java.util.Hashtable;
import java.util.LinkedHashSet;
@@
-28,26
+30,31
@@
import java.util.LinkedHashSet;
/**
* A singleton class used for querying and persisting cache items.
*
/**
* A singleton class used for querying and persisting cache items.
*
+ *
* @author tcnofoegbu
*
*/
* @author tcnofoegbu
*
*/
-public class AppCache
+public class AppCache implements ApplicationSingletonI
{
{
+
+ public static AppCache getInstance()
+ {
+ return (AppCache) ApplicationSingletonProvider.getInstance(AppCache.class);
+ }
+
+ private AppCache()
+ {
+ cacheItems = new Hashtable<>();
+ }
+
public static final String DEFAULT_LIMIT = "99";
public static final String CACHE_DELIMITER = ";";
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<String, LinkedHashSet<String>> cacheItems;
private static final String DEFAULT_LIMIT_KEY = ".DEFAULT_LIMIT";
private Hashtable<String, LinkedHashSet<String>> cacheItems;
- private AppCache()
- {
- cacheItems = new Hashtable<String, LinkedHashSet<String>>();
- }
-
/**
* Method to obtain all the cache items for a given cache key
*
/**
* Method to obtain all the cache items for a given cache key
*
@@
-59,27
+66,13
@@
public class AppCache
LinkedHashSet<String> foundCache = cacheItems.get(cacheKey);
if (foundCache == null)
{
LinkedHashSet<String> foundCache = cacheItems.get(cacheKey);
if (foundCache == null)
{
- foundCache = new LinkedHashSet<String>();
+ foundCache = new LinkedHashSet<>();
cacheItems.put(cacheKey, foundCache);
}
return foundCache;
}
/**
cacheItems.put(cacheKey, foundCache);
}
return foundCache;
}
/**
- * Returns a singleton instance of AppCache
- *
- * @return
- */
- public static AppCache getInstance()
- {
- if (instance == null)
- {
- instance = new AppCache();
- }
- return instance;
- }
-
- /**
* Method for persisting cache items for a given cache key
*
* @param cacheKey
* Method for persisting cache items for a given cache key
*
* @param cacheKey