Changeset 1498 for trunk/docx4j/src/main/java/org/docx4j/openpackaging

Timestamp:

05/18/11 11:18:11 (12 months ago)

Author:

jharrop

Message:

Proof of concept adding SmartArt? from a glox to a docx

Location:

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

Files:

• contenttype/ContentTypeManager.java (modified) (1 diff)
• contenttype/ContentTypes.java (modified) (1 diff)
• parts/DrawingML/DiagramColorsPart.java (modified) (2 diffs)
• parts/DrawingML/DiagramDrawingPart.java (added)
• parts/DrawingML/DiagramStylePart.java (modified) (2 diffs)
• parts/DrawingML/JaxbDmlPart.java (modified) (1 diff)
• parts/DrawingML/colorsDef-accent1_2.xml (added)
• parts/DrawingML/quickStyle-3d8.xml (added)
• parts/DrawingML/quickStyle-simple1.xml (added)
• parts/relationships/Namespaces.java (modified) (1 diff)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypeManager.java

@@ -391 +391 @@
                 } else if (contentType.equals(ContentTypes.VML_DRAWING)) {
                         return new VMLPart(new PartName(partName));
+                } else if (contentType.equals(ContentTypes.DRAWINGML_DIAGRAM_DRAWING)) {
+                        return new org.docx4j.openpackaging.parts.DrawingML.DiagramDrawingPart(new PartName(partName));
                 } else if (contentType.startsWith("application/vnd.openxmlformats-officedocument.drawing")) {
                         return JaxbDmlPart.newPartForContentType(contentType, partName);

trunk/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypes.java

@@ -166 +166 @@
         public final static String DRAWINGML_DIAGRAM_LAYOUT_HEADER =
                 "application/vnd.openxmlformats-officedocument.drawingml.diagramLayoutHeader+xml";
+
+        // "/word/diagrams/drawing1.xml"
+        public final static String DRAWINGML_DIAGRAM_DRAWING =
+                "application/vnd.ms-office.drawingml.diagramDrawing+xml";
         
         // embedded presentation

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramColorsPart.java

@@ -22 +22 @@
 
 
+import java.io.IOException;
+
+import javax.xml.bind.JAXBException;
+
 import org.apache.log4j.Logger;
 import org.docx4j.dml.diagram.CTColorTransform;
 import org.docx4j.dml.diagram.CTDataModel;
+import org.docx4j.dml.diagram.ObjectFactory;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.parts.JaxbXmlPart;
@@ -56 +61 @@
                 setRelationshipType(Namespaces.DRAWINGML_DIAGRAM_COLORS);
         }
+
+    public Object unmarshal(String filename) throws JAXBException {
+        
+                java.io.InputStream is = null;
+                try {
+                        is = org.docx4j.utils.ResourceUtils.getResource(
+                                        "org/docx4j/openpackaging/parts/DrawingML/" + filename);
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }               
+        
+        return unmarshal( is );    // side-effect is to set jaxbElement         
+    }
+    
+    public void CreateMinimalContent(String uniqueId) {
+
+                ObjectFactory factory = new ObjectFactory(); 
+                
+                CTColorTransform colorsDef = factory.createCTColorTransform();
+                colorsDef.setUniqueId(uniqueId);
+                
+                this.setJaxbElement(colorsDef);         
+    }
                 
 }

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramStylePart.java

@@ -22 +22 @@
 
 
+import java.io.IOException;
+
+import javax.xml.bind.JAXBException;
+
 import org.apache.log4j.Logger;
+import org.docx4j.dml.diagram.CTColorTransform;
 import org.docx4j.dml.diagram.CTDataModel;
 import org.docx4j.dml.diagram.CTStyleDefinition;
+import org.docx4j.dml.diagram.CTStyleLabel;
+import org.docx4j.dml.diagram.ObjectFactory;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.parts.JaxbXmlPart;
@@ -57 +64 @@
                 setRelationshipType(Namespaces.DRAWINGML_DIAGRAM_STYLE);
         }
-                
+
+            public Object unmarshal(String filename) throws JAXBException {
+                
+                java.io.InputStream is = null;
+                        try {
+                                is = org.docx4j.utils.ResourceUtils.getResource(
+                                                "org/docx4j/openpackaging/parts/DrawingML/" + filename);
+                        } catch (IOException e) {
+                                e.printStackTrace();
+                        }               
+                
+                return unmarshal( is );    // side-effect is to set jaxbElement         
+            }
+
+            public void CreateMinimalContent(String uniqueId) {
+
+                        ObjectFactory factory = new ObjectFactory(); 
+                        
+                        CTStyleDefinition styleDef = factory.createCTStyleDefinition();
+                        styleDef.setUniqueId(uniqueId);
+                        
+                        CTStyleLabel styleLabel = factory.createCTStyleLabel();
+                        styleLabel.setName("node0");
+                        
+                        styleDef.getStyleLbl().add(styleLabel);
+                        
+                        this.setJaxbElement(styleDef);          
+            }
+            
 }

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/DrawingML/JaxbDmlPart.java

@@ -35 +35 @@
                 } else if (contentType.equals(ContentTypes.DRAWINGML_DIAGRAM_STYLE)) {
                         return new org.docx4j.openpackaging.parts.DrawingML.DiagramStylePart(new PartName(partName)); 
+//              } else if (contentType.equals(ContentTypes.DRAWINGML_DIAGRAM_DRAWING)) {
+//                      return new org.docx4j.openpackaging.parts.DrawingML.DiagramDrawingPart(new PartName(partName));
                 } else if (contentType.equals(ContentTypes.DRAWINGML_DRAWING)) {
                         return new Drawing(new PartName(partName));

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

@@ -151 +151 @@
                 "http://schemas.openxmlformats.org/officeDocument/2006/relationships/diagramLayoutHeader";
 
+        // "/word/diagrams/drawing1.xml"
+        public final static String DRAWINGML_DIAGRAM_DRAWING =
+                "http://schemas.openxmlformats.org/officeDocument/2007/relationships/diagramDrawing";
+        
         
         // Target="ppt/presentation.xml"