Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 929:960dc6328e70 | 930:3fd891d5228d |
|---|---|
| 58 List<Facet> facets, | 58 List<Facet> facets, |
| 59 Object old | 59 Object old |
| 60 ) { | 60 ) { |
| 61 WINFOArtifact winfo = (WINFOArtifact)artifact; | 61 WINFOArtifact winfo = (WINFOArtifact)artifact; |
| 62 | 62 |
| 63 String id = getID(); | |
| 64 | |
| 63 CalculationResult res = old instanceof CalculationResult | 65 CalculationResult res = old instanceof CalculationResult |
| 64 ? (CalculationResult)old | 66 ? (CalculationResult)old |
| 65 : winfo.getWaterlevelData(); | 67 : winfo.getWaterlevelData(); |
| 66 | 68 |
| 67 if (facets == null) { | 69 if (facets == null) { |
| 84 } | 86 } |
| 85 | 87 |
| 86 logger.debug("Create facet: " + nameW); | 88 logger.debug("Create facet: " + nameW); |
| 87 logger.debug("Create facet: " + nameQ); | 89 logger.debug("Create facet: " + nameQ); |
| 88 | 90 |
| 89 Facet w = new WaterlevelFacet(i, LONGITUDINAL_W, nameW, ComputeType.ADVANCE, getID(), winfo.hash()); | 91 Facet w = new WaterlevelFacet( |
| 90 Facet q = new WaterlevelFacet(i, LONGITUDINAL_Q, nameQ, ComputeType.ADVANCE, getID(), winfo.hash()); | 92 i, LONGITUDINAL_W, nameW, ComputeType.ADVANCE, id, hash); |
| 93 Facet q = new WaterlevelFacet( | |
| 94 i, LONGITUDINAL_Q, nameQ, ComputeType.ADVANCE, id, hash); | |
| 91 | 95 |
| 92 facets.add(w); | 96 facets.add(w); |
| 93 facets.add(q); | 97 facets.add(q); |
| 94 } | 98 } |
| 95 | 99 |
| 96 if (wqkms.length > 0) { | 100 if (wqkms.length > 0) { |
| 97 Facet wst = new DataFacet(WST, "WST data"); | 101 Facet wst = new DataFacet( |
| 98 Facet csv = new DataFacet(CSV, "CSV data"); | 102 WST, "WST data", ComputeType.ADVANCE, hash, id); |
| 103 Facet csv = new DataFacet( | |
| 104 CSV, "CSV data", ComputeType.ADVANCE, hash, id); | |
| 99 | 105 |
| 100 facets.add(wst); | 106 facets.add(wst); |
| 101 facets.add(csv); | 107 facets.add(csv); |
| 102 } | 108 } |
| 103 | 109 |
| 104 if (res.getReport().hasProblems()) { | 110 if (res.getReport().hasProblems()) { |
| 105 facets.add(new ReportFacet( | 111 facets.add(new ReportFacet(ComputeType.ADVANCE, hash, id)); |
| 106 ComputeType.ADVANCE, | |
| 107 winfo.hash(), | |
| 108 getID())); | |
| 109 } | 112 } |
| 110 | 113 |
| 111 return res; | 114 return res; |
| 112 } | 115 } |
| 113 } | 116 } |