Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/ExternalWMSArtifact.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 |
|---|---|
| 57 | 57 |
| 58 WMSBackgroundState s = (WMSBackgroundState) getCurrentState(context); | 58 WMSBackgroundState s = (WMSBackgroundState) getCurrentState(context); |
| 59 s.computeInit(this, hash(), context, callMeta, fs); | 59 s.computeInit(this, hash(), context, callMeta, fs); |
| 60 | 60 |
| 61 if (!fs.isEmpty()) { | 61 if (!fs.isEmpty()) { |
| 62 facets.put(getCurrentStateId(), fs); | 62 addFacets(getCurrentStateId(), fs); |
| 63 } | 63 } |
| 64 } | 64 } |
| 65 | 65 |
| 66 | 66 |
| 67 @Override | 67 @Override |
| 76 | 76 |
| 77 @Override | 77 @Override |
| 78 public State getCurrentState(Object cc) { | 78 public State getCurrentState(Object cc) { |
| 79 State s = new ExternalWMSState(this); | 79 State s = new ExternalWMSState(this); |
| 80 | 80 |
| 81 List<Facet> fs = facets.get(getCurrentStateId()); | 81 List<Facet> fs = getFacets(getCurrentStateId()); |
| 82 | 82 |
| 83 DefaultOutput o = new DefaultOutput( | 83 DefaultOutput o = new DefaultOutput( |
| 84 "floodmap", | 84 "floodmap", |
| 85 "floodmap", | 85 "floodmap", |
| 86 "image/png", | 86 "image/png", |