Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/context/FLYSContextFactory.java @ 1822:6ed439ff61bf
Changed theme-mapping mechanism to include further condition (on master-artifacts attributes), added point themes for longitudinal.ws for calculations at locations.
flys-artifacts/trunk@3151 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 03 Nov 2011 10:25:23 +0000 |
| parents | d2a17e990c70 |
| children | 8d9b573d1b9a |
comparison
equal
deleted
inserted
replaced
| 1821:e55f1a851923 | 1822:6ed439ff61bf |
|---|---|
| 358 node, "@to", XPathConstants.STRING); | 358 node, "@to", XPathConstants.STRING); |
| 359 | 359 |
| 360 String pattern = (String) XMLUtils.xpath( | 360 String pattern = (String) XMLUtils.xpath( |
| 361 node, "@pattern", XPathConstants.STRING); | 361 node, "@pattern", XPathConstants.STRING); |
| 362 | 362 |
| 363 String masterAttrPattern = (String) XMLUtils.xpath( | |
| 364 node, "@masterAttr", XPathConstants.STRING); | |
| 365 | |
| 363 if (from != null && to != null) { | 366 if (from != null && to != null) { |
| 364 List<ThemeMapping> tm = mapping.get(from); | 367 List<ThemeMapping> tm = mapping.get(from); |
| 365 | 368 |
| 366 if (tm == null) { | 369 if (tm == null) { |
| 367 tm = new ArrayList<ThemeMapping>(); | 370 tm = new ArrayList<ThemeMapping>(); |
| 368 mapping.put(from, tm); | 371 mapping.put(from, tm); |
| 369 } | 372 } |
| 370 | 373 |
| 371 tm.add(new ThemeMapping(from, to, pattern)); | 374 tm.add(new ThemeMapping( |
| 375 from, to, pattern, masterAttrPattern)); | |
| 372 } | 376 } |
| 373 } | 377 } |
| 374 | 378 |
| 375 logger.debug("Found " + mapping.size() + " theme mappings."); | 379 logger.debug("Found " + mapping.size() + " theme mappings."); |
| 376 | 380 |