MODE-1848 - Fixed the list of mime-types that is registered by the Im…

…ageMetadataSequencer
ModeShape · Mar 8, 2013 · b8e2a0b · b8e2a0b
1 parent d63fa54
commit b8e2a0b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 32 deletions.
diff --git a/...modeshape-sequencer-images/src/main/java/org/modeshape/sequencer/image/ImageMetadata.java b/...modeshape-sequencer-images/src/main/java/org/modeshape/sequencer/image/ImageMetadata.java
@@ -187,6 +187,13 @@ public class ImageMetadata {
     /** Return value of {@link #getFormat()} for PSD streams. */
     public static final int FORMAT_PSD = 10;
 
+    /**
+     * The names of the MIME types for all supported file formats. The FORMAT_xyz int constants can be used as index values for
+     * this array.
+     */
+    static final String[] MIME_TYPE_STRINGS = {"image/jpeg", "image/gif", "image/png", "image/bmp", "image/pcx",
+            "image/iff", "image/ras", "image/x-portable-bitmap", "image/x-portable-graymap", "image/x-portable-pixmap", "image/psd"};
+
     /*
      * public static final int COLOR_TYPE_UNKNOWN = -1; public static final int COLOR_TYPE_TRUECOLOR_RGB = 0; public static final
      * int COLOR_TYPE_PALETTED = 1; public static final int COLOR_TYPE_GRAYSCALE= 2; public static final int
@@ -198,13 +205,6 @@ public class ImageMetadata {
      */
     private static final String[] FORMAT_NAMES = {"JPEG", "GIF", "PNG", "BMP", "PCX", "IFF", "RAS", "PBM", "PGM", "PPM", "PSD"};
 
-    /**
-     * The names of the MIME types for all supported file formats. The FORMAT_xyz int constants can be used as index values for
-     * this array.
-     */
-    private static final String[] MIME_TYPE_STRINGS = {"image/jpeg", "image/gif", "image/png", "image/bmp", "image/pcx",
-        "image/iff", "image/ras", "image/x-portable-bitmap", "image/x-portable-graymap", "image/x-portable-pixmap", "image/psd"};
-
     private int width;
     private int height;
     private int bitsPerPixel;

diff --git a/...-sequencer-images/src/main/java/org/modeshape/sequencer/image/ImageMetadataSequencer.java b/...-sequencer-images/src/main/java/org/modeshape/sequencer/image/ImageMetadataSequencer.java
@@ -70,20 +70,6 @@
  */
 public class ImageMetadataSequencer extends Sequencer {
 
-    public static final class MimeTypeConstants {
-        public static final String BMP = "image/bmp";
-        public static final String GIF = "image/gif";
-        public static final String JPEG = "image/jpeg";
-        public static final String PBM = "image/x-portable-bitmap";
-        public static final String PGM = "image/x-portable-graymap";
-        public static final String PPM = "image/x-portable-pixmap";
-        public static final String PNG = "image/png";
-        public static final String RAS = "image/x-cmu-raster";
-        public static final String TIFF = "image/tiff";
-        public static final String PHOTOSHOP = "image/vnd.adobe.photoshop";
-        public static final String PCX = "image/x-pcx";
-    }
-
     @Override
     public boolean execute( Property inputProperty,
                             Node outputNode,
@@ -140,16 +126,6 @@ private void setImagePropertiesOnNode( Node node,
     public void initialize( NamespaceRegistry registry,
                             NodeTypeManager nodeTypeManager ) throws RepositoryException, IOException {
         registerNodeTypes("images.cnd", nodeTypeManager, true);
-        registerDefaultMimeTypes(MimeTypeConstants.JPEG,
-                                 MimeTypeConstants.BMP,
-                                 MimeTypeConstants.GIF,
-                                 MimeTypeConstants.PCX,
-                                 MimeTypeConstants.PNG,
-                                 MimeTypeConstants.TIFF,
-                                 MimeTypeConstants.RAS,
-                                 MimeTypeConstants.PBM,
-                                 MimeTypeConstants.PGM,
-                                 MimeTypeConstants.PPM,
-                                 MimeTypeConstants.PHOTOSHOP);
+        registerDefaultMimeTypes(ImageMetadata.MIME_TYPE_STRINGS);
     }
 }