dive4elements/river: artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContextFactory.java comparison

Made lookup for generators a class of its own. First step to use it as a compat filter for facets, too.

author	Sascha L. Teichmann <teichmann@intevation.de>
date	Wed, 02 Oct 2013 18:41:12 +0200
parents	24f153ad1f40
children	744df5a03337

comparison

equal deleted inserted replaced

-:fa66845c1977
+:8ab618dda850
 import org.dive4elements.river.artifacts.states.StateFactory;
 import org.dive4elements.river.artifacts.transitions.TransitionFactory;
+import org.dive4elements.river.exports.GeneratorLookup;
 import org.dive4elements.river.exports.OutGenerator;
 import org.dive4elements.river.themes.Theme;
 import org.dive4elements.river.themes.ThemeFactory;
 import org.dive4elements.river.themes.ThemeGroup;
 import org.dive4elements.river.themes.ThemeMapping;
-import org.dive4elements.river.utils.Pair;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 return;
 }
 logger.info("Found " + num + " configured output generators.");
-Map<String, Pair<Class<OutGenerator>, Object>> generators =
+GeneratorLookup generators = new GeneratorLookup();
-new HashMap<String, Pair<Class<OutGenerator>, Object>>();
 int idx = 0;
 for (int i = 0; i < num; i++) {
 Element item = (Element)outGenerators.item(i);
 catch (IllegalAccessException iae) {
 logger.error(iae);
 }
 }
-Pair<Class<OutGenerator>, Object> pair =
-new Pair<Class<OutGenerator>, Object>(generatorClass, cfg);
 for (String key: names.split("[\\s,]")) {
 if (!(key = key.trim()).isEmpty()) {
-generators.put(key, pair);
+generators.putGenerator(key, generatorClass, cfg);
 idx++;
 }
 }
 }

Mercurial > dive4elements > river