Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/CrossSectionArtifact.java @ 4504:d7e1aee9d51e
Merged.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Wed, 14 Nov 2012 12:37:57 +0100 |
| parents | a2735a4bf75e |
| children | c7133c1f8ede |
comparison
equal
deleted
inserted
replaced
| 4503:f91260ccef03 | 4504:d7e1aee9d51e |
|---|---|
| 139 addStringData(DATA_IS_MASTER, newString); | 139 addStringData(DATA_IS_MASTER, newString); |
| 140 | 140 |
| 141 StaticState state = (StaticState) getCurrentState(context); | 141 StaticState state = (StaticState) getCurrentState(context); |
| 142 | 142 |
| 143 if (!fs.isEmpty()) { | 143 if (!fs.isEmpty()) { |
| 144 facets.put(getCurrentStateId(), fs); | 144 addFacets(getCurrentStateId(), fs); |
| 145 } | 145 } |
| 146 } | 146 } |
| 147 | 147 |
| 148 | 148 |
| 149 /** Copy km where master-artifact "starts". */ | 149 /** Copy km where master-artifact "starts". */ |
| 178 /** | 178 /** |
| 179 * Create and return a new StaticState with charting output. | 179 * Create and return a new StaticState with charting output. |
| 180 */ | 180 */ |
| 181 @Override | 181 @Override |
| 182 public State getCurrentState(Object cc) { | 182 public State getCurrentState(Object cc) { |
| 183 final List<Facet> fs = facets.get(getCurrentStateId()); | 183 final List<Facet> fs = getFacets(getCurrentStateId()); |
| 184 | 184 |
| 185 StaticState state = new StaticState(STATIC_STATE_NAME) { | 185 StaticState state = new StaticState(STATIC_STATE_NAME) { |
| 186 @Override | 186 @Override |
| 187 public Object staticCompute(List<Facet> facets) { | 187 public Object staticCompute(List<Facet> facets) { |
| 188 if (facets != null) { | 188 if (facets != null) { |