Changeset 1495

Timestamp:

05/18/11 04:28:06 (12 months ago)

Author:

jharrop

Message:

Basic support for .glox SmartArt? package

Location:

trunk/docx4j

Files:

• build.xml (modified) (1 diff)
• pom.xml (modified) (1 diff)
• sample-docs/glox (added)
• sample-docs/glox/Hier2Level.glox (added)
• sample-docs/glox/LICENSE.txt (added)
• sample-docs/glox/VerticalProcessPair.glox (added)
• src/glox4j (added)
• src/glox4j/java (added)
• src/glox4j/java/org (added)
• src/glox4j/java/org/glox4j (added)
• src/glox4j/java/org/glox4j/openpackaging (added)
• src/glox4j/java/org/glox4j/openpackaging/packages (added)
• src/glox4j/java/org/glox4j/openpackaging/packages/GloxPackage.java (added)
• src/glox4j/java/org/glox4j/openpackaging/parts (added)
• src/glox4j/java/org/glox4j/samples (added)
• src/glox4j/java/org/glox4j/samples/GetHeaderInfo.java (added)
• src/main/java/org/docx4j/openpackaging/contenttype/ContentTypeManager.java (modified) (4 diffs)
• src/main/java/org/docx4j/openpackaging/contenttype/ContentTypes.java (modified) (1 diff)
• src/main/java/org/docx4j/openpackaging/parts/DrawingML/DiagramLayoutHeaderPart.java (added)
• src/main/java/org/docx4j/openpackaging/parts/DrawingML/JaxbDmlPart.java (modified) (1 diff)
• src/main/java/org/docx4j/openpackaging/parts/relationships/Namespaces.java (modified) (1 diff)

trunk/docx4j/build.xml

@@ -93 +93 @@
             <src path="${src.main.java.dir}"/>
             <src path="src/diffx"/>
+            <src path="src/glox4j/java"/>
             <src path="src/pptx4j/java"/>
             <src path="src/xlsx4j/java"/>

trunk/docx4j/pom.xml

@@ -52 +52 @@
                                                                 <source>src/svg</source>
                                                                 <source>src/xlsx4j/java</source>
+                                                                <source>src/glox4j/java</source>
                                                                 <!--source>src/sun</source-->
                                                         </sources>

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

@@ -110 +110 @@
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
 import org.docx4j.relationships.Relationship;
+import org.glox4j.openpackaging.packages.GloxPackage;
 
 
@@ -771 +772 @@
                 OpcPackage p;
                 
+                  
+                
                 if (getPartNameOverridenByContentType(ContentTypes.WORDPROCESSINGML_DOCUMENT) != null
                                 || getPartNameOverridenByContentType(ContentTypes.WORDPROCESSINGML_DOCUMENT_MACROENABLED) != null
@@ -779 +782 @@
                         return p;
                 } else if (getPartNameOverridenByContentType(ContentTypes.PRESENTATIONML_MAIN) != null) {
+                        // "potm", "potx", "ppam", "ppsm", "ppsx", "pptm" ?
                         log.info("Detected PresentationMLPackage package ");
                         p = new PresentationMLPackage(this);
@@ -786 +790 @@
                                 || getPartNameOverridenByContentType(ContentTypes.SPREADSHEETML_TEMPLATE) != null
                                 || getPartNameOverridenByContentType(ContentTypes.SPREADSHEETML_TEMPLATE_MACROENABLED) != null) {
+                        //  "xlam", "xlsb" ?
                         log.info("Detected SpreadhseetMLPackage package ");
                         p = new SpreadsheetMLPackage(this);
                         return p;                       
+                } else if (getPartNameOverridenByContentType(ContentTypes.DRAWINGML_DIAGRAM_LAYOUT) != null) {
+                        log.info("Detected Glox file ");
+                        p = new GloxPackage(this);
+                        return p;                                               
                 } else {
                         throw new InvalidFormatException("Unexpected package (docx4j supports docx/docxm and pptx only");

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

@@ -163 +163 @@
                 "application/vnd.openxmlformats-officedocument.drawingml.diagramStyle+xml";
 
+        // "/word/diagrams/layout1.xml"
+        public final static String DRAWINGML_DIAGRAM_LAYOUT_HEADER =
+                "application/vnd.openxmlformats-officedocument.drawingml.diagramLayoutHeader+xml";
+        
         // embedded presentation
         public final static String PRESENTATION = 

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

@@ -39 +39 @@
                 } else if (contentType.equals(ContentTypes.DRAWINGML_CHART)) {
                         return new Chart(new PartName(partName));
+                } else if (contentType.equals(ContentTypes.DRAWINGML_DIAGRAM_LAYOUT_HEADER)) {
+                        return new org.docx4j.openpackaging.parts.DrawingML.DiagramLayoutHeaderPart(new PartName(partName));
                 }
                 else {

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

@@ -147 +147 @@
                 "http://schemas.openxmlformats.org/officeDocument/2006/relationships/diagramQuickStyle";
         
+        // "/diagrams/layoutheader1.xml"
+        public final static String DRAWINGML_DIAGRAM_LAYOUT_HEADER =
+                "http://schemas.openxmlformats.org/officeDocument/2006/relationships/diagramLayoutHeader";
+
         
         // Target="ppt/presentation.xml"