Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java @ 1780:b503d92dd709
Cosmetics, docs.
flys-artifacts/trunk@3102 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Fri, 28 Oct 2011 09:22:34 +0000 |
parents | f643ea084213 |
children | 661dfad9910a |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java Fri Oct 28 09:08:48 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java Fri Oct 28 09:22:34 2011 +0000 @@ -26,7 +26,7 @@ /** * Create attribute- element of describe document of an ArtifactCollection. * The attribute-element contains the merged output of all outputmodes and - * facets that are part of the collection. + * facets that are part of the collection. */ public class AttributeWriter { @@ -45,7 +45,7 @@ * Attributes not present in newAttr will not be included in the document. * @param db Database to fetch artifacts. * @param oldAttr "Old" (possibly user-changed) outputs. - * @param newAttr "New" (eventually re-read in its original, unchagnged + * @param newAttr "New" (eventually re-read in its original, unchanged * form) outputs. */ public AttributeWriter( @@ -62,10 +62,12 @@ /** * Create document by merging outputs given in * constructor. + * * The "new" set rules about existance of attributes, so anything not * present in it will not be included in the resulting document. * The "old" set rules about the content of attributes (as user changes * are recorded here and not in the new set). + * * @return document with merged outputs as described. */ protected Document write() { @@ -180,7 +182,7 @@ if (newMF.getPosition() == oldMF.getPosition()) { conflicts = true; logger.debug("Positional conflict while merging " + - "facets, pushing newest facet 1 up ("+newMF.getPosition()+")"); + "facets, pushing newest facet 1 up (" + newMF.getPosition() + ")"); newMF.setPosition(newMF.getPosition() + 1); break; }