Changeset 838 for trunk/docx4j/src/main/java/org/docx4j/diff/Differencer.java

Timestamp:

06/21/09 19:31:45 (3 years ago)

Author:

jharrop

Message:

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

File:

• trunk/docx4j/src/main/java/org/docx4j/diff/Differencer.java (modified) (3 diffs)

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) {