New SPI info.

imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderSpi.java

@@ -28,8 +28,7 @@
 
 package com.twelvemonkeys.imageio.plugins.bmp;
 
-import com.twelvemonkeys.imageio.spi.ProviderInfo;
-import com.twelvemonkeys.imageio.util.IIOUtil;
+import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
 
 import javax.imageio.ImageReader;
 import javax.imageio.spi.ImageReaderSpi;
@@ -47,30 +46,9 @@ import java.util.Locale;
  * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @version $Id: BMPImageReaderSpi.java,v 1.0 25.feb.2006 00:29:44 haku Exp$
  */
-public final class BMPImageReaderSpi extends ImageReaderSpi {
+public final class BMPImageReaderSpi extends ImageReaderSpiBase {
     public BMPImageReaderSpi() {
-        this(IIOUtil.getProviderInfo(BMPImageReaderSpi.class));
-    }
-
-    private BMPImageReaderSpi(final ProviderInfo pProviderInfo) {
-        super(
-                pProviderInfo.getVendorName(),
-                pProviderInfo.getVersion(),
-                new String[]{"bmp", "BMP"},
-                new String[]{"bmp", "rle"},
-                new String[]{
-                        "image/bmp",
-                        "image/x-bmp"
-//                        "image/vnd.microsoft.bitmap",   // TODO: Official IANA MIME
-                },
-                "com.twelvemonkeys.imageio.plugins.bmp.BMPImageReader",
-                new Class[]{ImageInputStream.class},
-                new String[]{"com.sun.imageio.plugins.bmp.BMPImageWriterSpi"}, // We support the same native metadata format
-                false, null, null, null, null,
-                true,
-                BMPMetadata.nativeMetadataFormatName, "com.sun.imageio.plugins.bmp.BMPMetadataFormat",
-                null, null
-        );
+        super(new BMPProviderInfo());
     }
 
     static ImageReaderSpi lookupDefaultProvider(final ServiceRegistry registry) {

imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPProviderInfo.java

@@ -0,0 +1,31 @@
+package com.twelvemonkeys.imageio.plugins.bmp;
+
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
+
+/**
+ * BMPProviderInfo.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: BMPProviderInfo.java,v 1.0 20/03/15 harald.kuhr Exp$
+ */
+final class BMPProviderInfo extends ReaderWriterProviderInfo {
+    protected BMPProviderInfo() {
+        super(
+                BMPProviderInfo.class,
+                new String[] {"bmp", "BMP"},
+                new String[] {"bmp", "rle"},
+                new String[] {
+                        "image/bmp",
+                        "image/x-bmp"
+//                        "image/vnd.microsoft.bitmap",   // TODO: Official IANA MIME
+                },
+                "com.twelvemonkeys.imageio.plugins.bmp.BMPImageReader",
+                new String[] {"com.twelvemonkeys.imageio.plugins.bmp.BMPImageReaderSpi"},
+                "com.sun.imageio.plugins.bmp.BMPImageWriter",
+                new String[]{"com.sun.imageio.plugins.bmp.BMPImageWriterSpi"}, // We support the same native metadata format
+                false, null, null, null, null,
+                true, BMPMetadata.nativeMetadataFormatName, "com.sun.imageio.plugins.bmp.BMPMetadataFormat", null, null
+        );
+    }
+}

imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/CURImageReaderSpi.java

@@ -28,11 +28,9 @@
 
 package com.twelvemonkeys.imageio.plugins.bmp;
 
-import com.twelvemonkeys.imageio.spi.ProviderInfo;
-import com.twelvemonkeys.imageio.util.IIOUtil;
+import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
 
 import javax.imageio.ImageReader;
-import javax.imageio.spi.ImageReaderSpi;
 import javax.imageio.stream.ImageInputStream;
 import java.io.IOException;
 import java.util.Locale;
@@ -43,31 +41,10 @@ import java.util.Locale;
  * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @version $Id: CURImageReaderSpi.java,v 1.0 25.feb.2006 00:29:44 haku Exp$
  */
-public final class CURImageReaderSpi extends ImageReaderSpi {
+public final class CURImageReaderSpi extends ImageReaderSpiBase {
 
     public CURImageReaderSpi() {
-        this(IIOUtil.getProviderInfo(CURImageReaderSpi.class));
-    }
-
-    private CURImageReaderSpi(final ProviderInfo pProviderInfo) {
-        super(
-                pProviderInfo.getVendorName(),
-                pProviderInfo.getVersion(),
-                new String[]{"cur", "CUR"},
-                new String[]{"cur"},
-                new String[]{
-                        "image/vnd.microsoft.cursor",   // Official IANA MIME
-                        "image/x-cursor",               // Common extension MIME
-                        "image/cursor"                  // Unofficial, but common
-                },
-                "com.twelvemonkeys.imageio.plugins.bmp.CURImageReader",
-                new Class[] {ImageInputStream.class},
-                null,
-                true, null, null, null, null,
-                true,
-                null, null,
-                null, null
-        );
+        super(new CURProviderInfo());
     }
 
     public boolean canDecodeInput(final Object pSource) throws IOException {

imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/CURProviderInfo.java

@@ -0,0 +1,30 @@
+package com.twelvemonkeys.imageio.plugins.bmp;
+
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
+
+/**
+ * CURProviderInfo.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: CURProviderInfo.java,v 1.0 20/03/15 harald.kuhr Exp$
+ */
+final class CURProviderInfo extends ReaderWriterProviderInfo {
+    protected CURProviderInfo() {
+        super(
+                CURProviderInfo.class,
+                new String[]{"cur", "CUR"},
+                new String[]{"cur"},
+                new String[]{
+                        "image/vnd.microsoft.cursor",   // Official IANA MIME
+                        "image/x-cursor",               // Common extension MIME
+                        "image/cursor"                  // Unofficial, but common
+                },
+                "com.twelvemonkeys.imageio.plugins.bmp.CURImageReader",
+                new String[] {"com.twelvemonkeys.imageio.plugins.bmp.CURImageReaderSpi"},
+                null, null,
+                false, null, null, null, null,
+                true, null, null, null, null
+        );
+    }
+}

imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/ICOImageReaderSpi.java

@@ -28,11 +28,9 @@
 
 package com.twelvemonkeys.imageio.plugins.bmp;
 
-import com.twelvemonkeys.imageio.spi.ProviderInfo;
-import com.twelvemonkeys.imageio.util.IIOUtil;
+import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
 
 import javax.imageio.ImageReader;
-import javax.imageio.spi.ImageReaderSpi;
 import javax.imageio.stream.ImageInputStream;
 import java.io.IOException;
 import java.util.Locale;
@@ -43,31 +41,10 @@ import java.util.Locale;
  * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @version $Id: ICOImageReaderSpi.java,v 1.0 25.feb.2006 00:29:44 haku Exp$
  */
-public final class ICOImageReaderSpi extends ImageReaderSpi {
+public final class ICOImageReaderSpi extends ImageReaderSpiBase {
 
     public ICOImageReaderSpi() {
-        this(IIOUtil.getProviderInfo(ICOImageReaderSpi.class));
-    }
-    
-    private ICOImageReaderSpi(final ProviderInfo pProviderInfo) {
-        super(
-                pProviderInfo.getVendorName(),
-                pProviderInfo.getVersion(),
-                new String[]{"ico", "ICO"},
-                new String[]{"ico"},
-                new String[]{
-                        "image/vnd.microsoft.icon", // Official IANA MIME
-                        "image/x-icon",             // Common extension MIME
-                        "image/ico"                 // Unofficial, but common
-                },
-                "com.twelvemonkeys.imageio.plugins.bmp.ICOImageReader",
-                new Class[] {ImageInputStream.class},
-                null,
-                true, null, null, null, null,
-                true,
-                null, null,
-                null, null
-        );
+        super(new ICOProviderInfo());
     }
 
     public boolean canDecodeInput(final Object pSource) throws IOException {

imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/ICOProviderInfo.java

@@ -0,0 +1,30 @@
+package com.twelvemonkeys.imageio.plugins.bmp;
+
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
+
+/**
+ * CURProviderInfo.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: CURProviderInfo.java,v 1.0 20/03/15 harald.kuhr Exp$
+ */
+final class ICOProviderInfo extends ReaderWriterProviderInfo {
+    protected ICOProviderInfo() {
+        super(
+                ICOProviderInfo.class,
+                new String[]{"ico", "ICO"},
+                new String[]{"ico"},
+                new String[]{
+                        "image/vnd.microsoft.icon", // Official IANA MIME
+                        "image/x-icon",             // Common extension MIME
+                        "image/ico"                 // Unofficial, but common
+                },
+                "com.twelvemonkeys.imageio.plugins.bmp.ICOImageReader",
+                new String[] {"com.twelvemonkeys.imageio.plugins.bmp.ICOImageReaderSpi"},
+                null, null,
+                false, null, null, null, null,
+                true, null, null, null, null
+        );
+    }
+}