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

TMI-32: Cleanup after merge. Removed filter + code style changes.

Browse Source
This commit is contained in:
Harald Kuhr 2014-02-06 23:09:01 +01:00
parent 7c012323e5
commit 9fa1d97389
2 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ImageFormatFilter.java
View File

@ -1,36 +0,0 @@
package com.twelvemonkeys.imageio.plugins.jpeg;
import javax.imageio.spi.ImageReaderSpi;
import javax.imageio.spi.ImageWriterSpi;
import javax.imageio.spi.ServiceRegistry;
public class ImageFormatFilter implements ServiceRegistry.Filter {
String name;
public ImageFormatFilter (String name) {
this.name = name;
}
public boolean filter (Object obj) {
try {
if (obj instanceof ImageReaderSpi) {
return contains(((ImageReaderSpi) obj).getFormatNames(), name);
} else if (obj instanceof ImageWriterSpi) {
return contains(((ImageWriterSpi) obj).getFormatNames(), name);
} else {
return false;
}
} catch (Exception e) {
return false;
}
}
private static boolean contains (String[] names, String name) {
for (int i = 0; i < names.length; i++) {
if (name.equalsIgnoreCase(names[i])) {
return true;
}
}
return false;
}
}

11
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderSpi.java
View File

@ -86,12 +86,13 @@ public class JPEGImageReaderSpi extends ImageReaderSpi {
} }
static ImageReaderSpi lookupDelegateProvider(final ServiceRegistry registry) { static ImageReaderSpi lookupDelegateProvider(final ServiceRegistry registry) {
Iterator<ImageReaderSpi> it = registry.getServiceProviders(ImageReaderSpi.class, new ImageFormatFilter("JPEG"), true); Iterator<ImageReaderSpi> providers = registry.getServiceProviders(ImageReaderSpi.class, true);
while (it.hasNext()) { while (providers.hasNext()) {
ImageReaderSpi imageReaderSpi = it.next(); ImageReaderSpi provider = providers.next();
if (imageReaderSpi.getClass().getCanonicalName().equals("com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi")) {
return imageReaderSpi; if (provider.getClass().getName().equals("com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi")) {
return provider;
} }
} }