Changeset 854

Timestamp:

07/08/09 17:09:15 (3 years ago)

Author:

jharrop

Message:

Remove ContentTypeManager? interface; replace it with implementation.
ContentTypeManager?: change semantics of isContentTypeRegistered, so that it means 'is *default* content type registered'.

Location:

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

Files:

• convert/in/FlatOpcXmlImporter.java (modified) (2 diffs)
• openpackaging/contenttype/ContentTypeManager.java (moved) (moved from trunk/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypeManagerImpl.java) (6 diffs)
• openpackaging/io/LoadFromJCR.java (modified) (2 diffs)
• openpackaging/io/LoadFromZipFile.java (modified) (2 diffs)
• openpackaging/io/LoadFromZipNG.java (modified) (2 diffs)
• openpackaging/packages/Package.java (modified) (2 diffs)
• openpackaging/packages/WordprocessingMLPackage.java (modified) (2 diffs)

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

@@ -46 +46 @@
 import org.docx4j.openpackaging.contenttype.ContentType;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
-import org.docx4j.openpackaging.contenttype.ContentTypeManagerImpl;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
@@ -116 +115 @@
                 //              but only the WordML package exists at present
                 
-                ctm = new ContentTypeManagerImpl();
+                ctm = new ContentTypeManager();
                 
                 ctm.addDefaultContentType("rels", "application/vnd.openxmlformats-package.relationships+xml");

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

@@ -82 +82 @@
  * @version 1.0
  */
-public class ContentTypeManagerImpl implements ContentTypeManager {
-        
-        // TODO - merge this with interface. 
-        // There is no value in having a separate implementation.
-
-        protected static Logger log = Logger.getLogger(ContentTypeManagerImpl.class);
+public class ContentTypeManager  {
+        
+        protected static Logger log = Logger.getLogger(ContentTypeManager.class);
 
         /**
@@ -134 +131 @@
          *             If the content types part content is not valid.
          */
-        public ContentTypeManagerImpl(Document contentTypes) throws InvalidFormatException {
+        public ContentTypeManager(Document contentTypes) throws InvalidFormatException {
                 init();
                 if (contentTypes != null) {
@@ -148 +145 @@
         }
 
-        public ContentTypeManagerImpl()  {
+        public ContentTypeManager()  {
                 init();
         }
@@ -169 +166 @@
                 String extension = partName.getExtension();
                 if ((extension.length() == 0)
-                                || (this.defaultContentType.containsKey(extension) && !(defaultCTExists = this.defaultContentType
-                                                .containsValue(contentType))))
+                                || (this.defaultContentType.containsKey(extension) 
+                                                && !(defaultCTExists = this.defaultContentType.containsValue(contentType)))) {
                         this.addOverrideContentType(partName.getURI(), contentType);
-                else if (!defaultCTExists)
+                } else if (!defaultCTExists) {
                         this.addDefaultContentType(extension, contentType);
+                }
         }
 
@@ -474 +472 @@
 
         /**
-         * Check if the specified content type is already register.
+         * Check if the specified content type is already registered
+         * as a default content type.  We don't currently have a method
+         * to check whether its registered as an override content type;
+         * getContentType(PartName partName) may suffice for that purpose.
          * 
          * @param contentType
          *            The content type to check.
          * @return <code>true</code> if the specified content type is already
-         *         register, then <code>false</code>.
+         *         registered, then <code>false</code>.
          */
         public boolean isContentTypeRegistered(String contentType) {
@@ -485 +486 @@
                         throw new IllegalArgumentException("contentType");
 
-                return (this.defaultContentType.values().contains(contentType) || (this.overrideContentType != null && this.overrideContentType
-                                .values().contains(contentType)));
+                return this.defaultContentType.values().contains(contentType); 
+//                              || (this.overrideContentType != null 
+//                                              && this.overrideContentType.values().contains(contentType)));
         }
 

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

@@ -51 +51 @@
 import org.docx4j.openpackaging.URIHelper;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
-import org.docx4j.openpackaging.contenttype.ContentTypeManagerImpl;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.Base;
@@ -119 +118 @@
         
         public LoadFromJCR(NodeMapper nodeMapper) {
-                this(new ContentTypeManagerImpl(), nodeMapper );
+                this(new ContentTypeManager(), nodeMapper );
         }
 

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

@@ -40 +40 @@
 import org.docx4j.openpackaging.URIHelper;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
-import org.docx4j.openpackaging.contenttype.ContentTypeManagerImpl;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
@@ -88 +87 @@
         
         public LoadFromZipFile() {
-                this(new ContentTypeManagerImpl() );
+                this(new ContentTypeManager() );
         }
 

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

@@ -45 +45 @@
 import org.docx4j.openpackaging.URIHelper;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
-import org.docx4j.openpackaging.contenttype.ContentTypeManagerImpl;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
@@ -91 +90 @@
         
         public LoadFromZipNG() {
-                this(new ContentTypeManagerImpl() );
+                this(new ContentTypeManager() );
         }
 

trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/Package.java

@@ -28 +28 @@
 import org.docx4j.openpackaging.Base;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
-import org.docx4j.openpackaging.contenttype.ContentTypeManagerImpl;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.parts.CustomXmlDataStoragePart;
@@ -101 +100 @@
                         partName = new PartName("/", false);
                         
-                        contentTypeManager = new ContentTypeManagerImpl();
+                        contentTypeManager = new ContentTypeManager();
                 } catch (Exception e) {
                         log.error(e.getMessage());

trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

@@ -49 +49 @@
 import org.docx4j.openpackaging.contenttype.ContentType;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
-import org.docx4j.openpackaging.contenttype.ContentTypeManagerImpl;
 import org.docx4j.openpackaging.contenttype.ContentTypes;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
@@ -238 +237 @@
                 org.docx4j.convert.in.FlatOpcXmlImporter xmlPackage = new org.docx4j.convert.in.FlatOpcXmlImporter( wmlPackageEl); 
                 
-                ContentTypeManager ctm = new ContentTypeManagerImpl();
+                ContentTypeManager ctm = new ContentTypeManager();
                 
                 Part tmpDocPart = xmlPackage.getRawPart(ctm,  "/word/document.xml");