Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/AreaArtifact.java @ 4504:d7e1aee9d51e
Merged.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Wed, 14 Nov 2012 12:37:57 +0100 |
| parents | a2735a4bf75e |
| children |
comparison
equal
deleted
inserted
replaced
| 4503:f91260ccef03 | 4504:d7e1aee9d51e |
|---|---|
| 82 fs.add(new AreaFacet(0, "", "TODO: I am an AreaFacet")); | 82 fs.add(new AreaFacet(0, "", "TODO: I am an AreaFacet")); |
| 83 | 83 |
| 84 AreaCreationState state = (AreaCreationState) getCurrentState(context); | 84 AreaCreationState state = (AreaCreationState) getCurrentState(context); |
| 85 | 85 |
| 86 if (!fs.isEmpty()) { | 86 if (!fs.isEmpty()) { |
| 87 facets.put(getCurrentStateId(), fs); | 87 addFacets(getCurrentStateId(), fs); |
| 88 } | 88 } |
| 89 } | 89 } |
| 90 | 90 |
| 91 // TODO Data is not cached in this way. | 91 // TODO Data is not cached in this way. |
| 92 | 92 |
| 146 /** | 146 /** |
| 147 * Create and return a new AreaCreationState with charting output. | 147 * Create and return a new AreaCreationState with charting output. |
| 148 */ | 148 */ |
| 149 @Override | 149 @Override |
| 150 public State getCurrentState(Object cc) { | 150 public State getCurrentState(Object cc) { |
| 151 final List<Facet> fs = facets.get(getCurrentStateId()); | 151 final List<Facet> fs = getFacets(getCurrentStateId()); |
| 152 | 152 |
| 153 AreaCreationState state = new AreaCreationState(); | 153 AreaCreationState state = new AreaCreationState(); |
| 154 | 154 |
| 155 StaticState.addDefaultChartOutput(state, "cross_section", fs); | 155 StaticState.addDefaultChartOutput(state, "cross_section", fs); |
| 156 | 156 |