Changeset 1004 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/io/LoadFromJCR.java

Timestamp:

01/09/10 18:15:02 (2 years ago)

Author:

jharrop

Message:

Remove dom4j stuff

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/io/LoadFromJCR.java (modified) (5 diffs)

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

@@ -26 +26 @@
 import java.net.URISyntaxException;
 
-import java.util.HashMap;
-import java.util.Iterator;
-
 import javax.jcr.Node;
-import javax.jcr.NodeIterator;
+import javax.jcr.PathNotFoundException;
 import javax.jcr.Property;
-import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
-import javax.jcr.ValueFormatException;
-
-import javax.jcr.PathNotFoundException;
-import javax.jcr.RepositoryException;
-
-import javax.xml.bind.JAXBContext;
-
-//import org.apache.jackrabbit.core.TransientRepository;
 
 import org.apache.log4j.Logger;
-
 import org.docx4j.JcrNodeMapper.NodeMapper;
 import org.docx4j.jaxb.Context;
 import org.docx4j.model.datastorage.CustomXmlDataStorage;
+import org.docx4j.openpackaging.Base;
 import org.docx4j.openpackaging.URIHelper;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
+import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
-import org.docx4j.openpackaging.Base;
+import org.docx4j.openpackaging.exceptions.PartUnrecognisedException;
 import org.docx4j.openpackaging.packages.Package;
 import org.docx4j.openpackaging.parts.DefaultXmlPart;
@@ -60 +49 @@
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
 import org.docx4j.openpackaging.parts.relationships.RelationshipsPart;
-import org.docx4j.relationships.Relationships;
 import org.docx4j.relationships.Relationship;
-
-import org.docx4j.openpackaging.exceptions.Docx4JException;
-import org.docx4j.openpackaging.exceptions.PartUnrecognisedException;
-
-// Aim to remove dependency on any XML API from 
-// this package.
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.io.SAXReader;
 
 
@@ -242 +221 @@
                                         docxContentNode, "[Content_Types].xml");
 
-                        // Document ctmDocument =
-                        // deprecatedGetDocumentFromJCRPart(jcrSession, nodeMapper,
-                        // contentTypesPartNode);
-                        InputStream in = getInputStreamFromJCRPart(nodeMapper,
+                        InputStream is = getInputStreamFromJCRPart(nodeMapper,
                                         contentTypesPartNode);
-                        SAXReader xmlReader = new SAXReader();
-                        Document ctmDocument = null;
-                        try {
-                                ctmDocument = xmlReader.read(in);
-                                debugPrint(ctmDocument);
-                        } catch (DocumentException e) {
-                                e.printStackTrace();
-                                throw e;
-                        }
-
-                        ctm.parseContentTypesFile(ctmDocument);
+                        
+                        ctm.parseContentTypesFile(is);
 
                 } catch (Exception e) {
@@ -367 +334 @@
         public static InputStream getInputStreamFromJCRPart(NodeMapper nodeMapper, 
                         Node contentNode) 
-                throws DocumentException, RepositoryException, PathNotFoundException {
+                throws RepositoryException, PathNotFoundException {
         
                 try {           
@@ -383 +350 @@
         public static Node getPartNode(Session jcrSession,
                         NodeMapper nodeMapper, Node docxNode, String partName) 
-                throws DocumentException, RepositoryException, PathNotFoundException {
+                throws RepositoryException, PathNotFoundException {
                 
                 long startTime = 0;