X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fcache%2FEhCache.java;h=9c32dda8b932329271e63b1d8507e3ff5cd733db;hb=2e7fbe1e64c571003cd859d520dea1286c3b21e3;hp=dd01cd94a9d000a46aae53b1ea93bca50cce894b;hpb=f4d446b84fa1a38ed83cd157f79fdb8233822145;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 dd01cd94..9c32dda8 100644
--- a/support/general/src/main/java/org/wamblee/cache/EhCache.java
+++ b/support/general/src/main/java/org/wamblee/cache/EhCache.java
@@ -1,18 +1,18 @@
 /*
- * Copyright 2005 the original author or authors.
- *
+ * Copyright 2005-2010 the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
+ */ 
 package org.wamblee.cache;
 
 import net.sf.ehcache.Cache;
@@ -20,29 +20,23 @@ import net.sf.ehcache.CacheException;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
 
-import org.apache.log4j.Logger;
 
 import org.wamblee.io.InputResource;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
-
+import java.util.logging.Logger;
 
 /**
  * Cache implemented on top of EhCache.
- *
+ * 
  * @author Erik Brakkee
- *
- * @param <KeyType> DOCUMENT ME!
- * @param <ValueType> DOCUMENT ME!
+ * 
  */
 public class EhCache<KeyType extends Serializable, ValueType extends Serializable>
     implements org.wamblee.cache.Cache<KeyType, ValueType> {
-    /**
-     * DOCUMENT ME!
-     */
-    private static final Logger LOGGER = Logger.getLogger(EhCache.class);
+    private static final Logger LOGGER = Logger.getLogger(EhCache.class.getName());
 
     /**
      * EH Cache manager.
@@ -54,9 +48,9 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
      */
     private Cache cache;
 
-/**
+    /**
      * Constructs a cache based on EHCache.
-     *
+     * 
      * @param aResource
      *            Resource containing the configuration file for EHCache.
      * @param aCacheName
@@ -70,12 +64,12 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
         InputStream is = aResource.getInputStream();
 
         try {
-            manager     = new CacheManager(is);
-            cache       = manager.getCache(aCacheName);
+            manager = new CacheManager(is);
+            cache = manager.getCache(aCacheName);
 
             if (cache == null) {
-                LOGGER.warn("Creating cache '" + aCacheName
-                    + "' because it is not configured");
+                LOGGER.warning("Creating cache '" + aCacheName +
+                    "' because it is not configured");
                 manager.addCache(aCacheName);
                 cache = manager.getCache(aCacheName);
             }
@@ -87,31 +81,18 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see org.wamblee.cache.Cache#put(KeyType, ValueType)
      */
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aKey DOCUMENT ME!
-     * @param aValue DOCUMENT ME!
-     */
     public void put(KeyType aKey, ValueType aValue) {
         cache.put(new Element(aKey, aValue));
     }
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see org.wamblee.cache.Cache#get(KeyType)
      */
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aKey DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
     public ValueType get(KeyType aKey) {
         try {
             Element element = cache.get(aKey);
@@ -128,26 +109,18 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see org.wamblee.cache.Cache#remove(KeyType)
      */
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aKey DOCUMENT ME!
-     */
     public void remove(KeyType aKey) {
         cache.remove(aKey);
     }
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see org.wamblee.cache.Cache#clear()
      */
-    /**
-     * DOCUMENT ME!
-     */
     public void clear() {
         cache.removeAll();
     }