Mercurial > dive4elements > river
changeset 626:e3ee131d5dd3
Moved WST value table cache key to a separate class.
flys-artifacts/trunk@1991 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Tue, 24 May 2011 11:23:57 +0000 |
parents | c0c60a611fca |
children | 833290f16f09 |
files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java |
diffstat | 3 files changed, 38 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Mon May 23 22:33:37 2011 +0000 +++ b/flys-artifacts/ChangeLog Tue May 24 11:23:57 2011 +0000 @@ -1,3 +1,11 @@ +2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java: + Moved cache key to separate class. + + * src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java: + New. The new cache key class. + 2011-05-24 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTableCacheKey.java Tue May 24 11:23:57 2011 +0000 @@ -0,0 +1,28 @@ +package de.intevation.flys.artifacts.model; + +import java.io.Serializable; + +public final class WstValueTableCacheKey +implements Serializable +{ + private int riverId; + private int kind; + + public WstValueTableCacheKey(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 WstValueTableCacheKey)) { + return false; + } + WstValueTableCacheKey o = (WstValueTableCacheKey)other; + return riverId == o.riverId && kind == o.kind; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- 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");