Merged gcj-eclipse branch to trunk.

From-SVN: r120621

2 files changed, 20 insertions, 19 deletions

diff --git a/libjava/classpath/javax/imageio/metadata/IIOMetadataFormat.java b/libjava/classpath/javax/imageio/metadata/IIOMetadataFormat.java
index 76e0950..15f2ceb 100644
--- a/libjava/classpath/javax/imageio/metadata/IIOMetadataFormat.java
+++ b/libjava/classpath/javax/imageio/metadata/IIOMetadataFormat.java
@@ -106,15 +106,15 @@ public interface IIOMetadataFormat
 
   int getObjectArrayMinLength (String elementName);
 
-  Class getObjectClass (String elementName);
+  Class<?> getObjectClass (String elementName);
 
   Object getObjectDefaultValue (String elementName);
 
   Object[] getObjectEnumerations (String elementName);
 
-  Comparable getObjectMaxValue (String elementName);
+  Comparable<?> getObjectMaxValue (String elementName);
 
-  Comparable getObjectMinValue (String elementName);
+  Comparable<?> getObjectMinValue (String elementName);
 
   int getObjectValueType (String elementName);
 
diff --git a/libjava/classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java b/libjava/classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java
index aad3044..78fad1a 100644
--- a/libjava/classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java
+++ b/libjava/classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java
@@ -462,7 +462,7 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
                                int dataType,
                                boolean required,
                                String defaultValue,
-                               List enumeratedValues)
+                               List<String> enumeratedValues)
   {
     IIOMetadataNode node = (IIOMetadataNode) nodes.get (elementName);
     node.setAttributeNode (new IIOMetadataNodeAttrEnumerated (node,
@@ -568,8 +568,8 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
     node.setUserObject (null);
   }
 
-  protected void addObjectValue (String elementName, Class classType,
-                                 boolean required, Object defaultValue)
+  protected <T> void addObjectValue (String elementName, Class<T> classType,
+                                     boolean required, T defaultValue)
   {
     IIOMetadataNode node = (IIOMetadataNode) nodes.get (elementName);
     addNodeObject (node, new NodeObject (node,
@@ -578,9 +578,9 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
                                          defaultValue));
   }
 
-  protected void addObjectValue (String elementName, Class classType,
-                                 boolean required, Object defaultValue,
-                                 List enumeratedValues)
+  protected <T> void addObjectValue (String elementName, Class<T> classType,
+                                     boolean required, T defaultValue,
+                                     List<? extends T> enumeratedValues)
   {
     IIOMetadataNode node = (IIOMetadataNode) nodes.get (elementName);
     addNodeObject (node, new NodeObjectEnumerated (node,
@@ -590,12 +590,13 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
                                                    enumeratedValues));
   }
 
-  protected void addObjectValue (String elementName, Class classType,
-                                 Object defaultValue,
-                                 Comparable minValue,
-                                 Comparable maxValue,
-                                 boolean minInclusive,
-                                 boolean maxInclusive)
+  protected <T extends Object & Comparable<? super T>>
+  void addObjectValue (String elementName, Class<T> classType,
+                       T defaultValue,
+                       Comparable<? super T> minValue,
+                       Comparable<? super T> maxValue,
+                       boolean minInclusive,
+                       boolean maxInclusive)
   {
     IIOMetadataNode node = (IIOMetadataNode) nodes.get (elementName);
     addNodeObject (node, new NodeObjectBounded (node,
@@ -607,7 +608,7 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
                                                 maxInclusive));
   }
 
-  protected void addObjectValue (String elementName, Class classType,
+  protected void addObjectValue (String elementName, Class<?> classType,
                                  int arrayMinLength, int arrayMaxLength)
   {
     IIOMetadataNode node = (IIOMetadataNode) nodes.get (elementName);
@@ -836,7 +837,7 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
     return ((Integer) ((NodeObjectArray) getNodeObject (node)).getArrayMinLength ()).intValue();
   }
 
-  public Class getObjectClass (String elementName)
+  public Class<?> getObjectClass (String elementName)
   {
     IIOMetadataNode node = (IIOMetadataNode) nodes.get (elementName);
     return getNodeObject (node).getClassType ();
@@ -854,13 +855,13 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
     return ((NodeObjectEnumerated) getNodeObject (node)).getEnumerations ();
   }
 
-  public Comparable getObjectMaxValue (String elementName)
+  public Comparable<?> getObjectMaxValue (String elementName)
   {
     IIOMetadataNode node = (IIOMetadataNode) nodes.get (elementName);
     return ((NodeObjectBounded) getNodeObject (node)).getMaxValue ();
   }
 
-  public Comparable getObjectMinValue (String elementName)
+  public Comparable<?> getObjectMinValue (String elementName)
   {
     IIOMetadataNode node = (IIOMetadataNode) nodes.get (elementName);
     return ((NodeObjectBounded) getNodeObject (node)).getMinValue ();