Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-04 03:55:28 -04:00
Code Issues Projects Releases Wiki Activity

API clean-up.

Browse Source
This commit is contained in:
Harald Kuhr 2018-03-06 23:22:45 +01:00
parent 15e39bce3f
commit ee299ee577
6 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
View File

@ -1239,16 +1239,19 @@ public final class JPEGImageReader extends ImageReaderBase {
} }
private class ThumbnailProgressDelegate implements ThumbnailReadProgressListener { private class ThumbnailProgressDelegate implements ThumbnailReadProgressListener {
public void processThumbnailStarted(int imageIndex, int thumbnailIndex) { @Override
JPEGImageReader.this.processThumbnailStarted(imageIndex, thumbnailIndex); public void thumbnailStarted(int imageIndex, int thumbnailIndex) {
processThumbnailStarted(imageIndex, thumbnailIndex);
} }
public void processThumbnailProgress(float percentageDone) { @Override
JPEGImageReader.this.processThumbnailProgress(percentageDone); public void thumbnailProgress(float percentageDone) {
processThumbnailProgress(percentageDone);
} }
public void processThumbnailComplete() { @Override
JPEGImageReader.this.processThumbnailComplete(); public void thumbnailComplete() {
processThumbnailComplete();
} }
} }

6
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ThumbnailReadProgressListener.java
View File

@ -36,9 +36,9 @@ package com.twelvemonkeys.imageio.plugins.jpeg;
* @version $Id: ThumbnailReadProgressListener.java,v 1.0 07.05.12 10:15 haraldk Exp$ * @version $Id: ThumbnailReadProgressListener.java,v 1.0 07.05.12 10:15 haraldk Exp$
*/ */
interface ThumbnailReadProgressListener { 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();
} }

15
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ThumbnailReader.java
View File

@ -55,15 +55,15 @@ abstract class ThumbnailReader {
} }
protected final void processThumbnailStarted() { protected final void processThumbnailStarted() {
progressListener.processThumbnailStarted(imageIndex, thumbnailIndex); progressListener.thumbnailStarted(imageIndex, thumbnailIndex);
} }
protected final void processThumbnailProgress(float percentageDone) { protected final void processThumbnailProgress(float percentageDone) {
progressListener.processThumbnailProgress(percentageDone); progressListener.thumbnailProgress(percentageDone);
} }
protected final void processThumbnailComplete() { protected final void processThumbnailComplete() {
progressListener.processThumbnailComplete(); progressListener.thumbnailComplete();
} }
static protected BufferedImage readJPEGThumbnail(final ImageReader reader, final ImageInputStream stream) throws IOException { 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; public abstract int getHeight() throws IOException;
private static class NullProgressListener implements ThumbnailReadProgressListener { 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() {
} }
} }
} }

12
imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/EXIFThumbnailReaderTest.java
View File

@ -110,9 +110,9 @@ public class EXIFThumbnailReaderTest extends AbstractThumbnailReaderTest {
createReader(listener, 42, 43, createStream("/jpeg/cmyk-sample-multiple-chunk-icc.jpg")).read(); createReader(listener, 42, 43, createStream("/jpeg/cmyk-sample-multiple-chunk-icc.jpg")).read();
InOrder order = inOrder(listener); InOrder order = inOrder(listener);
order.verify(listener).processThumbnailStarted(42, 43); order.verify(listener).thumbnailStarted(42, 43);
order.verify(listener, atLeastOnce()).processThumbnailProgress(100f); order.verify(listener, atLeastOnce()).thumbnailProgress(100f);
order.verify(listener).processThumbnailComplete(); order.verify(listener).thumbnailComplete();
} }
@Test @Test
@ -122,8 +122,8 @@ public class EXIFThumbnailReaderTest extends AbstractThumbnailReaderTest {
createReader(listener, 0, 99, createStream("/jpeg/exif-rgb-thumbnail-sony-d700.jpg")).read(); createReader(listener, 0, 99, createStream("/jpeg/exif-rgb-thumbnail-sony-d700.jpg")).read();
InOrder order = inOrder(listener); InOrder order = inOrder(listener);
order.verify(listener).processThumbnailStarted(0, 99); order.verify(listener).thumbnailStarted(0, 99);
order.verify(listener, atLeastOnce()).processThumbnailProgress(100f); order.verify(listener, atLeastOnce()).thumbnailProgress(100f);
order.verify(listener).processThumbnailComplete(); order.verify(listener).thumbnailComplete();
} }
} }

6
imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIFThumbnailReaderTest.java
View File

@ -97,8 +97,8 @@ public class JFIFThumbnailReaderTest extends AbstractThumbnailReaderTest {
createReader(listener, 0, 99, createStream("/jpeg/jfif-jfif-and-exif-thumbnail-sharpshot-iphone.jpg")).read(); createReader(listener, 0, 99, createStream("/jpeg/jfif-jfif-and-exif-thumbnail-sharpshot-iphone.jpg")).read();
InOrder order = inOrder(listener); InOrder order = inOrder(listener);
order.verify(listener).processThumbnailStarted(0, 99); order.verify(listener).thumbnailStarted(0, 99);
order.verify(listener, atLeastOnce()).processThumbnailProgress(100f); order.verify(listener, atLeastOnce()).thumbnailProgress(100f);
order.verify(listener).processThumbnailComplete(); order.verify(listener).thumbnailComplete();
} }
} }

14
imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JFXXThumbnailReaderTest.java
View File

@ -41,12 +41,8 @@ import java.io.DataInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.*;
import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.*;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
/** /**
* JFXXThumbnailReaderTest * JFXXThumbnailReaderTest
@ -91,8 +87,8 @@ public class JFXXThumbnailReaderTest extends AbstractThumbnailReaderTest {
createReader(listener, 0, 99, createStream("/jpeg/jfif-jfxx-thumbnail-olympus-d320l.jpg")).read(); createReader(listener, 0, 99, createStream("/jpeg/jfif-jfxx-thumbnail-olympus-d320l.jpg")).read();
InOrder order = inOrder(listener); InOrder order = inOrder(listener);
order.verify(listener).processThumbnailStarted(0, 99); order.verify(listener).thumbnailStarted(0, 99);
order.verify(listener, atLeastOnce()).processThumbnailProgress(100f); order.verify(listener, atLeastOnce()).thumbnailProgress(100f);
order.verify(listener).processThumbnailComplete(); order.verify(listener).thumbnailComplete();
} }
} }