dive4elements/river: flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java comparison

comparison flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java @ 1976:0b466bd4ab24

Introduced a CollectionAttribute class that stores the information provided by the Collection's attribute document. flys-artifacts/trunk@3400 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Ingo Weinzierl <ingo.weinzierl@intevation.de>
date	Tue, 13 Dec 2011 11:55:47 +0000
parents	490ab097f58c
children	9c0acaa369ea

comparison

equal deleted inserted replaced

-:b30e1710df1d
+:0b466bd4ab24
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import de.intevation.artifacts.ArtifactDatabase;
 import de.intevation.artifacts.ArtifactDatabaseException;
-import de.intevation.artifacts.ArtifactNamespaceContext;
 import de.intevation.artifactdatabase.state.Facet;
 import de.intevation.artifactdatabase.state.Output;
-import de.intevation.artifacts.common.utils.XMLUtils;
-import de.intevation.artifacts.common.utils.XMLUtils.ElementCreator;
 import de.intevation.flys.artifacts.FLYSArtifact;
 import de.intevation.flys.artifacts.model.ManagedFacet;
 /**
 * "Compatibility matrix", mapws list of facet names to output names.
 * Any facet that is not found in the list for a specific output will
 * not be added to the resulting document.
 */
 protected Map<String, List<String>> compatibilities;
+/** The result of the <i>write()</i> operation.*/
+protected CollectionAttribute attribute;
 private static Logger logger = Logger.getLogger(AttributeWriter.class);
 /**
 * 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() {
+protected CollectionAttribute write() {
-Document doc = XMLUtils.newDocument();
+attribute = new CollectionAttribute();
-ElementCreator cr = new ElementCreator(
-doc,
-ArtifactNamespaceContext.NAMESPACE_URI,
-ArtifactNamespaceContext.NAMESPACE_PREFIX);
-Element attribute = cr.create("attribute");
-Element outs      = cr.create("outputs");
-attribute.appendChild(outs);
-doc.appendChild(attribute);
 for (String outName: newAttr.keySet()) {
 Output a = newAttr.get(outName);
-Output b = oldAttr.get(outName);
+attribute.addOutput(a.getName(), a);
-writeOutput(doc, outs, cr, a.getName(), newFacets, oldFacets);
-}
+writeOutput(a.getName(), newFacets, oldFacets);
+}
-return doc;
-}
+return attribute;
+}
-/**
-* @param doc  Document to add output nodes to
+/**
-* @param outs Node in Document to add output nodes to
-* @param cr   ElementCreator in use to modify doc/outs
 * @param outputName the "new" outputs name
 * @param newOutFacets Facets of the new outputs
 * @param oldOutFacets Facets of the old outputs (can be null)
 */
 protected void writeOutput(
-Document       doc,
+String      outputName,
-Node           outs,
+List<Facet> newOutFacets,
-ElementCreator cr,
+List<Facet> oldOutFacets
-String         outputName,
+) {
-List<Facet>    newOutFacets,
+List<String> compatFacets = this.compatibilities.get(outputName);
-List<Facet>    oldOutFacets)
-{
-Element output = cr.create("output");
-cr.addAttr(output, "name", outputName);
-List<String> compatibleFacets = this.compatibilities.get(outputName);
 try {
-if (writeFacets(
+writeFacets(outputName, newOutFacets, oldOutFacets, compatFacets);
-doc, cr, output, newOutFacets, oldOutFacets,
-compatibleFacets))
-{
-// Add output element only if it contains facets.
-outs.appendChild(output);
-}
 }
 catch (ArtifactDatabaseException ade) {
 logger.error(ade, ade);
 }
 }
 /**
-* @param doc    Document to add facet nodes to
-* @param cr     ElementCreator to use with output/doc
-* @param output Node in Document to add facet nodes to
 * @param newFacets the new facets
 * @param oldFacets the old facets
 * @param compatibleFacets List of facets to accept
 * @return true if any facets are written to the out.
 */
 protected boolean writeFacets(
-Document       doc,
+String         outputName,
-ElementCreator cr,
-Element        output,
 List<Facet>    newFacets,
 List<Facet>    oldFacets,
 List<String>   compatibleFacets)
 throws ArtifactDatabaseException
 {
 // With each genuinely new Facet, ask Artifact whether it comes to live
 // in/activate.
 for (ManagedFacet newMF: genuinelyNewFacets) {
 FLYSArtifact flys = (FLYSArtifact) db.getRawArtifact(newMF.getArtifact());
 newMF.setActive(flys.getInitialFacetActivity(
-output.getAttribute("name"),
+outputName,
 newMF.getName(),
 newMF.getIndex()));
 }
 // For each genuinely new Facet check positional conflicts.
 for (ManagedFacet newMF: genuinelyNewFacets) {
 boolean conflicts = true;
 // Loop until all conflicts resolved.
 while (conflicts) {
 }
 }
 // Now add all facets.
 for (ManagedFacet oldMF: currentFacets) {
-Node node = oldMF.toXML(doc);
+attribute.addFacet(outputName, oldMF);
-if (node != null) {
-output.appendChild(node);
-}
 }
 return currentFacets.size() > 0;
 }
 * @param facet     the new facet.
 * @param oldFacets the old facets, new facet is compared against each of
 *                  these.
 * @return facet if genuinely new, matching old facet otherwise.
 */
-protected ManagedFacet pickFacet(ManagedFacet facet,
+protected ManagedFacet pickFacet(ManagedFacet facet, List<Facet> oldFacets)
-List<Facet> oldFacets)
 {
 if (oldFacets == null) {
 logger.debug("No old facets to compare a new to found.");
 return facet;
 }
 String hash = facet.getName() + facet.getIndex() + facet.getArtifact();
 // Compare "new" facet with all old facets.
 // Take oldFacet if that facet was already present (otherwise
 // information is lost, the new one otherwise.

Mercurial > dive4elements > river

comparison flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java @ 1976:0b466bd4ab24