Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java @ 4628:03ab907b6f5d
Merged.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Mon, 03 Dec 2012 17:27:08 +0100 |
| parents | d440057b36f7 |
| children |
comparison
equal
deleted
inserted
replaced
| 4627:d5821c6f0ab0 | 4628:03ab907b6f5d |
|---|---|
| 61 super.setup(identifier, factory, context, callMeta, data); | 61 super.setup(identifier, factory, context, callMeta, data); |
| 62 // For w_differences, also allow q-facets. | 62 // For w_differences, also allow q-facets. |
| 63 if(filterFacets != null) { | 63 if(filterFacets != null) { |
| 64 List<Facet> list = new ArrayList<Facet>(); | 64 List<Facet> list = new ArrayList<Facet>(); |
| 65 List<Facet> wlist = filterFacets.get(ChartType.LS); | 65 List<Facet> wlist = filterFacets.get(ChartType.LS); |
| 66 for (Facet f: wlist) { | 66 if (wlist == null) { |
| 67 if (!f.getName().equals(LONGITUDINAL_Q)) { | 67 logger.warn("No matching filterfacets found"); |
| 68 DefaultFacet df = new DefaultFacet(f.getIndex(), | 68 dumpFilterFacets(); |
| 69 "longitudinal_section.q", ""); | 69 } else { |
| 70 list.add(df); | 70 for (Facet f: wlist) { |
| 71 if (!f.getName().equals(LONGITUDINAL_Q)) { | |
| 72 DefaultFacet df = new DefaultFacet(f.getIndex(), | |
| 73 "longitudinal_section.q", ""); | |
| 74 list.add(df); | |
| 75 } | |
| 71 } | 76 } |
| 77 | |
| 78 list.addAll(wlist); | |
| 79 | |
| 80 filterFacets.put("w_differences", list); | |
| 72 } | 81 } |
| 73 | |
| 74 list.addAll(wlist); | |
| 75 | |
| 76 filterFacets.put("w_differences", list); | |
| 77 } | 82 } |
| 78 } | 83 } |
| 79 | 84 |
| 80 | 85 |
| 81 /** | 86 /** |