From 9fa1d97389bbc8dd15d5b308eda11478abde0b45 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Thu, 6 Feb 2014 23:09:01 +0100
Subject: [PATCH] TMI-32: Cleanup after merge. Removed filter + code style
 changes.

---
 .../plugins/jpeg/ImageFormatFilter.java       | 36 -------------------
 .../plugins/jpeg/JPEGImageReaderSpi.java      | 11 +++---
 2 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ImageFormatFilter.java

diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ImageFormatFilter.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ImageFormatFilter.java
deleted file mode 100644
index 284cb82b..00000000
--- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/ImageFormatFilter.java
+++ /dev/null
@@ -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;
-    }
-}
\ No newline at end of file
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 0550fa90..3fe841e0 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
@@ -86,12 +86,13 @@ public class JPEGImageReaderSpi extends ImageReaderSpi {
     }
 
     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()) {
-            ImageReaderSpi imageReaderSpi = it.next();
-            if (imageReaderSpi.getClass().getCanonicalName().equals("com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi")) {
-                return imageReaderSpi;
+        while (providers.hasNext()) {
+            ImageReaderSpi provider = providers.next();
+
+            if (provider.getClass().getName().equals("com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi")) {
+                return provider;
             }
         }