diff artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContextFactory.java @ 7074:a2abd87c0d3b generator-refactoring

Trim "names" and "class" attribute of out generators before using.
author Sascha L. Teichmann <teichmann@intevation.de>
date Fri, 20 Sep 2013 15:44:39 +0200
parents beb9e94f04d3
children 24f153ad1f40
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContextFactory.java	Fri Sep 20 15:42:21 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContextFactory.java	Fri Sep 20 15:44:39 2013 +0200
@@ -332,10 +332,10 @@
         for (int i = 0; i < num; i++) {
             Element item = (Element)outGenerators.item(i);
 
-            String name  = item.getAttribute("names");
-            String clazz = item.getAttribute("class");
+            String names = item.getAttribute("names").trim();
+            String clazz = item.getAttribute("class").trim();
 
-            if (name.isEmpty() || clazz.isEmpty()) {
+            if (names.isEmpty() || clazz.isEmpty()) {
                 continue;
             }
 
@@ -352,7 +352,7 @@
             Pair<Class<OutGenerator>, Element> pair =
                 new Pair<Class<OutGenerator>, Element>(generatorClass, item);
 
-            for (String key: name.split("[\\s,]")) {
+            for (String key: names.split("[\\s,]")) {
                 if (!(key = key.trim()).isEmpty()) {
                     generators.put(key, pair);
                     idx++;

http://dive4elements.wald.intevation.org