Changeset 1400

Timestamp:

01/31/11 23:42:28 (16 months ago)

Author:

jharrop

Message:

AlteredParts? WIP, inc basic unit testing (to be fleshed out next).

Location:

trunk/docx4j/src

Files:

• main/java/org/docx4j/openpackaging/parts/CustomXmlDataStoragePart.java (modified) (2 diffs)
• main/java/org/docx4j/openpackaging/parts/JaxbXmlPart.java (modified) (2 diffs)
• main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPart.java (modified) (1 diff)
• main/java/org/docx4j/openpackaging/parts/relationships/AlteredParts.java (modified) (1 diff)
• main/java/org/docx4j/openpackaging/parts/relationships/RelationshipsPart.java (modified) (3 diffs)
• test/java/org/docx4j/openpackaging/parts (added)
• test/java/org/docx4j/openpackaging/parts/relationships (added)
• test/java/org/docx4j/openpackaging/parts/relationships/AlteredPartsTest.java (added)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/CustomXmlDataStoragePart.java

@@ -65 +65 @@
 import org.docx4j.wml.Tc;
 import org.opendope.conditions.Condition;
+import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
@@ -174 +175 @@
 
     public boolean isContentEqual(Part other) throws Docx4JException {
+
+        if (!(other instanceof CustomXmlDataStoragePart))
+                return false;
         
-        throw new Docx4JException("Not implemented");
+        Document doc1 = data.getDocument();
+        Document doc2 = ((CustomXmlDataStoragePart)other).data.getDocument();
+        
+        return doc1.isEqualNode(doc2);
+
     }
         

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/JaxbXmlPart.java

@@ -22 +22 @@
 
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
 
 import javax.xml.bind.JAXBContext;
@@ -37 +34 @@
 import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
-import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPart;
 
 /** OPC Parts are either XML, or binary (or text) documents.

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BinaryPart.java

@@ -33 +33 @@
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.parts.ExternalTarget;
-import org.docx4j.openpackaging.parts.JaxbXmlPart;
 import org.docx4j.openpackaging.parts.Part;
 import org.docx4j.openpackaging.parts.PartName;

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/AlteredParts.java

@@ -66 +66 @@
                 
                 // is this rels part itself altered?
-                if (uniques.size()>0 || missings.size()>0) {
-                        alteredParts.add(thisRP);
+//              if (uniques.size()>0 || missings.size()>0) {
+//                      alteredParts.add(thisRP);
+//              }
+                if (!thisRP.isContentEqual(otherRP)) {
+                        alteredParts.add(thisRP);                       
                 }
                 

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/RelationshipsPart.java

@@ -60 +60 @@
 
 import org.apache.log4j.Logger;
-import org.docx4j.XmlUtils;
 import org.docx4j.jaxb.Context;
 import org.docx4j.jaxb.NamespacePrefixMapperUtils;
@@ -75 +74 @@
 import org.docx4j.openpackaging.parts.Part;
 import org.docx4j.openpackaging.parts.PartName;
-import org.docx4j.openpackaging.parts.XmlPart;
-import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPart;
 import org.docx4j.relationships.Relationship;
 import org.docx4j.relationships.Relationships;
@@ -943 +940 @@
                 return null;
         }
-    
-    public boolean isContentEqual(Part other) throws Docx4JException {
-        
-        throw new Docx4JException("Not implemented");
-    }
-        
         
 }