Changeset 1492

Timestamp:

05/15/11 04:19:10 (13 months ago)

Author:

jharrop

Message:

Support for  http://schemas.openxmlformats.org/officeDocument/2006/bibliography

Location:

trunk/docx4j

Files:

• src/main/java/org/docx4j/bibliography (added)
• src/main/java/org/docx4j/bibliography/CTAuthorType.java (added)
• src/main/java/org/docx4j/bibliography/CTNameListType.java (added)
• src/main/java/org/docx4j/bibliography/CTNameOrCorporateType.java (added)
• src/main/java/org/docx4j/bibliography/CTNameType.java (added)
• src/main/java/org/docx4j/bibliography/CTPersonType.java (added)
• src/main/java/org/docx4j/bibliography/CTSourceType.java (added)
• src/main/java/org/docx4j/bibliography/CTSources.java (added)
• src/main/java/org/docx4j/bibliography/ObjectFactory.java (added)
• src/main/java/org/docx4j/bibliography/STSourceType.java (added)
• src/main/java/org/docx4j/bibliography/package-info.java (added)
• src/main/java/org/docx4j/convert/in/FlatOpcXmlImporter.java (modified) (2 diffs)
• src/main/java/org/docx4j/jaxb/Context.java (modified) (1 diff)
• src/main/java/org/docx4j/openpackaging/io/Load.java (modified) (3 diffs)
• src/main/java/org/docx4j/openpackaging/io/LoadFromZipFile.java (modified) (2 diffs)
• src/main/java/org/docx4j/openpackaging/io/LoadFromZipNG.java (modified) (2 diffs)
• src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/BibliographyPart.java (added)
• src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/DocumentPart.java (modified) (2 diffs)
• src/main/java/org/docx4j/sharedtypes (added)
• src/main/java/org/docx4j/sharedtypes/ObjectFactory.java (added)
• src/main/java/org/docx4j/sharedtypes/STCalendarType.java (added)
• src/main/java/org/docx4j/sharedtypes/STConformanceClass.java (added)
• src/main/java/org/docx4j/sharedtypes/STVerticalAlignRun.java (added)
• src/main/java/org/docx4j/sharedtypes/STXAlign.java (added)
• src/main/java/org/docx4j/sharedtypes/STYAlign.java (added)
• xsd/shared/shared-additionalCharacteristics.xsd (added)
• xsd/shared/shared-bibliography.xsd (added)
• xsd/shared/shared-commonSimpleTypes.xsd (added)

trunk/docx4j/src/main/java/org/docx4j/convert/in/FlatOpcXmlImporter.java

@@ -58 +58 @@
 import org.docx4j.openpackaging.parts.XmlPart;
 import org.docx4j.openpackaging.parts.PresentationML.JaxbPmlPart;
+import org.docx4j.openpackaging.parts.WordprocessingML.BibliographyPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPart;
 import org.docx4j.openpackaging.parts.opendope.ComponentsPart;
@@ -506 +507 @@
                                                                         (org.opendope.components.Components)o);
 
+                                                } else if (o instanceof org.docx4j.bibliography.CTSources) {
+                                                        
+                                                        part = new BibliographyPart(name);
+                                                        ((BibliographyPart)part).setJaxbElement(
+                                                                        (org.docx4j.bibliography.CTSources)o);
+                                                                                                                
                                                 } else {
                                                         

trunk/docx4j/src/main/java/org/docx4j/jaxb/Context.java

@@ -77 +77 @@
                                         "org.docx4j.vml:org.docx4j.vml.officedrawing:org.docx4j.vml.wordprocessingDrawing:org.docx4j.vml.presentationDrawing:org.docx4j.vml.spreadsheetDrawing:org.docx4j.vml.root:" +
                                         "org.opendope.xpaths:org.opendope.conditions:org.opendope.questions:org.opendope.components:" +
-                                        "org.docx4j.math",classLoader );
+                                        "org.docx4j.math:" +
+                                        "org.docx4j.sharedtypes:org.docx4j.bibliography",classLoader );
                         log.info("loaded " + jc.getClass().getName() + " .. loading others ..");
                         

trunk/docx4j/src/main/java/org/docx4j/openpackaging/io/Load.java

@@ -43 +43 @@
 import org.docx4j.openpackaging.parts.Part;
 import org.docx4j.openpackaging.parts.PartName;
+import org.docx4j.openpackaging.parts.WordprocessingML.BibliographyPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPart;
 import org.docx4j.openpackaging.parts.opendope.ComponentsPart;
@@ -184 +185 @@
                                                         part = new ConditionsPart(name);
                                                         ((ConditionsPart)part).setJaxbElement(
-                                                                        (org.opendope.conditions.Conditions)o);
-                                                        
+                                                                        (org.opendope.conditions.Conditions)o);                                                 
                                                         
                                                 } else if (o instanceof org.opendope.xpaths.Xpaths) {
@@ -205 +205 @@
                                                                         (org.opendope.components.Components)o);
 
+                                                } else if (o instanceof org.docx4j.bibliography.CTSources) {
+                                                        
+                                                        part = new BibliographyPart(name);
+                                                        ((BibliographyPart)part).setJaxbElement(
+                                                                        (org.docx4j.bibliography.CTSources)o);
+                                                        
                                                 } else {
                                                         

trunk/docx4j/src/main/java/org/docx4j/openpackaging/io/LoadFromZipFile.java

@@ -50 +50 @@
 import org.docx4j.openpackaging.parts.PartName;
 import org.docx4j.openpackaging.parts.XmlPart;
+import org.docx4j.openpackaging.parts.WordprocessingML.BibliographyPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPart;
 import org.docx4j.openpackaging.parts.opendope.ComponentsPart;
@@ -528 +529 @@
                                                                         (org.opendope.components.Components)o);
 
+                                                } else if (o instanceof org.docx4j.bibliography.CTSources) {
+                                                        
+                                                        part = new BibliographyPart(name);
+                                                        ((BibliographyPart)part).setJaxbElement(
+                                                                        (org.docx4j.bibliography.CTSources)o);                                          
+
                                                 } else {
                                                         

trunk/docx4j/src/main/java/org/docx4j/openpackaging/io/LoadFromZipNG.java

@@ -59 +59 @@
 import org.docx4j.openpackaging.parts.PartName;
 import org.docx4j.openpackaging.parts.XmlPart;
+import org.docx4j.openpackaging.parts.WordprocessingML.BibliographyPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPart;
 import org.docx4j.openpackaging.parts.opendope.ComponentsPart;
@@ -587 +588 @@
                                                                         (org.opendope.components.Components)o);
 
+                                                } else if (o instanceof org.docx4j.bibliography.CTSources) {
+                                                        
+                                                        part = new BibliographyPart(name);
+                                                        ((BibliographyPart)part).setJaxbElement(
+                                                                        (org.docx4j.bibliography.CTSources)o);
+                                                                                                                
                                                 } else {
                                                         

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

@@ -138 +138 @@
                         componentsPart = ((ComponentsPart)part);
                         return true;
+                } else if (part instanceof BibliographyPart) {
+                        bibliographyPart = ((BibliographyPart)part);
+                        return true;
                         
                         // TODO - to be completed.
@@ -288 +291 @@
         }
         
+        private BibliographyPart bibliographyPart;
+        public BibliographyPart getBibliographyPart() {
+                return bibliographyPart;
+        }
+        
 }