Changeset 838

Timestamp:

06/22/09 05:31:45 (3 years ago)

Author:

jharrop

Message:

Use "newer", "older" for diff terminology, not "left", "right"

Location:

trunk/docx4j/src

Files:

• diffx/com/topologi/diffx/Docx4jDriver.java (modified) (1 diff)
• diffx/com/topologi/diffx/format/SmartXMLFormatter.java (modified) (1 diff)
• main/java/org/docx4j/diff/Differencer.java (modified) (3 diffs)
• main/java/org/docx4j/samples/CompareDocuments.java (modified) (3 diffs)

trunk/docx4j/src/diffx/com/topologi/diffx/Docx4jDriver.java

@@ -140 +140 @@
         
         
-        public static void diff(Node xml2, Node xml1, Writer out) // swapped, 
+        public static void diff(Node xml1, Node xml2, Writer out) // swapped, 
                         throws DiffXException, IOException {
 

trunk/docx4j/src/diffx/com/topologi/diffx/format/SmartXMLFormatter.java

@@ -193 +193 @@
     this.xml.setPrefixMapping(Constants.DELETE_NS, "del");
     this.xml.setPrefixMapping("http://schemas.openxmlformats.org/wordprocessingml/2006/main", "w");
+    this.xml.setPrefixMapping("http://schemas.openxmlformats.org/drawingml/2006/main", "a");
+    this.xml.setPrefixMapping("http://schemas.openxmlformats.org/drawingml/2006/picture", "pic");
+    this.xml.setPrefixMapping("http://schemas.openxmlformats.org/officeDocument/2006/relationships", "r");    
+    this.xml.setPrefixMapping("urn:schemas-microsoft-com:vml", "v");
+    this.xml.setPrefixMapping("urn:schemas-microsoft-com:office:word", "w10"); 
+    this.xml.setPrefixMapping("http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing", "wp");    
+    
     
   }

trunk/docx4j/src/main/java/org/docx4j/diff/Differencer.java

@@ -263 +263 @@
         }
 
-        public void diff(org.docx4j.wml.SdtContentBlock cbLeft, 
-                        org.docx4j.wml.SdtContentBlock cbRight, 
+        public void diff(org.docx4j.wml.SdtContentBlock cbNewer, 
+                        org.docx4j.wml.SdtContentBlock cbOlder, 
                         javax.xml.transform.Result result,
                         String author, java.util.Calendar date,
-                        RelationshipsPart docPartRelsLeft, RelationshipsPart docPartRelsRight) {
-                
-                this.diffWorker(org.docx4j.XmlUtils.marshaltoW3CDomDocument(cbLeft).getDocumentElement(), 
-                                org.docx4j.XmlUtils.marshaltoW3CDomDocument(cbRight).getDocumentElement(), 
-                                result, author, date, docPartRelsLeft, docPartRelsRight);
-        }
-
-        public void diff(org.docx4j.wml.Body older, 
-                        org.docx4j.wml.Body newer, 
+                        RelationshipsPart docPartRelsNewer, RelationshipsPart docPartRelsOlder) {
+                
+                this.diffWorker(org.docx4j.XmlUtils.marshaltoW3CDomDocument(cbNewer).getDocumentElement(), 
+                                org.docx4j.XmlUtils.marshaltoW3CDomDocument(cbOlder).getDocumentElement(), 
+                                result, author, date, docPartRelsNewer, docPartRelsOlder);
+        }
+
+        public void diff(org.docx4j.wml.Body newer, 
+                        org.docx4j.wml.Body older, 
                         javax.xml.transform.Result result,
                         String author, java.util.Calendar date,
-                        RelationshipsPart docPartRelsLeft, RelationshipsPart docPartRelsRight) {
-                
-                this.diffWorker(org.docx4j.XmlUtils.marshaltoW3CDomDocument(older).getDocumentElement(), 
+                        RelationshipsPart docPartRelsNewer, RelationshipsPart docPartRelsOlder) {
+                
+                this.diffWorker(
                                 org.docx4j.XmlUtils.marshaltoW3CDomDocument(newer).getDocumentElement(),
-                                result, author, date, docPartRelsLeft, docPartRelsRight);
+                                org.docx4j.XmlUtils.marshaltoW3CDomDocument(older).getDocumentElement(),                                
+                                result, author, date, docPartRelsNewer, docPartRelsOlder);
         }
         
@@ -292 +293 @@
          * TODO: consider/test w:table! 
          */
-        private void diffWorker(Node left, 
-                        Node right, 
+        private void diffWorker(Node newer, 
+                        Node older, 
                         javax.xml.transform.Result result,
                         String author, java.util.Calendar date,
-                        RelationshipsPart docPartRelsLeft, RelationshipsPart docPartRelsRight) {
+                        RelationshipsPart docPartRelsNewer, RelationshipsPart docPartRelsOlder) {
 
                 Writer diffxResult = new StringWriter();
 
                 try {
-                        Docx4jDriver.diff(left,
-                                           right,
+                        Docx4jDriver.diff(newer,
+                                           older,
                                            diffxResult);
                                 // The signature which takes Reader objects appears to be broken
@@ -336 +337 @@
                                                         
                         StreamSource src = new StreamSource(new StringReader(simplified));
-                        transformDiffxOutputToWml(result, author, date, docPartRelsLeft,
-                                        docPartRelsRight, src);
+                        transformDiffxOutputToWml(result, author, date, docPartRelsNewer,
+                                        docPartRelsOlder, src);
                         
                 } catch (Exception exc) {

trunk/docx4j/src/main/java/org/docx4j/samples/CompareDocuments.java

@@ -60 +60 @@
         public static void main(String[] args) throws Exception {
 
+                String newerfilepath = "/home/dev/workspace/docx4j/sample-docs/differencing_newer.docx";
                 String olderfilepath = "/home/dev/workspace/docx4j/sample-docs/differencing_older.docx";
-                String newerfilepath = "/home/dev/workspace/docx4j/sample-docs/differencing_newer.docx";
+                                                
+                // 1. Load the Packages
+                WordprocessingMLPackage newerPackage = WordprocessingMLPackage.load(new java.io.File(newerfilepath));
+                WordprocessingMLPackage olderPackage = WordprocessingMLPackage.load(new java.io.File(olderfilepath));
                 
-                                
-                // 1. Load the Packages
-                WordprocessingMLPackage olderPackage = WordprocessingMLPackage.load(new java.io.File(olderfilepath));
-                WordprocessingMLPackage newerPackage = WordprocessingMLPackage.load(new java.io.File(newerfilepath));
-                
+                Body newerBody = ((Document)newerPackage.getMainDocumentPart().getJaxbElement()).getBody();
                 Body olderBody = ((Document)olderPackage.getMainDocumentPart().getJaxbElement()).getBody();
-                Body newerBody = ((Document)newerPackage.getMainDocumentPart().getJaxbElement()).getBody();
                 
                 // 2. Do the differencing
@@ -79 +78 @@
                 Differencer pd = new Differencer();
                 pd.setRelsDiffIdentifier("blagh"); // not necessary in this case 
-                pd.diff(olderBody, newerBody, result, "someone", changeDate,
-                                olderPackage.getMainDocumentPart().getRelationshipsPart(), 
-                                newerPackage.getMainDocumentPart().getRelationshipsPart());
+                pd.diff(newerBody, olderBody, result, "someone", changeDate,
+                                newerPackage.getMainDocumentPart().getRelationshipsPart(),
+                                olderPackage.getMainDocumentPart().getRelationshipsPart() 
+                                );
                 
                 // 3. Get the result
@@ -90 +90 @@
                 
                 // 4. Display the result as a PDF
-                // To do this, we'll replace the body in the older document
-                ((Document)olderPackage.getMainDocumentPart().getJaxbElement()).setBody(newBody);
+                // To do this, we'll replace the body in the newer document
+                ((Document)newerPackage.getMainDocumentPart().getJaxbElement()).setBody(newBody);
 
-                RelationshipsPart rp = olderPackage.getMainDocumentPart().getRelationshipsPart(); 
+                RelationshipsPart rp = newerPackage.getMainDocumentPart().getRelationshipsPart(); 
                 handleRels(pd, rp);                                             
                 
                 
-                olderPackage.setFontMapper(new IdentityPlusMapper());           
+                newerPackage.setFontMapper(new IdentityPlusMapper());           
                 org.docx4j.convert.out.pdf.PdfConversion c 
 //                      = new org.docx4j.convert.out.pdf.viaHTML.Conversion(olderPackage);
-                        = new org.docx4j.convert.out.pdf.viaXSLFO.Conversion(olderPackage);
+                        = new org.docx4j.convert.out.pdf.viaXSLFO.Conversion(newerPackage);
 //                      = new org.docx4j.convert.out.pdf.viaIText.Conversion(olderPackage);             
                         c.view();