Changeset 1436

Timestamp:

02/23/11 12:29:38 (15 months ago)

Author:

jharrop

Message:

generics; flesh out example.

Location:

trunk/docx4j/src/main/java/org/docx4j

Files:

• openpackaging/parts/CustomXmlDataStoragePropertiesPart.java (modified) (1 diff)
• samples/CreateDocxWithCustomXml.java (modified) (4 diffs)

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

@@ -28 +28 @@
 
 
-public final class CustomXmlDataStoragePropertiesPart extends JaxbXmlPart {
+public final class CustomXmlDataStoragePropertiesPart extends JaxbXmlPart<DatastoreItem> {
         
         public CustomXmlDataStoragePropertiesPart(PartName partName) throws InvalidFormatException {

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

@@ -23 +23 @@
 
 import java.io.File;
+import java.util.UUID;
 
+import org.docx4j.customXmlProperties.DatastoreItem;
+import org.docx4j.jaxb.Context;
 import org.docx4j.model.datastorage.CustomXmlDataStorage;
 import org.docx4j.model.datastorage.CustomXmlDataStorageImpl;
 import org.docx4j.openpackaging.Base;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.docx4j.openpackaging.parts.CustomXmlDataStoragePart;
+import org.docx4j.openpackaging.parts.CustomXmlDataStoragePropertiesPart;
+import org.docx4j.openpackaging.parts.Part;
 import org.docx4j.openpackaging.parts.PartName;
 import org.docx4j.openpackaging.parts.Parts;
 import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
+import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.io.SaveToZipFile;
@@ -53 +60 @@
                 
                                 
-                injectCustomXmlDataStoragePart(wordMLPackage.getMainDocumentPart(),
+                CustomXmlDataStoragePart customXmlDataStoragePart = injectCustomXmlDataStoragePart(wordMLPackage.getMainDocumentPart(),
                                 wordMLPackage.getParts() );
+                
+                addProperties(customXmlDataStoragePart);
                 
                 // Now save it 
@@ -64 +73 @@
         
         
-        public static void injectCustomXmlDataStoragePart(Base base, Parts parts) {
+        public static CustomXmlDataStoragePart injectCustomXmlDataStoragePart(Part parent, Parts parts) throws Exception {
                 
-                try {
                         org.docx4j.openpackaging.parts.CustomXmlDataStoragePart customXmlDataStoragePart = 
                                 new org.docx4j.openpackaging.parts.CustomXmlDataStoragePart(parts);
@@ -78 +86 @@
 //                      customXmlDataStoragePart.setDocument( createCustomXmlDocument() );
                                         
-                        base.addTargetPart(customXmlDataStoragePart);
-                        
-                } catch (Exception e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                }
+                        parent.addTargetPart(customXmlDataStoragePart);
+
+                        return customXmlDataStoragePart;
+
+        }
+        
+        public static void addProperties(CustomXmlDataStoragePart customXmlDataStoragePart) throws InvalidFormatException {
+
+                CustomXmlDataStoragePropertiesPart part = new CustomXmlDataStoragePropertiesPart();
                 
+                org.docx4j.customXmlProperties.ObjectFactory of = new org.docx4j.customXmlProperties.ObjectFactory();
                 
+                DatastoreItem dsi = of.createDatastoreItem();
+                String newItemId = "{" + UUID.randomUUID().toString() + "}";                                    
+                dsi.setItemID(newItemId);
+                
+                part.setJaxbElement(dsi );
+                
+                customXmlDataStoragePart.addTargetPart(part);
         }