diff options
Diffstat (limited to 'libjava/classpath/javax/imageio/spi')
5 files changed, 21 insertions, 23 deletions
diff --git a/libjava/classpath/javax/imageio/spi/IIORegistry.java b/libjava/classpath/javax/imageio/spi/IIORegistry.java index 101cead..faa571d 100644 --- a/libjava/classpath/javax/imageio/spi/IIORegistry.java +++ b/libjava/classpath/javax/imageio/spi/IIORegistry.java @@ -54,7 +54,7 @@ import gnu.javax.imageio.png.PNGImageReaderSpi; public final class IIORegistry extends ServiceRegistry { private static final HashSet defaultCategories = new HashSet(); - + private static HashMap instances = new HashMap(); static @@ -65,19 +65,19 @@ public final class IIORegistry extends ServiceRegistry defaultCategories.add(ImageInputStreamSpi.class); defaultCategories.add(ImageOutputStreamSpi.class); } - + public static synchronized IIORegistry getDefaultInstance() { // XXX: This leaks memory if a ThreadGroup isn't available anymore. ThreadGroup group = Thread.currentThread().getThreadGroup(); IIORegistry registry = (IIORegistry) instances.get(group); - + if (registry == null) { registry = new IIORegistry(); instances.put(group, registry); } - + return registry; } @@ -94,7 +94,7 @@ public final class IIORegistry extends ServiceRegistry Toolkit toolkit = Toolkit.getDefaultToolkit(); if (toolkit instanceof ClasspathToolkit) ((ClasspathToolkit)toolkit).registerImageIOSpis(this); - + registerApplicationClasspathSpis(); } @@ -109,11 +109,11 @@ public final class IIORegistry extends ServiceRegistry while (categories.hasNext()) { - Class category = (Class) categories.next(); - Iterator providers = ServiceFactory.lookupProviders(category, loader); + Class category = (Class) categories.next(); + Iterator providers = ServiceFactory.lookupProviders(category, loader); - while (providers.hasNext()) - registerServiceProvider((IIOServiceProvider) providers.next()); + while (providers.hasNext()) + registerServiceProvider((IIOServiceProvider) providers.next()); } } } diff --git a/libjava/classpath/javax/imageio/spi/ImageReaderSpi.java b/libjava/classpath/javax/imageio/spi/ImageReaderSpi.java index e97d239..3ffa93a 100644 --- a/libjava/classpath/javax/imageio/spi/ImageReaderSpi.java +++ b/libjava/classpath/javax/imageio/spi/ImageReaderSpi.java @@ -84,7 +84,7 @@ public abstract class ImageReaderSpi extends ImageReaderWriterSpi if (inputTypes == null || inputTypes.length == 0) throw new IllegalArgumentException("inputTypes may not be null or empty"); - + this.inputTypes = inputTypes; this.writerSpiNames = writerSpiNames; } @@ -115,7 +115,7 @@ public abstract class ImageReaderSpi extends ImageReaderWriterSpi { if (reader == null) throw new IllegalArgumentException("reader may not be null"); - + return pluginClassName.equals(reader.getClass().getName()); } } diff --git a/libjava/classpath/javax/imageio/spi/ImageWriterSpi.java b/libjava/classpath/javax/imageio/spi/ImageWriterSpi.java index 3ec52c5..6a07348 100644 --- a/libjava/classpath/javax/imageio/spi/ImageWriterSpi.java +++ b/libjava/classpath/javax/imageio/spi/ImageWriterSpi.java @@ -89,9 +89,9 @@ public abstract class ImageWriterSpi extends ImageReaderWriterSpi if (outputTypes == null || outputTypes.length == 0) throw new IllegalArgumentException("outputTypes may not be null or empty"); - + this.outputTypes = outputTypes; - this.readerSpiNames = readerSpiNames; + this.readerSpiNames = readerSpiNames; } public abstract boolean canEncodeImage(ImageTypeSpecifier type); diff --git a/libjava/classpath/javax/imageio/spi/RegisterableService.java b/libjava/classpath/javax/imageio/spi/RegisterableService.java index 7be5a1b..b424e04 100644 --- a/libjava/classpath/javax/imageio/spi/RegisterableService.java +++ b/libjava/classpath/javax/imageio/spi/RegisterableService.java @@ -80,4 +80,3 @@ public interface RegisterableService */ void onDeregistration(ServiceRegistry registry, Class<?> category); } - diff --git a/libjava/classpath/javax/imageio/spi/ServiceRegistry.java b/libjava/classpath/javax/imageio/spi/ServiceRegistry.java index 170ea00..d923596 100644 --- a/libjava/classpath/javax/imageio/spi/ServiceRegistry.java +++ b/libjava/classpath/javax/imageio/spi/ServiceRegistry.java @@ -107,11 +107,11 @@ public class ServiceRegistry */ private IdentityHashMap[] constraints; - + /** * Constructs a <code>ServiceRegistry</code> for the specified * service categories. - * + * * @param categories the categories to support * * @throws IllegalArgumentException if <code>categories</code> is @@ -475,8 +475,8 @@ public class ServiceRegistry return deregisterServiceProvider(provider, i); throw new IllegalArgumentException(); } - - + + /** * De-registers a provider from all service categories it * implements. @@ -704,7 +704,7 @@ public class ServiceRegistry provs = providers[catid]; if (provs == null) return Collections.EMPTY_LIST.iterator(); - + result = new ArrayList(provs.size()); for (Iterator iter = provs.iterator(); iter.hasNext();) { @@ -728,7 +728,7 @@ public class ServiceRegistry if (o1 == o2) return 0; - + s = (Set) cons.get(o1); if (s != null && s.contains(o2)) return -1; // o1 < o2 @@ -749,7 +749,7 @@ public class ServiceRegistry /** * Returns one of the service providers that is a subclass of the * specified class. - * + * * @param providerClass a class to search for. */ public synchronized <T> T getServiceProviderByClass(Class<T> providerClass) @@ -764,7 +764,7 @@ public class ServiceRegistry { if (!categories[cat].isAssignableFrom(providerClass)) continue; - + LinkedList provs = providers[cat]; if (provs == null) continue; @@ -959,4 +959,3 @@ public class ServiceRegistry boolean filter(Object provider); } } - |