X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fcache%2FEhCache.java;h=1d9da8a2bcbf79c0eade4855cf2775589736f242;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=0df1e61f165edee1e8741536f9960cea318905ea;hpb=32a62ca2c752e33a7873ac868a7a1f289caedcd4;p=utils

diff --git a/support/general/src/main/java/org/wamblee/cache/EhCache.java b/support/general/src/main/java/org/wamblee/cache/EhCache.java
index 0df1e61f..1d9da8a2 100644
--- a/support/general/src/main/java/org/wamblee/cache/EhCache.java
+++ b/support/general/src/main/java/org/wamblee/cache/EhCache.java
@@ -24,8 +24,6 @@ import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheException;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
-import net.sf.ehcache.config.Configuration;
-import net.sf.ehcache.config.ConfigurationFactory;
 
 import org.apache.log4j.Logger;
 import org.wamblee.io.InputResource;
@@ -43,12 +41,12 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
     /**
      * EH Cache manager.
      */
-    private CacheManager _manager;
+    private CacheManager manager;
 
     /**
      * EH cache.
      */
-    private Cache _cache;
+    private Cache cache;
 
     /**
      * Constructs a cache based on EHCache.
@@ -65,15 +63,15 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
             throws IOException, CacheException {
         InputStream is = aResource.getInputStream();
         try {
-        	_manager = new CacheManager(is);
-            _cache = _manager.getCache(aCacheName);
-            if (_cache == null) {
+        	manager = new CacheManager(is);
+            cache = manager.getCache(aCacheName);
+            if (cache == null) {
                 LOGGER.warn("Creating cache '" + aCacheName
                         + "' because it is not configured");
-                _manager.addCache(aCacheName);
-                _cache = _manager.getCache(aCacheName);
+                manager.addCache(aCacheName);
+                cache = manager.getCache(aCacheName);
             }
-            assert _cache != null;
+            assert cache != null;
         } finally {
             is.close();
         }
@@ -86,7 +84,7 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
      * @see org.wamblee.cache.Cache#put(KeyType, ValueType)
      */
     public void put(KeyType aKey, ValueType aValue) {
-        _cache.put(new Element(aKey, aValue));
+        cache.put(new Element(aKey, aValue));
     }
 
     /*
@@ -96,7 +94,7 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
      */
     public ValueType get(KeyType aKey) {
         try {
-            Element element = _cache.get(aKey);
+            Element element = cache.get(aKey);
             if (element == null) {
                 return null;
             }
@@ -112,7 +110,7 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
      * @see org.wamblee.cache.Cache#remove(KeyType)
      */
     public void remove(KeyType aKey) {
-        _cache.remove(aKey);
+        cache.remove(aKey);
     }
 
     /*
@@ -121,6 +119,6 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
      * @see org.wamblee.cache.Cache#clear()
      */
     public void clear() {
-        _cache.removeAll();
+        cache.removeAll();
     }
 }