Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java @ 1765:5d8b3880a553
Do not store association of states to facets, let artifacts keep facets in a pure list.
flys-artifacts/trunk@3083 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 26 Oct 2011 12:23:47 +0000 |
| parents | 19d0eb41e923 |
| children | c62ff9e72cea |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java Wed Oct 26 12:03:59 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java Wed Oct 26 12:23:47 2011 +0000 @@ -63,7 +63,7 @@ if (!fs.isEmpty()) { logger.debug("Facets to add in AnnotationsArtifact.initialize ."); - facets.put(getCurrentStateId(), fs); + facets.addAll(fs); } else { logger.debug("No facets to add in AnnotationsArtifact.initialize ."); @@ -173,15 +173,14 @@ continue; } - List<Facet> fs = facets.get(stateId); - if (fs == null || fs.size() == 0) { + if (facets == null || facets.size() == 0) { logger.debug("No facets found."); continue; } - logger.debug("Found " + fs.size() + " facets in previous states."); + logger.debug("Found " + facets.size() + " facets in previous states."); - List<Output> generated = generateOutputs(list, fs); + List<Output> generated = generateOutputs(list, facets); ProtocolUtils.appendOutputModes(doc, outs, generated); } @@ -194,11 +193,10 @@ logger.debug( "Append output modes for state: " + cur.getID()); - List<Facet> fs = facets.get(cur.getID()); - if (fs != null && fs.size() > 0) { - List<Output> generated = generateOutputs(list, fs); + if (facets != null && facets.size() > 0) { + List<Output> generated = generateOutputs(list, facets); - logger.debug("Found " + fs.size() + " current facets."); + logger.debug("Found " + facets.size() + " current facets."); if (!generated.isEmpty()) { ProtocolUtils.appendOutputModes( doc, outs, generated);