Merged gcj-eclipse branch to trunk.

From-SVN: r120621

6 files changed, 34 insertions, 36 deletions

diff --git a/libjava/classpath/javax/imageio/spi/IIORegistry.java b/libjava/classpath/javax/imageio/spi/IIORegistry.java
index e762a96..fc3087f 100644
--- a/libjava/classpath/javax/imageio/spi/IIORegistry.java
+++ b/libjava/classpath/javax/imageio/spi/IIORegistry.java
@@ -39,7 +39,6 @@ exception statement from your version. */
 package javax.imageio.spi;
 
 import gnu.classpath.ServiceFactory;
-import gnu.java.awt.ClasspathToolkit;
 
 import java.awt.Toolkit;
 import java.util.HashMap;
@@ -92,8 +91,6 @@ public final class IIORegistry extends ServiceRegistry
     registerServiceProvider(new BMPImageWriterSpi());
 
     Toolkit toolkit = Toolkit.getDefaultToolkit();
-    if (toolkit instanceof ClasspathToolkit)
-      ((ClasspathToolkit)toolkit).registerImageIOSpis(this);
     
     registerApplicationClasspathSpis();
   }
diff --git a/libjava/classpath/javax/imageio/spi/IIOServiceProvider.java b/libjava/classpath/javax/imageio/spi/IIOServiceProvider.java
index 1ec59d5..48fa7d4 100644
--- a/libjava/classpath/javax/imageio/spi/IIOServiceProvider.java
+++ b/libjava/classpath/javax/imageio/spi/IIOServiceProvider.java
@@ -110,7 +110,7 @@ public abstract class IIOServiceProvider
    * @param category the service category for which this provider has
    * been registered as an implementor.
    */
-  public void onRegistration(ServiceRegistry registry, Class category)
+  public void onRegistration(ServiceRegistry registry, Class<?> category)
   {
   }
 
@@ -128,7 +128,7 @@ public abstract class IIOServiceProvider
    * @param category the service category for which this provider has
    * been registered as an implementor.
    */
-  public void onDeregistration(ServiceRegistry registry, Class category)
+  public void onDeregistration(ServiceRegistry registry, Class<?> category)
   {
   }
 
diff --git a/libjava/classpath/javax/imageio/spi/ImageInputStreamSpi.java b/libjava/classpath/javax/imageio/spi/ImageInputStreamSpi.java
index 51c5839..2b60868 100644
--- a/libjava/classpath/javax/imageio/spi/ImageInputStreamSpi.java
+++ b/libjava/classpath/javax/imageio/spi/ImageInputStreamSpi.java
@@ -59,7 +59,7 @@ public abstract class ImageInputStreamSpi
    * Indicates which kind of input is processable by the streams
    * created by {@link #createInputStreamInstance(Object)}.
    */
-  protected Class inputClass;
+  protected Class<?> inputClass;
 
 
   /**
@@ -80,7 +80,7 @@ public abstract class ImageInputStreamSpi
    * or <code>version</code> is <code>null</code>.
    */
   public ImageInputStreamSpi(String vendorName, String version,
-                             Class inputClass)
+                             Class<?> inputClass)
   {
     super(vendorName, version);
     this.inputClass = inputClass;
@@ -91,7 +91,7 @@ public abstract class ImageInputStreamSpi
    * Determines which kind of input is processable by the streams
    * created by {@link #createInputStreamInstance(Object)}.
    */
-  public Class getInputClass()
+  public Class<?> getInputClass()
   {
     return inputClass;
   }
diff --git a/libjava/classpath/javax/imageio/spi/ImageOutputStreamSpi.java b/libjava/classpath/javax/imageio/spi/ImageOutputStreamSpi.java
index 0f1d3cd..872e718 100644
--- a/libjava/classpath/javax/imageio/spi/ImageOutputStreamSpi.java
+++ b/libjava/classpath/javax/imageio/spi/ImageOutputStreamSpi.java
@@ -59,7 +59,7 @@ public abstract class ImageOutputStreamSpi
    * Indicates which kind of output is produced by the streams
    * created by {@link #createOutputStreamInstance(Object)}.
    */
-  protected Class outputClass;
+  protected Class<?> outputClass;
 
 
   /**
@@ -80,7 +80,7 @@ public abstract class ImageOutputStreamSpi
    * or <code>version</code> is <code>null</code>.
    */
   public ImageOutputStreamSpi(String vendorName, String version,
-                              Class outputClass)
+                              Class<?> outputClass)
   {
     super(vendorName, version);
     this.outputClass = outputClass;
@@ -91,7 +91,7 @@ public abstract class ImageOutputStreamSpi
    * Determines which kind of output is produced by the streams
    * created by {@link #createOutputStreamInstance(Object)}.
    */
-  public Class getOutputClass()
+  public Class<?> getOutputClass()
   {
     return outputClass;
   }
diff --git a/libjava/classpath/javax/imageio/spi/RegisterableService.java b/libjava/classpath/javax/imageio/spi/RegisterableService.java
index ccf734e..7be5a1b 100644
--- a/libjava/classpath/javax/imageio/spi/RegisterableService.java
+++ b/libjava/classpath/javax/imageio/spi/RegisterableService.java
@@ -62,7 +62,7 @@ public interface RegisterableService
    * @param category the service category for which this provider has
    * been registered as an implementor.
    */
-  void onRegistration(ServiceRegistry registry, Class category);
+  void onRegistration(ServiceRegistry registry, Class<?> category);
 
 
   /**
@@ -78,6 +78,6 @@ public interface RegisterableService
    * @param category the service category for which this provider has
    * been registered as an implementor.
    */
-  void onDeregistration(ServiceRegistry registry, Class category);
+  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 031b666..4848bc6 100644
--- a/libjava/classpath/javax/imageio/spi/ServiceRegistry.java
+++ b/libjava/classpath/javax/imageio/spi/ServiceRegistry.java
@@ -121,7 +121,7 @@ public class ServiceRegistry
    * @throws ClassCastException if <code>categories</code> does not
    * iterate over instances of {@link java.lang.Class}.
    */
-  public ServiceRegistry(Iterator categories)
+  public ServiceRegistry(Iterator<Class<?>> categories)
   {
     ArrayList cats = new ArrayList(/* expected size */ 10);
 
@@ -178,8 +178,8 @@ public class ServiceRegistry
    * @throws IllegalArgumentException if <code>spi</code> is
    * <code>null</code>.
    */
-  public static Iterator lookupProviders(Class spi,
-                                         ClassLoader loader)
+  public static <T> Iterator<T> lookupProviders(Class<T> spi,
+                                                ClassLoader loader)
   {
     return ServiceFactory.lookupProviders(spi, loader);
   }
@@ -200,7 +200,7 @@ public class ServiceRegistry
    *
    * @see #lookupProviders(Class, ClassLoader)
    */
-  public static Iterator lookupProviders(Class spi)
+  public static <T> Iterator<T> lookupProviders(Class<T> spi)
   {
     return ServiceFactory.lookupProviders(spi);
   }
@@ -212,7 +212,7 @@ public class ServiceRegistry
    * @return an unmodifiable {@link
    * java.util.Iterator}&lt;{@link java.lang.Class}&gt;.
    */
-  public Iterator getCategories()
+  public Iterator<Class<?>> getCategories()
   {
     return new Iterator()
       {
@@ -317,8 +317,8 @@ public class ServiceRegistry
    * @throws ClassCastException if <code>provider</code> does not
    * implement <code>category</code>.
    */
-  public synchronized boolean registerServiceProvider(Object provider,
-                                                      Class category)
+  public synchronized <T> boolean registerServiceProvider(T provider,
+                                                          Class<T> category)
   {
     for (int i = 0; i < categories.length; i++)
       if (categories[i] == category)
@@ -383,7 +383,7 @@ public class ServiceRegistry
    * #ServiceRegistry(Iterator) constructor} of this
    * <code>ServiceRegistry</code>.
    */
-  public synchronized void registerServiceProviders(Iterator providers)
+  public synchronized void registerServiceProviders(Iterator<?> providers)
   {
     if (providers == null)
       throw new IllegalArgumentException();
@@ -467,8 +467,8 @@ public class ServiceRegistry
    * @throws ClassCastException if <code>provider</code> does not
    * implement <code>category</code>.
    */
-  public synchronized boolean deregisterServiceProvider(Object provider,
-                                                        Class category)
+  public synchronized <T> boolean deregisterServiceProvider(T provider,
+                                                            Class<T> category)
   {
     for (int i = 0; i < categories.length; i++)
       if (categories[i] == category)
@@ -535,7 +535,7 @@ public class ServiceRegistry
    * #ServiceRegistry(Iterator) constructor} of this
    * <code>ServiceRegistry</code>.
    */
-  public synchronized void deregisterAll(Class category)
+  public synchronized void deregisterAll(Class<?> category)
   {
     boolean ok = false;
 
@@ -663,7 +663,8 @@ public class ServiceRegistry
    *
    * @see #getServiceProviders(Class, Filter, boolean)
    */
-  public Iterator getServiceProviders(Class category, boolean useOrdering)
+  public <T> Iterator<T> getServiceProviders(Class<T> category,
+                                             boolean useOrdering)
   {
     return getServiceProviders(category, null, useOrdering);
   }
@@ -691,9 +692,9 @@ public class ServiceRegistry
    * #ServiceRegistry(Iterator) constructor} of this
    * <code>ServiceRegistry</code>.
    */
-  public synchronized Iterator getServiceProviders(Class category,
-                                                   Filter filter,
-                                                   boolean useOrdering)
+  public synchronized <T> Iterator<T> getServiceProviders(Class<T> category,
+                                                          Filter filter,
+                                                          boolean useOrdering)
   {
     int catid;
     LinkedList provs;
@@ -751,7 +752,7 @@ public class ServiceRegistry
    * 
    * @param providerClass a class to search for.
    */
-  public synchronized Object getServiceProviderByClass(Class providerClass)
+  public synchronized <T> T getServiceProviderByClass(Class<T> providerClass)
   {
     if (providerClass == null)
       throw new IllegalArgumentException();
@@ -772,7 +773,7 @@ public class ServiceRegistry
           {
             Object provider = iter.next();
             if (providerClass.isInstance(provider))
-              return provider;
+              return (T) provider;
           }
       }
 
@@ -799,9 +800,9 @@ public class ServiceRegistry
    * @see #unsetOrdering
    * @see #getServiceProviders(Class, Filter, boolean)
    */
-  public synchronized boolean setOrdering(Class category,
-                                          Object firstProvider,
-                                          Object secondProvider)
+  public synchronized <T> boolean setOrdering(Class<T> category,
+                                              T firstProvider,
+                                              T secondProvider)
   {
     return addConstraint(getCategoryID(category), firstProvider,
                          secondProvider);
@@ -826,9 +827,9 @@ public class ServiceRegistry
    *
    * @see #setOrdering
    */
-  public synchronized boolean unsetOrdering(Class category,
-                                            Object firstProvider,
-                                            Object secondProvider)
+  public synchronized <T> boolean unsetOrdering(Class<T> category,
+                                                T firstProvider,
+                                                T secondProvider)
   {
     return removeConstraint(getCategoryID(category),
                             firstProvider, secondProvider);