New SPI info.

imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderSpi.java

@@ -29,8 +29,7 @@
 package com.twelvemonkeys.imageio.plugins.tiff;
 
 import com.twelvemonkeys.imageio.metadata.exif.TIFF;
-import com.twelvemonkeys.imageio.spi.ProviderInfo;
-import com.twelvemonkeys.imageio.util.IIOUtil;
+import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
 
 import javax.imageio.spi.ImageReaderSpi;
 import javax.imageio.spi.ServiceRegistry;
@@ -46,33 +45,12 @@ import java.util.Locale;
  * @author last modified by $Author: haraldk$
  * @version $Id: TIFFImageReaderSpi.java,v 1.0 08.05.12 15:14 haraldk Exp$
  */
-public class TIFFImageReaderSpi extends ImageReaderSpi {
+public class TIFFImageReaderSpi extends ImageReaderSpiBase {
     /**
      * Creates a {@code TIFFImageReaderSpi}.
      */
     public TIFFImageReaderSpi() {
-        this(IIOUtil.getProviderInfo(TIFFImageReaderSpi.class));
-    }
-
-    private TIFFImageReaderSpi(final ProviderInfo providerInfo) {
-        super(
-                providerInfo.getVendorName(),
-                providerInfo.getVersion(),
-                new String[] {"tiff", "TIFF"},
-                new String[] {"tif", "tiff"},
-                new String[] {
-                        "image/tiff", "image/x-tiff"
-                },
-                "com.twelvemkonkeys.imageio.plugins.tiff.TIFFImageReader",
-                new Class[] {ImageInputStream.class},
-                new String[] {"com.twelvemkonkeys.imageio.plugins.tif.TIFFImageWriterSpi"},
-                true, // supports standard stream metadata
-                null, null, // native stream format name and class
-                null, null, // extra stream formats
-                true, // supports standard image metadata
-                null, null,
-                null, null // extra image metadata formats
-        );
+        super(new TIFFProviderInfo());
     }
 
     @SuppressWarnings("unchecked")

imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriterSpi.java

@@ -28,13 +28,10 @@
 
 package com.twelvemonkeys.imageio.plugins.tiff;
 
-import com.twelvemonkeys.imageio.spi.ProviderInfo;
-import com.twelvemonkeys.imageio.util.IIOUtil;
+import com.twelvemonkeys.imageio.spi.ImageWriterSpiBase;
 
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.ImageWriter;
-import javax.imageio.spi.ImageWriterSpi;
-import javax.imageio.stream.ImageOutputStream;
 import java.io.IOException;
 import java.util.Locale;
 
@@ -45,45 +42,27 @@ import java.util.Locale;
  * @author last modified by $Author: haraldk$
  * @version $Id: TIFFImageWriterSpi.java,v 1.0 18.09.13 12:46 haraldk Exp$
  */
-public final class TIFFImageWriterSpi extends ImageWriterSpi {
+public final class TIFFImageWriterSpi extends ImageWriterSpiBase {
     // TODO: Implement canEncodeImage better
 
     public TIFFImageWriterSpi() {
-        this(IIOUtil.getProviderInfo(TIFFImageWriterSpi.class));
-    }
-
-    private TIFFImageWriterSpi(final ProviderInfo providerInfo) {
-        super(
-                providerInfo.getVendorName(), providerInfo.getVersion(),
-                new String[] {"tiff", "TIFF", "tif", "TIFF"},
-                new String[] {"tif", "tiff"},
-                new String[] {"image/tiff", "image/x-tiff"},
-                "com.twelvemonkeys.imageio.plugins.tiff.TIFFImageWriter",
-                new Class<?>[] {ImageOutputStream.class},
-                new String[] {"com.twelvemonkeys.imageio.plugins.tiff.TIFFImageReaderSpi"},
-                true, // supports standard stream metadata
-                null, null, // native stream format name and class
-                null, null, // extra stream formats
-                true, // supports standard image metadata
-                null, null,
-                null, null // extra image metadata formats
-        );
+        super(new TIFFProviderInfo());
     }
 
     @Override
-    public boolean canEncodeImage(ImageTypeSpecifier type) {
+    public boolean canEncodeImage(final ImageTypeSpecifier type) {
         // TODO: Test bit depths compatibility
 
         return true;
     }
 
     @Override
-    public ImageWriter createWriterInstance(Object extension) throws IOException {
+    public ImageWriter createWriterInstance(final Object extension) throws IOException {
         return new TIFFImageWriter(this);
     }
 
     @Override
-    public String getDescription(Locale locale) {
+    public String getDescription(final Locale locale) {
         return "Aldus/Adobe Tagged Image File Format (TIFF) image writer";
     }
 }

imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFProviderInfo.java

@@ -0,0 +1,29 @@
+package com.twelvemonkeys.imageio.plugins.tiff;
+
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
+
+/**
+ * TIFFProviderInfo.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: TIFFProviderInfo.java,v 1.0 20/03/15 harald.kuhr Exp$
+ */
+final class TIFFProviderInfo extends ReaderWriterProviderInfo {
+    protected TIFFProviderInfo() {
+        super(
+                TIFFProviderInfo.class,
+                new String[] {"tiff", "TIFF"},
+                new String[] {"tif", "tiff"},
+                new String[] {
+                        "image/tiff", "image/x-tiff"
+                },
+                "com.twelvemkonkeys.imageio.plugins.tiff.TIFFImageReader",
+                new String[] {"com.twelvemonkeys.imageio.plugins.tiff.TIFFImageReaderSpi"},
+                "com.twelvemonkeys.imageio.plugins.tiff.TIFFImageWriter",
+                new String[] {"com.twelvemkonkeys.imageio.plugins.tif.TIFFImageWriterSpi"},
+                false, null, null, null, null,
+                true, null, null, null, null
+        );
+    }
+}