Changeset 1096 for trunk/docx4j/src/main/java/org/docx4j/jaxb/Context.java

Timestamp:

02/27/10 06:52:46 (2 years ago)

Author:

jharrop

Message:

Moved jcPML to org.pptx4j.jaxb.Context

Don't assume default paragraph,character styles are Normal,Default.. respectively.

File:

• trunk/docx4j/src/main/java/org/docx4j/jaxb/Context.java (modified) (4 diffs)

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

@@ -37 +37 @@
         public static JAXBContext jcCustomXmlProperties;
         public static JAXBContext jcContentTypes;
-        public static JAXBContext jcPML;
         
         private static Logger log = Logger.getLogger(Context.class);
@@ -67 +66 @@
                         //log.info("\n\nClassloader: " + classLoader.toString() );                      
                         
+                        log.info("loading Context jc");                 
                         jc = JAXBContext.newInstance("org.docx4j.wml:org.docx4j.dml:org.docx4j.dml.picture:org.docx4j.dml.wordprocessingDrawing:org.docx4j.vml:org.docx4j.vml.officedrawing:org.docx4j.math",classLoader );
-                        jcThemePart = JAXBContext.newInstance("org.docx4j.dml",classLoader );
+                        log.info("loaded " + jc.getClass().getName() + " .. loading others ..");
+                        
+                        jcThemePart = jc; //JAXBContext.newInstance("org.docx4j.dml",classLoader );
                         jcDocPropsCore = JAXBContext.newInstance("org.docx4j.docProps.core:org.docx4j.docProps.core.dc.elements:org.docx4j.docProps.core.dc.terms",classLoader );
                         jcDocPropsCustom = JAXBContext.newInstance("org.docx4j.docProps.custom",classLoader );
@@ -76 +78 @@
                         jcCustomXmlProperties = JAXBContext.newInstance("org.docx4j.customXmlProperties",classLoader );
                         jcContentTypes = JAXBContext.newInstance("org.docx4j.openpackaging.contenttype",classLoader );
-                        jcPML = JAXBContext.newInstance("org.pptx4j.pml:org.docx4j.dml:org.docx4j.dml.picture",classLoader );
+                        log.info(".. others loaded ..");
                         
                 } catch (Exception ex) {
@@ -93 +95 @@
                 
         }
-        
-        public static org.pptx4j.pml.ObjectFactory pmlObjectFactory;
-        public static org.pptx4j.pml.ObjectFactory getpmlObjectFactory() {
-                
-                if (pmlObjectFactory==null) {
-                        pmlObjectFactory = new org.pptx4j.pml.ObjectFactory();
-                }
-                return pmlObjectFactory;
-                
-        }
-        
                 
 }