--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java	Mon May 23 22:33:37 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java	Tue May 24 11:23:57 2011 +0000
@@ -1,7 +1,5 @@
 package de.intevation.flys.artifacts.model;
 
-import java.io.Serializable;
-
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -38,30 +36,6 @@
         "    FROM wst_value_table"          +
         "    WHERE wst_id = :wst_id";
 
-    public static final class CacheKey
-    implements                Serializable
-    {
-        private int riverId;
-        private int kind;
-
-        public CacheKey(int riverId, int kind) {
-            this.riverId = riverId;
-            this.kind    = kind;
-        }
-
-        public int hashCode() {
-            return (riverId << 8) | kind;
-        }
-
-        public boolean equals(Object other) {
-            if (!(other instanceof CacheKey)) {
-                return false;
-            }
-            CacheKey o = (CacheKey)other;
-            return riverId == o.riverId && kind == o.kind;
-        }
-    } // class CacheKey
-
     private WstValueTableFactory() {
     }
 
@@ -73,10 +47,10 @@
 
         Cache cache = CacheFactory.getCache(CACHE_NAME);
 
-        CacheKey cacheKey;
+        WstValueTableCacheKey cacheKey;
 
         if (cache != null) {
-            cacheKey = new CacheKey(river.getId(), kind);
+            cacheKey = new WstValueTableCacheKey(river.getId(), kind);
             Element element = cache.get(cacheKey);
             if (element != null) {
                 log.debug("got wst value table from cache");