--- a/flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java	Mon Jul 18 17:09:00 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java	Tue Jul 19 10:37:57 2011 +0000
@@ -55,7 +55,7 @@
 
             Output a = newAttr.get(outName);
             Output b = oldAttr.get(outName);
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
+
             writeOutput(doc, outs, cr, a, b);
         }
 
@@ -99,7 +99,11 @@
             ManagedFacet fA = (ManagedFacet) a.get(i);
 
             if (!mergeFacets(doc, cr, output, fA, b)) {
-                writeFacet(doc, cr, output, fA);
+                Node n = fA.toXML(doc);
+
+                if (n != null) {
+                    output.appendChild(n);
+                }
             }
         }
     }
@@ -112,7 +116,7 @@
         ManagedFacet   a,
         List<Facet>    list)
     {
-        String name = a.getName() + a.getIndex();
+        String nameA = a.getName() + a.getIndex();
 
         if (list == null) {
             logger.debug("No old facets found.");
@@ -120,31 +124,20 @@
         }
 
         for (Facet facet: list) {
-            if (name.equals(facet.getName() + facet.getIndex())) {
-                writeFacet(doc, cr, output, (ManagedFacet) facet);
+            String nameB = facet.getName() + facet.getIndex();
+
+            if (nameA.equals(nameB)) {
+                Node n = facet.toXML(doc);
+
+                if (n != null) {
+                    output.appendChild(n);
+                }
+
                 return true;
             }
         }
 
         return false;
     }
-
-
-    protected void writeFacet(
-        Document       doc,
-        ElementCreator cr,
-        Node           output,
-        ManagedFacet   f)
-    {
-        Element theme = cr.create("theme");
-        cr.addAttr(theme, "artifact", f.getArtifact(), true);
-        cr.addAttr(theme, "facet", f.getName(), true);
-        cr.addAttr(theme, "pos", Integer.toString(f.getPosition()), true);
-        cr.addAttr(theme, "active", Integer.toString(f.getActive()), true);
-        cr.addAttr(theme, "index", Integer.toString(f.getIndex()), true);
-        cr.addAttr(theme, "description", f.getDescription(), true);
-
-        output.appendChild(theme);
-    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :