From 38fa2189bccead2614c13148b79e938f34c07bd3 Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Tue, 5 Nov 2013 20:24:12 +0100 Subject: [PATCH] TMI-IIO: Removed some deprecation warnings. --- .../imageio/plugins/svg/SVGImageReaderSpi.java | 2 +- .../imageio/plugins/wmf/WMFImageReaderSpi.java | 4 ++-- .../imageio/util/ImageWriterAbstractTestCase.java | 13 +++++++++++++ .../imageio/plugins/icns/ICNSImageReaderSpi.java | 2 +- .../imageio/plugins/ico/CURImageReaderSpi.java | 2 +- .../imageio/plugins/ico/ICOImageReaderSpi.java | 2 +- .../imageio/plugins/iff/IFFImageReaderSpi.java | 2 +- .../jmagick/JMagickImageReaderSpiSupport.java | 2 +- .../jmagick/JMagickImageWriterSpiSupport.java | 4 ++-- .../imageio/plugins/jpeg/JPEGImageReaderSpi.java | 3 ++- .../imageio/plugins/pict/PICTImageReaderSpi.java | 2 +- .../imageio/plugins/psd/PSDImageReaderSpi.java | 2 +- .../plugins/thumbsdb/ThumbsDBImageReaderSpi.java | 4 ++-- 13 files changed, 29 insertions(+), 15 deletions(-) diff --git a/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderSpi.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderSpi.java index 2d946d61..3c1744d8 100755 --- a/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderSpi.java +++ b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderSpi.java @@ -65,7 +65,7 @@ public class SVGImageReaderSpi extends ImageReaderSpi { SVG_READER_AVAILABLE ? new String[]{"svg"} : null, // Suffixes SVG_READER_AVAILABLE ? new String[]{"image/svg", "image/x-svg", "image/svg+xml", "image/svg-xml"} : null, // Mime-types "com.twelvemonkeys.imageio.plugins.svg.SVGImageReader", // Reader class name - ImageReaderSpi.STANDARD_INPUT_TYPE, // Output types + new Class[] {ImageInputStream.class}, // Input types null, // Writer SPI names true, // Supports standard stream metadata format null, // Native stream metadata format name diff --git a/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderSpi.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderSpi.java index f857aae0..d9aecc2e 100755 --- a/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderSpi.java +++ b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderSpi.java @@ -65,8 +65,8 @@ public class WMFImageReaderSpi extends ImageReaderSpi { WMF_READER_AVAILABLE ? new String[]{"wmf", "WMF"} : new String[]{""}, // Names WMF_READER_AVAILABLE ? new String[]{"wmf", "emf"} : null, // Suffixes WMF_READER_AVAILABLE ? new String[]{"application/x-msmetafile", "image/x-wmf"} : null, // Mime-types - WMFImageReader.class.getName(), // Reader class name..? - ImageReaderSpi.STANDARD_INPUT_TYPE, // Output types + "com.twelvemonkeys.imageio.plugins.wmf.WMFImageReader", // Reader class name..? + new Class[] {ImageInputStream.class}, // Input types null, // Writer SPI names true, // Supports standard stream metadata format null, // Native stream metadata format name diff --git a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTestCase.java index e6fa78ea..67ecd60f 100755 --- a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTestCase.java +++ b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTestCase.java @@ -28,6 +28,7 @@ package com.twelvemonkeys.imageio.util; +import com.twelvemonkeys.imageio.stream.URLImageInputStreamSpi; import org.junit.Test; import org.mockito.InOrder; @@ -35,12 +36,14 @@ import javax.imageio.ImageIO; import javax.imageio.ImageWriteParam; import javax.imageio.ImageWriter; import javax.imageio.event.IIOWriteProgressListener; +import javax.imageio.spi.IIORegistry; import javax.imageio.stream.ImageOutputStream; import java.awt.*; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.net.URL; import java.util.List; import static org.junit.Assert.*; @@ -56,6 +59,12 @@ import static org.mockito.Mockito.*; */ public abstract class ImageWriterAbstractTestCase { + // TODO: Move static block + getClassLoaderResource to common superclass for reader/writer test cases or delegate. + + static { + IIORegistry.getDefaultInstance().registerServiceProvider(new URLImageInputStreamSpi()); + } + protected abstract ImageWriter createImageWriter(); protected abstract List getTestData(); @@ -85,6 +94,10 @@ public abstract class ImageWriterAbstractTestCase { return getTestData().get(index); } + protected URL getClassLoaderResource(final String pName) { + return getClass().getResource(pName); + } + @Test public void testSetOutput() throws IOException { // Should just pass with no exceptions diff --git a/imageio/imageio-icns/src/main/java/com/twelvemonkeys/imageio/plugins/icns/ICNSImageReaderSpi.java b/imageio/imageio-icns/src/main/java/com/twelvemonkeys/imageio/plugins/icns/ICNSImageReaderSpi.java index 5b023276..0dd66e30 100644 --- a/imageio/imageio-icns/src/main/java/com/twelvemonkeys/imageio/plugins/icns/ICNSImageReaderSpi.java +++ b/imageio/imageio-icns/src/main/java/com/twelvemonkeys/imageio/plugins/icns/ICNSImageReaderSpi.java @@ -59,7 +59,7 @@ public final class ICNSImageReaderSpi extends ImageReaderSpi{ "image/x-apple-icons", // Common extension MIME }, "com.twelvemonkeys.imageio.plugins.icns.ICNSImageReader", - STANDARD_INPUT_TYPE, + new Class[] {ImageInputStream.class}, null, true, null, null, null, null, true, diff --git a/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderSpi.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderSpi.java index 43f127e8..af4c9dc8 100755 --- a/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderSpi.java +++ b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderSpi.java @@ -61,7 +61,7 @@ public final class CURImageReaderSpi extends ImageReaderSpi { "image/cursor" // Unofficial, but common }, "com.twelvemonkeys.imageio.plugins.ico.CURImageReader", - STANDARD_INPUT_TYPE, + new Class[] {ImageInputStream.class}, null, true, null, null, null, null, true, diff --git a/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderSpi.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderSpi.java index eebeda17..2e5adfb0 100755 --- a/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderSpi.java +++ b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderSpi.java @@ -61,7 +61,7 @@ public final class ICOImageReaderSpi extends ImageReaderSpi { "image/ico" // Unofficial, but common }, "com.twelvemonkeys.imageio.plugins.ico.ICOImageReader", - STANDARD_INPUT_TYPE, + new Class[] {ImageInputStream.class}, null, true, null, null, null, null, true, diff --git a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderSpi.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderSpi.java index d6cca9c3..8b92907c 100755 --- a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderSpi.java +++ b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderSpi.java @@ -63,7 +63,7 @@ public class IFFImageReaderSpi extends ImageReaderSpi { new String[]{"iff", "lbm", "ham", "ham8", "ilbm"}, new String[]{"image/iff", "image/x-iff"}, "com.twelvemonkeys.imageio.plugins.iff.IFFImageReader", - STANDARD_INPUT_TYPE, + new Class[] {ImageInputStream.class}, new String[]{"com.twelvemonkeys.imageio.plugins.iff.IFFImageWriterSpi"}, true, null, null, null, null, true, null, null, null, null diff --git a/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderSpiSupport.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderSpiSupport.java index 528ff26e..ebfd5d15 100755 --- a/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderSpiSupport.java +++ b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderSpiSupport.java @@ -69,7 +69,7 @@ abstract class JMagickImageReaderSpiSupport extends ImageReaderSpi { AVAILABLE ? pSuffixes : null, // Suffixes AVAILABLE ? pMimeTypes : null, // Mime-types pReaderClassName, // Reader class name - ImageReaderSpi.STANDARD_INPUT_TYPE, // Output types + new Class[] {ImageInputStream.class}, // Input types pWriterSpiNames, // Writer SPI names true, // Supports standard stream metadata format null, // Native stream metadata format name diff --git a/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageWriterSpiSupport.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageWriterSpiSupport.java index f738cfd2..6ef71dd2 100755 --- a/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageWriterSpiSupport.java +++ b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageWriterSpiSupport.java @@ -30,9 +30,9 @@ package com.twelvemonkeys.imageio.plugins.jmagick; import javax.imageio.ImageTypeSpecifier; import javax.imageio.ImageWriter; -import javax.imageio.spi.ImageReaderSpi; import javax.imageio.spi.ImageWriterSpi; import javax.imageio.spi.ServiceRegistry; +import javax.imageio.stream.ImageOutputStream; import java.io.IOException; import java.util.Locale; @@ -68,7 +68,7 @@ abstract class JMagickImageWriterSpiSupport extends ImageWriterSpi { AVAILABLE ? pSuffixes : null, // Suffixes AVAILABLE ? pMimeTypes : null, // Mime-types pWriterClassName, // Writer class name - ImageReaderSpi.STANDARD_INPUT_TYPE, // Output types + new Class[] {ImageOutputStream.class}, // Output types pReaderSpiNames, // Reader SPI names true, // Supports standard stream metadata format null, // Native stream metadata format name diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderSpi.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderSpi.java index d3814c0c..72155d33 100644 --- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderSpi.java +++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderSpi.java @@ -36,6 +36,7 @@ import javax.imageio.ImageReader; import javax.imageio.metadata.IIOMetadataFormat; import javax.imageio.spi.ImageReaderSpi; import javax.imageio.spi.ServiceRegistry; +import javax.imageio.stream.ImageInputStream; import java.io.IOException; import java.util.Locale; @@ -65,7 +66,7 @@ public class JPEGImageReaderSpi extends ImageReaderSpi { new String[]{"jpg", "jpeg"}, new String[]{"image/jpeg"}, "com.twelvemonkeys.imageio.plugins.jpeg.JPEGImageReader", - STANDARD_INPUT_TYPE, + new Class[] {ImageInputStream.class}, new String[] {"com.twelvemonkeys.imageio.plugins.jpeg.JPEGImageWriterSpi"}, true, null, null, null, null, true, null, null, null, null diff --git a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java index 5f19f0ae..bfa92b0c 100755 --- a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java +++ b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java @@ -62,7 +62,7 @@ public class PICTImageReaderSpi extends ImageReaderSpi { new String[]{"pct", "pict"}, new String[]{"image/pict", "image/x-pict"}, "com.twelvemkonkeys.imageio.plugins.pict.PICTImageReader", - STANDARD_INPUT_TYPE, + new Class[] {ImageInputStream.class}, new String[]{"com.twelvemkonkeys.imageio.plugins.pict.PICTImageWriterSpi"}, true, null, null, null, null, true, null, null, null, null diff --git a/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderSpi.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderSpi.java index 754b355e..1abab894 100755 --- a/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderSpi.java +++ b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderSpi.java @@ -64,7 +64,7 @@ public class PSDImageReaderSpi extends ImageReaderSpi { "image/x-psd", "application/x-photoshop", "image/x-photoshop" }, "com.twelvemkonkeys.imageio.plugins.psd.PSDImageReader", - STANDARD_INPUT_TYPE, + new Class[] {ImageInputStream.class}, // new String[]{"com.twelvemkonkeys.imageio.plugins.psd.PSDImageWriterSpi"}, null, true, // supports standard stream metadata diff --git a/imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderSpi.java b/imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderSpi.java index 1c704285..a8ad5fb2 100755 --- a/imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderSpi.java +++ b/imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderSpi.java @@ -65,8 +65,8 @@ public class ThumbsDBImageReaderSpi extends ImageReaderSpi { new String[]{"thumbs", "THUMBS", "Thumbs DB"}, new String[]{"db"}, new String[]{"image/x-thumbs-db", "application/octet-stream"}, // TODO: Check IANA et al... - ThumbsDBImageReader.class.getName(), - STANDARD_INPUT_TYPE, + "com.twelvemonkeys.imageio.plugins.thumbsdb.ThumbsDBImageReader", + new Class[] {ImageInputStream.class}, null, true, null, null, null, null, true, null, null, null, null