Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java @ 2122:81312f84689a
Refactored to easier enjoy benefits of caching.
flys-artifacts/trunk@3692 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Tue, 17 Jan 2012 08:01:22 +0000 |
parents | 9d79f6ceefca |
children | 7a8f52267a5c |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java Tue Jan 17 07:55:12 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java Tue Jan 17 08:01:22 2012 +0000 @@ -7,7 +7,7 @@ import de.intevation.artifactdatabase.state.Facet; -import de.intevation.flys.artifacts.WINFOArtifact; +import de.intevation.flys.artifacts.FLYSArtifact; import de.intevation.flys.artifacts.states.DefaultState.ComputeType; @@ -15,24 +15,14 @@ /** * Facet of a Waterlevel (WQKms). */ -public class WaterlevelFacet extends BlackboardDataFacet { +public class WaterlevelFacet extends DataFacet { private static Logger logger = Logger.getLogger(WaterlevelFacet.class); - protected ComputeType type; - protected String stateID; - protected String hash; - - public WaterlevelFacet(int index, String name, String description) { - this(index, name, description, ComputeType.ADVANCE, null, null); + super(index, name, description, ComputeType.ADVANCE, null, null); } - - public WaterlevelFacet() { - } - - public WaterlevelFacet( int index, String name, @@ -42,10 +32,10 @@ String hash ) { - super(index, name, description); - this.type = type; - this.stateID = stateID; - this.hash = hash; + super(index, name, description, type, stateID, hash); + } + + public WaterlevelFacet() { } @@ -56,10 +46,10 @@ public Object getData(Artifact artifact, CallContext context) { logger.debug("Get data for waterlevels at index: " + index); - WINFOArtifact winfo = (WINFOArtifact)artifact; + FLYSArtifact winfo = (FLYSArtifact)artifact; CalculationResult res = (CalculationResult) - winfo.compute(context, hash, stateID, type, false); + winfo.compute(context, hash, stateId, type, false); WQKms [] wqkms = (WQKms [])res.getData(); @@ -73,7 +63,7 @@ WaterlevelFacet copy = new WaterlevelFacet(); copy.set(this); copy.type = type; - copy.stateID = stateID; + copy.stateId = stateId; copy.hash = hash; return copy; }