Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContextFactory.java @ 7226:8ab618dda850
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 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContextFactory.java Wed Oct 02 14:14:09 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContextFactory.java Wed Oct 02 18:41:12 2013 +0200 @@ -39,6 +39,7 @@ 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; @@ -46,8 +47,6 @@ 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; @@ -335,8 +334,7 @@ logger.info("Found " + num + " configured output generators."); - Map<String, Pair<Class<OutGenerator>, Object>> generators = - new HashMap<String, Pair<Class<OutGenerator>, Object>>(); + GeneratorLookup generators = new GeneratorLookup(); int idx = 0; @@ -381,12 +379,9 @@ } } - 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++; } }