Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java @ 697:b972eba2ed8a facets-slt
Removed ComputeCallback because this was thought too complicated. Fixed issue with facets not be re-generated if same state is entered again.
flys-artifacts/branches/facets-slt@2143 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Fri, 17 Jun 2011 10:40:54 +0000 |
| parents | 22e4bffbe240 |
| children | 853dceead0f4 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java Fri Jun 17 09:19:43 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java Fri Jun 17 10:40:54 2011 +0000 @@ -1,6 +1,7 @@ package de.intevation.flys.artifacts.states; import java.util.List; +import java.util.Map; import org.apache.log4j.Logger; @@ -21,9 +22,9 @@ import de.intevation.flys.artifacts.FLYSArtifact; import de.intevation.flys.artifacts.WINFOArtifact; -import de.intevation.flys.artifacts.model.ComputeCallback; -import de.intevation.flys.artifacts.model.ComputeCallbackAdapter; + import de.intevation.flys.artifacts.model.RiverFactory; + import de.intevation.flys.artifacts.resources.Resources; /** @@ -299,18 +300,28 @@ @Override - public ComputeCallback createComputeCallback( - String hash, FLYSArtifact flys) - { - final WINFOArtifact winfo = (WINFOArtifact) flys; + public Object computeFeed( + FLYSArtifact artifact, + String hash, + CallContext context, + List<Facet> facets, + Object old + ) { + WINFOArtifact winfo = (WINFOArtifact)artifact; - return new ComputeCallbackAdapter() { + Map<String, double [][]> res; - @Override - public Object computeFeed(CallContext context, List<Facet> facets) { - return winfo.getDischargeCurveData(); - } - }; + if (old instanceof Map<?, ?>) { + res = (Map<String, double [][]>)old; + } + else { + res = winfo.getDischargeCurveData(); + } + + // TODO: Generate facets! + + + return res; } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :