From ee299ee577bf0dcd75cc2c331382d00ed7d6827f Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Tue, 6 Mar 2018 23:22:45 +0100 Subject: [PATCH] API clean-up. --- .../imageio/plugins/jpeg/JPEGImageReader.java | 15 +++++++++------ .../jpeg/ThumbnailReadProgressListener.java | 6 +++--- .../imageio/plugins/jpeg/ThumbnailReader.java | 15 +++++++++------ .../plugins/jpeg/EXIFThumbnailReaderTest.java | 12 ++++++------ .../plugins/jpeg/JFIFThumbnailReaderTest.java | 6 +++--- .../plugins/jpeg/JFXXThumbnailReaderTest.java | 14 +++++--------- 6 files changed, 35 insertions(+), 33 deletions(-) diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java index 05b386bb..52e420f1 100644 --- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java +++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java @@ -1239,16 +1239,19 @@ public final class JPEGImageReader extends ImageReaderBase { } private class ThumbnailProgressDelegate implements ThumbnailReadProgressListener { - public void processThumbnailStarted(int imageIndex, int thumbnailIndex) { - JPEGImageReader.this.processThumbnailStarted(imageIndex, thumbnailIndex); + @Override + public void thumbnailStarted(int imageIndex, int thumbnailIndex) { + processThumbnailStarted(imageIndex, thumbnailIndex); } - public void processThumbnailProgress(float percentageDone) { - JPEGImageReader.this.processThumbnailProgress(percentageDone); + @Override + public void thumbnailProgress(float percentageDone) { + processThumbnailProgress(percentageDone); } - public void processThumbnailComplete() { - JPEGImageReader.this.processThumbnailComplete(); + @Override + public void thumbnailComplete() { + processThumbnailComplete(); } } diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ThumbnailReadProgressListener.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ThumbnailReadProgressListener.java index b6b201ed..47fec3f4 100644 --- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ThumbnailReadProgressListener.java +++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ThumbnailReadProgressListener.java @@ -36,9 +36,9 @@ package com.twelvemonkeys.imageio.plugins.jpeg; * @version $Id: ThumbnailReadProgressListener.java,v 1.0 07.05.12 10:15 haraldk Exp$ */ interface ThumbnailReadProgressListener { - void processThumbnailStarted(int imageIndex, int thumbnailIndex); + void thumbnailStarted(int imageIndex, int thumbnailIndex); - void processThumbnailProgress(float percentageDone); + void thumbnailProgress(float percentageDone); - void processThumbnailComplete(); + void thumbnailComplete(); } diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ThumbnailReader.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ThumbnailReader.java index 416257cc..784be814 100644 --- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ThumbnailReader.java +++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ThumbnailReader.java @@ -55,15 +55,15 @@ abstract class ThumbnailReader { } protected final void processThumbnailStarted() { - progressListener.processThumbnailStarted(imageIndex, thumbnailIndex); + progressListener.thumbnailStarted(imageIndex, thumbnailIndex); } protected final void processThumbnailProgress(float percentageDone) { - progressListener.processThumbnailProgress(percentageDone); + progressListener.thumbnailProgress(percentageDone); } protected final void processThumbnailComplete() { - progressListener.processThumbnailComplete(); + progressListener.thumbnailComplete(); } static protected BufferedImage readJPEGThumbnail(final ImageReader reader, final ImageInputStream stream) throws IOException { @@ -96,13 +96,16 @@ abstract class ThumbnailReader { public abstract int getHeight() throws IOException; private static class NullProgressListener implements ThumbnailReadProgressListener { - public void processThumbnailStarted(int imageIndex, int thumbnailIndex) { + @Override + public void thumbnailStarted(int imageIndex, int thumbnailIndex) { } - public void processThumbnailProgress(float percentageDone) { + @Override + public void thumbnailProgress(float percentageDone) { } - public void processThumbnailComplete() { + @Override + public void thumbnailComplete() { } } } diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/EXIFThumbnailReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/EXIFThumbnailReaderTest.java index 7ad24538..e69fcb75 100644 --- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/EXIFThumbnailReaderTest.java +++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/EXIFThumbnailReaderTest.java @@ -110,9 +110,9 @@ public class EXIFThumbnailReaderTest extends AbstractThumbnailReaderTest { createReader(listener, 42, 43, createStream("/jpeg/cmyk-sample-multiple-chunk-icc.jpg")).read(); InOrder order = inOrder(listener); - order.verify(listener).processThumbnailStarted(42, 43); - order.verify(listener, atLeastOnce()).processThumbnailProgress(100f); - order.verify(listener).processThumbnailComplete(); + order.verify(listener).thumbnailStarted(42, 43); + order.verify(listener, atLeastOnce()).thumbnailProgress(100f); + order.verify(listener).thumbnailComplete(); } @Test @@ -122,8 +122,8 @@ public class EXIFThumbnailReaderTest extends AbstractThumbnailReaderTest { createReader(listener, 0, 99, createStream("/jpeg/exif-rgb-thumbnail-sony-d700.jpg")).read(); InOrder order = inOrder(listener); - order.verify(listener).processThumbnailStarted(0, 99); - order.verify(listener, atLeastOnce()).processThumbnailProgress(100f); - order.verify(listener).processThumbnailComplete(); + order.verify(listener).thumbnailStarted(0, 99); + order.verify(listener, atLeastOnce()).thumbnailProgress(100f); + order.verify(listener).thumbnailComplete(); } } diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIFThumbnailReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIFThumbnailReaderTest.java index 318a3d83..63408f69 100644 --- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIFThumbnailReaderTest.java +++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIFThumbnailReaderTest.java @@ -97,8 +97,8 @@ public class JFIFThumbnailReaderTest extends AbstractThumbnailReaderTest { createReader(listener, 0, 99, createStream("/jpeg/jfif-jfif-and-exif-thumbnail-sharpshot-iphone.jpg")).read(); InOrder order = inOrder(listener); - order.verify(listener).processThumbnailStarted(0, 99); - order.verify(listener, atLeastOnce()).processThumbnailProgress(100f); - order.verify(listener).processThumbnailComplete(); + order.verify(listener).thumbnailStarted(0, 99); + order.verify(listener, atLeastOnce()).thumbnailProgress(100f); + order.verify(listener).thumbnailComplete(); } } diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JFXXThumbnailReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JFXXThumbnailReaderTest.java index b46f9526..007ad29b 100644 --- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JFXXThumbnailReaderTest.java +++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JFXXThumbnailReaderTest.java @@ -41,12 +41,8 @@ import java.io.DataInputStream; import java.io.IOException; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; /** * JFXXThumbnailReaderTest @@ -91,8 +87,8 @@ public class JFXXThumbnailReaderTest extends AbstractThumbnailReaderTest { createReader(listener, 0, 99, createStream("/jpeg/jfif-jfxx-thumbnail-olympus-d320l.jpg")).read(); InOrder order = inOrder(listener); - order.verify(listener).processThumbnailStarted(0, 99); - order.verify(listener, atLeastOnce()).processThumbnailProgress(100f); - order.verify(listener).processThumbnailComplete(); + order.verify(listener).thumbnailStarted(0, 99); + order.verify(listener, atLeastOnce()).thumbnailProgress(100f); + order.verify(listener).thumbnailComplete(); } }