Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java @ 930:3fd891d5228d
The DataFacets are now able to store the ID of the create which created them.
flys-artifacts/trunk@2292 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Wed, 06 Jul 2011 13:37:52 +0000 |
| parents | 960dc6328e70 |
| children | eccf966fb677 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java Wed Jul 06 09:18:31 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java Wed Jul 06 13:37:52 2011 +0000 @@ -60,6 +60,8 @@ ) { WINFOArtifact winfo = (WINFOArtifact)artifact; + String id = getID(); + CalculationResult res = old instanceof CalculationResult ? (CalculationResult)old : winfo.getWaterlevelData(); @@ -86,26 +88,27 @@ logger.debug("Create facet: " + nameW); logger.debug("Create facet: " + nameQ); - Facet w = new WaterlevelFacet(i, LONGITUDINAL_W, nameW, ComputeType.ADVANCE, getID(), winfo.hash()); - Facet q = new WaterlevelFacet(i, LONGITUDINAL_Q, nameQ, ComputeType.ADVANCE, getID(), winfo.hash()); + Facet w = new WaterlevelFacet( + i, LONGITUDINAL_W, nameW, ComputeType.ADVANCE, id, hash); + Facet q = new WaterlevelFacet( + i, LONGITUDINAL_Q, nameQ, ComputeType.ADVANCE, id, hash); facets.add(w); facets.add(q); } if (wqkms.length > 0) { - Facet wst = new DataFacet(WST, "WST data"); - Facet csv = new DataFacet(CSV, "CSV data"); + Facet wst = new DataFacet( + WST, "WST data", ComputeType.ADVANCE, hash, id); + Facet csv = new DataFacet( + CSV, "CSV data", ComputeType.ADVANCE, hash, id); facets.add(wst); facets.add(csv); } if (res.getReport().hasProblems()) { - facets.add(new ReportFacet( - ComputeType.ADVANCE, - winfo.hash(), - getID())); + facets.add(new ReportFacet(ComputeType.ADVANCE, hash, id)); } return res;