Changeset 338 for trunk/geowebcache/src/main/java/org/geowebcache/cache/CacheKeyFactory.java

Timestamp:

08/21/08 15:25:34 (5 months ago)

Author:

arneke

Message:

Tons of minor tweaks and fixes. Separated out the XStream stuff a bit more. Cleaned up dependencies.

Files:

• trunk/geowebcache/src/main/java/org/geowebcache/cache/CacheKeyFactory.java (modified) (2 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/cache/CacheKeyFactory.java

@@ -21 +21 @@
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.apache.commons.logging.Log;
@@ -49 +50 @@
         
     private void loadCacheKeys() {
-        Map cacheBeans = context.getBeansOfType(CacheKey.class);
-        Iterator beanIter = cacheBeans.keySet().iterator();
+        Map<String,CacheKey> cacheBeans = context.getBeansOfType(CacheKey.class);
+        Iterator<Entry<String,CacheKey>> beanIter = cacheBeans.entrySet().iterator();
         
         cacheKeys = new HashMap<String,CacheKey>();
+        
         while(beanIter.hasNext()) {
-                String beanId = (String) beanIter.next();
-            CacheKey aCacheKey = (CacheKey) cacheBeans.get(beanId);
-            cacheKeys.put(beanId, aCacheKey);
+            Entry<String,CacheKey> entry = beanIter.next();
+            cacheKeys.put(entry.getKey(), entry.getValue());
+            log.debug("Added cache key bean for " + entry.getValue().getClass().toString());
         }
     }