Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java @ 1709:f643ea084213
Allow simple codepaths to have Facets initially being 'inactive' (wrt rendering).
flys-artifacts/trunk@2969 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Fri, 14 Oct 2011 08:52:44 +0000 |
parents | bdb05dc9b763 |
children | a70e0cbc5e02 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java Thu Oct 13 12:42:31 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java Fri Oct 14 08:52:44 2011 +0000 @@ -46,7 +46,6 @@ /** The logger used in this class. */ private static Logger log = Logger.getLogger(FLYSArtifactCollection.class); - /** Constant XPath that points to the outputmodes of an artifact. */ public static final String XPATH_ARTIFACT_OUTPUTMODES = "/art:result/art:outputmodes"; @@ -128,6 +127,7 @@ /** * Merge the current art:outputs nodes with the the outputs provided by the * artifacts in the Collection. + * @param uuids Artifact uuids. */ protected Node mergeAttributes( ArtifactDatabase db, @@ -302,13 +302,13 @@ /** * Return merged output document. - * @param items List of artifact uuids. + * @param uuids List of artifact uuids. */ protected Document buildOutAttributes( ArtifactDatabase db, CallContext context, Document oldAttr, - String[] items) + String[] uuids) { Document doc = XMLUtils.newDocument(); @@ -320,8 +320,8 @@ AttributeParser aParser = new AttributeParser(); OutputParser oParser = new OutputParser(db, context); - if (items != null) { - for (String uuid: items) { + if (uuids != null) { + for (String uuid: uuids) { try { oParser.parse(uuid); } @@ -333,7 +333,10 @@ aParser.parse(oldAttr); - return new AttributeWriter(aParser.getOuts(), oParser.getOuts()).write(); + return new AttributeWriter( + db, + aParser.getOuts(), + oParser.getOuts()).write(); }