WebSVN - OpenConcerto - Diff - Rev 83 and 180 - /trunk/OpenConcerto/src/org/openconcerto/openoffice/ODSingleXMLDocument.java

  */
  package org.openconcerto.openoffice;
 import static org.openconcerto.openoffice.ODPackage.RootElement.CONTENT;
+import static org.openconcerto.xml.Step.createAttributeStep;
+import static org.openconcerto.xml.Step.createAttributeStepFromQualifiedName;
+import static org.openconcerto.xml.Step.createElementStep;
+import static org.openconcerto.xml.Step.createElementStepFromQualifiedName;
 import org.openconcerto.openoffice.ODPackage.RootElement;
 import org.openconcerto.openoffice.style.data.DataStyle;
 import org.openconcerto.utils.Base64;
 import org.openconcerto.utils.CollectionUtils;
 import org.openconcerto.utils.FileUtils;
 import org.openconcerto.xml.Step;
 import org.openconcerto.xml.Step.Axis;
 import java.awt.Point;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.net.URI;
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import org.apache.commons.collections.Transformer;
 import org.jdom.Attribute;
 import org.jdom.Content;
 import org.jdom.DocType;
 import org.jdom.Document;
 import org.jdom.Element;
      * @param elem the elem to be trimmed.
      * @throws JDOMException if an error occurs.
      */
     protected final void detachDuplicate(Element elem) throws JDOMException {
         final String singularName = elem.getName().substring(0, elem.getName().length() - 1);
-        final List thisNames = getXPath("./text:" + singularName + "s/text:" + singularName + "/@text:name").selectNodes(getChild("body"));
+        final SimpleXMLPath<Attribute> simplePath = SimpleXMLPath.create(createElementStep(singularName + "s", "text"), createElementStep(singularName, "text"), createAttributeStep("name", "text"));
-        org.apache.commons.collections.CollectionUtils.transform(thisNames, new Transformer() {
-            public Object transform(Object obj) {
-                return ((Attribute) obj).getValue();
+        final List<String> thisNames = simplePath.selectValues(getChild("body"));
-            }
-        });
         final Iterator iter = elem.getChildren().iterator();
         while (iter.hasNext()) {
             final Element decl = (Element) iter.next();
             if (thisNames.contains(decl.getAttributeValue("name", getVersion().getTEXT()))) {
     private List<String> mergeUnique(ODXMLDocument doc, String topElem, String elemToMerge, ElementTransformer addTransf) throws JDOMException {
         return this.mergeUnique(doc, topElem, elemToMerge, "style:name", addTransf);
+    }
     private List<String> mergeUnique(ODXMLDocument doc, String topElem, String elemToMerge, String attrFQName, ElementTransformer addTransf) throws JDOMException {
+        final Element other = doc.getChild(topElem);
+        if (other == null)
+            return Collections.emptyList();
         List<String> added = new ArrayList<String>();
         Element thisParent = this.getChild(topElem, true);
-        XPath xp = this.getXPath("./" + elemToMerge + "/@" + attrFQName);
+        final SimpleXMLPath<Attribute> simplePath = SimpleXMLPath.create(createElementStepFromQualifiedName(elemToMerge), createAttributeStepFromQualifiedName(attrFQName));
         // les styles de ce document
-        List thisElemNames = xp.selectNodes(thisParent);
+        final List<String> thisElemNames = simplePath.selectValues(thisParent);
-        // on transforme la liste d'attributs en liste de String
-        org.apache.commons.collections.CollectionUtils.transform(thisElemNames, new Transformer() {
-            public Object transform(Object obj) {
-                return ((Attribute) obj).getValue();
-            }
-        });
         // pour chaque style de l'autre document
-        Iterator otherElemNames = xp.selectNodes(doc.getChild(topElem)).iterator();
-        while (otherElemNames.hasNext()) {
-            Attribute attr = (Attribute) otherElemNames.next();
+        for (final Attribute attr : simplePath.selectNodes(other)) {
             // on l'ajoute si non déjà dedans
             if (!thisElemNames.contains(attr.getValue())) {
                 thisParent.addContent(addTransf.transform((Element) attr.getParent().clone()));
                 added.add(attr.getValue());
+            }
                 final Element hrefParent = hrefAttr.getParent();
                 if (!BINARY_DATA_PARENTS.contains(hrefParent.getQualifiedName()))
                     throw new IllegalStateException("Cannot convert to binary data element : " + hrefParent);
                 final Element binaryData = new Element("binary-data", getPackage().getVersion().getOFFICE());
-                binaryData.setText(Base64.encodeBytes(getPackage().getBinaryFile(href)));
+                binaryData.setText(Base64.encodeBytesBreakLines(getPackage().getBinaryFile(href)));
                 hrefParent.addContent(binaryData);
                 // If this element is present, an xlink:href attribute in its parent element
                 // shall be ignored. But LO doesn't respect that
                 hrefAttr.detach();
+            }
+        }
         final File f = this.getPackage().getContentType().addExt(fNoExt, true);
+        try (final FileOutputStream outs = new FileOutputStream(f)) {
+            // Use OutputStream parameter so that the encoding used for the Writer matches the
+            // XML declaration.
-        FileUtils.write(ODPackage.createOutputter().outputString(doc), f);
+            ODPackage.createOutputter().output(doc, outs);
+        }
         return f;
+    }
     private Element getPageBreak() {
         if (this.pageBreak == null) {

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/openoffice/ODSingleXMLDocument.java - Rev 83 → 180