2005-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* gnu/java/awt/peer/qt/QtGraphics.java:
	(getRenderingHints()): Create a clone as no such
	constructor exists with generic typing.
	(setRenderingHints(Map<?,?>)): Added parametric typing
	and fixed use of RenderingHints constructor.
	* java/awt/AWTEventMulticaster.java:
	(getListeners(EventListener,Class<T>)): Added generic
	typing.
	* java/awt/Component.java:
	(getListeners(Class<T>)): Likewise.
	(getFocusTraversalKeys(int)): Likewise.
	* java/awt/Font.java:
	(Font(Map<? extends Attribute,?>)): Likewise.
	(deriveFont(Map<? extends Attribute,?>)): Likewise.
	(getAttributes()): Likewise.
	(getAvailableAttributes()): Simplified naming with static import.
	(getFont(Map<? extends Attribute,?>)): Added generic typing.
	* java/awt/Graphics2D.java:
	(setRenderingHints(Map<?,?>)): Likewise.
	(addRenderingHints(Map<?,?>)): Likewise.
	* java/awt/KeyboardFocusManager.java:
	(setDefaultFocusTraversalKeys(int,Set<? extends KeyStroke>)):
	Likewise.
	(getKeyEventDispatchers()): Likewise.
	(getKeyEventPostProcessors()): Likewise.
	* java/awt/MenuItem.java:
	(getListeners(Class<T>)): Likewise.
	* java/awt/RenderingHints.java:
	(RenderingHints(Map<Key,?>)): Likewise.
	(putAll(Map<?,?>)): Likewise.
	(keySet()): Likewise.
	(values()): Likewise.
	(entrySet()): Likewise.
	* java/awt/Toolkit.java:
	(desktopProperties): Likewise.
	(createDragGestureRecognizer(Class<T>,DragSource,Component,int,
	DragGestureListener)): Likewise.
	(mapInputMethodHighlight(InputMethodHighlight)): Likewise.
	* java/lang/Class.java:
	(getDeclaringClass()): Likewise.
	* java/lang/Enum.java:
	(valueOf(Class<S>,String)): Fixed return type.
	* java/lang/SecurityManager.java:
	(checkMemberAccess(Class<?>,int)): Likewise.
	* java/lang/reflect/Array.java:
	(newInstance(Class<?>,int)): Likewise.
	(newInstance(Class<?>,int[])): Likewise.
	* vm/reference/java/lang/reflect/Constructor.java:
	(getTypeParameters()): Type parameter changed from ? to Constructor.
	* vm/reference/java/lang/reflect/Field.java:
	(getDeclaringClass()): Added generic typing.
	(getType()): Likewise.
	* vm/reference/java/lang/reflect/Method.java:
	(getDeclaringClass()): Likewise.
	(getExceptionTypes()): Likewise.
	(getParameterTypes()): Likewise.

17 files changed, 127 insertions, 58 deletions

diff --git a/ChangeLog b/ChangeLog
index 4595e2ad8..7f9d77b3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,62 @@
+2005-09-28  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* gnu/java/awt/peer/qt/QtGraphics.java:
+	(getRenderingHints()): Create a clone as no such
+	constructor exists with generic typing.
+	(setRenderingHints(Map<?,?>)): Added parametric typing
+	and fixed use of RenderingHints constructor.
+	* java/awt/AWTEventMulticaster.java:
+	(getListeners(EventListener,Class<T>)): Added generic
+	typing.
+	* java/awt/Component.java:
+	(getListeners(Class<T>)): Likewise.
+	(getFocusTraversalKeys(int)): Likewise.
+	* java/awt/Font.java:
+	(Font(Map<? extends Attribute,?>)): Likewise.
+	(deriveFont(Map<? extends Attribute,?>)): Likewise.
+	(getAttributes()): Likewise.
+	(getAvailableAttributes()): Simplified naming with static import.
+	(getFont(Map<? extends Attribute,?>)): Added generic typing.
+	* java/awt/Graphics2D.java:
+	(setRenderingHints(Map<?,?>)): Likewise.
+	(addRenderingHints(Map<?,?>)): Likewise.
+	* java/awt/KeyboardFocusManager.java:
+	(setDefaultFocusTraversalKeys(int,Set<? extends KeyStroke>)):
+	Likewise.
+	(getKeyEventDispatchers()): Likewise.
+	(getKeyEventPostProcessors()): Likewise.
+	* java/awt/MenuItem.java:
+	(getListeners(Class<T>)): Likewise.
+	* java/awt/RenderingHints.java:
+	(RenderingHints(Map<Key,?>)): Likewise.
+	(putAll(Map<?,?>)): Likewise.
+	(keySet()): Likewise.
+	(values()): Likewise.
+	(entrySet()): Likewise.
+	* java/awt/Toolkit.java:
+	(desktopProperties): Likewise.
+	(createDragGestureRecognizer(Class<T>,DragSource,Component,int,
+	DragGestureListener)): Likewise.
+	(mapInputMethodHighlight(InputMethodHighlight)): Likewise.
+	* java/lang/Class.java:
+	(getDeclaringClass()): Likewise.
+	* java/lang/Enum.java:
+	(valueOf(Class<S>,String)): Fixed return type.
+	* java/lang/SecurityManager.java:
+	(checkMemberAccess(Class<?>,int)): Likewise.
+	* java/lang/reflect/Array.java:
+	(newInstance(Class<?>,int)): Likewise.
+	(newInstance(Class<?>,int[])): Likewise.
+	* vm/reference/java/lang/reflect/Constructor.java:
+	(getTypeParameters()): Type parameter changed from ? to Constructor.
+	* vm/reference/java/lang/reflect/Field.java:
+	(getDeclaringClass()): Added generic typing.
+	(getType()): Likewise.
+	* vm/reference/java/lang/reflect/Method.java:
+	(getDeclaringClass()): Likewise.
+	(getExceptionTypes()): Likewise.
+	(getParameterTypes()): Likewise.
+
 2005-09-27  Tom Tromey  <tromey@redhat.com>
 
 	* java/sql/Timestamp.java (compareTo(Date)): Changed argument type
diff --git a/gnu/java/awt/peer/qt/QtGraphics.java b/gnu/java/awt/peer/qt/QtGraphics.java
index f9b4f2672..55c2a70cf 100644
--- a/gnu/java/awt/peer/qt/QtGraphics.java
+++ b/gnu/java/awt/peer/qt/QtGraphics.java
@@ -661,12 +661,13 @@ public abstract class QtGraphics extends Graphics2D
 
   public RenderingHints getRenderingHints()
   {
-    return new RenderingHints( renderingHints );
+    return (RenderingHints) renderingHints.clone();
   }
   
-  public void setRenderingHints(Map hints)
+  public void setRenderingHints(Map<?,?> hints)
   {
-    renderingHints = new RenderingHints( hints );
+    renderingHints = new RenderingHints( null );
+    renderingHints.putAll(hints);
     updateRenderingHints();
   }
 
diff --git a/java/awt/AWTEventMulticaster.java b/java/awt/AWTEventMulticaster.java
index f7b9163cf..07a6ffc20 100644
--- a/java/awt/AWTEventMulticaster.java
+++ b/java/awt/AWTEventMulticaster.java
@@ -1175,16 +1175,17 @@ public class AWTEventMulticaster
    * @throws IllegalArgumentException if type is Void.TYPE
    * @since 1.4
    */
-  public static EventListener[] getListeners(EventListener l, Class type)
+  public static <T extends EventListener> T[] getListeners(EventListener l,
+							   Class<T> type)
   {
-    ArrayList list = new ArrayList();
+    ArrayList<EventListener> list = new ArrayList<EventListener>();
     if (l instanceof AWTEventMulticaster)
       ((AWTEventMulticaster) l).getListeners(list, type);
     else if (type.isInstance(l))
       list.add(l);
     EventListener[] r = (EventListener[]) Array.newInstance(type, list.size());
     list.toArray(r);
-    return r;
+    return (T[]) r;
   }
 
   /**
diff --git a/java/awt/Component.java b/java/awt/Component.java
index 7985a0c20..16caa7c34 100644
--- a/java/awt/Component.java
+++ b/java/awt/Component.java
@@ -2816,29 +2816,29 @@ public abstract class Component
    * @see #getPropertyChangeListeners()
    * @since 1.3
    */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
     if (listenerType == ComponentListener.class)
-      return getComponentListeners();
+      return (T[]) getComponentListeners();
     if (listenerType == FocusListener.class)
-      return getFocusListeners();
+      return (T[]) getFocusListeners();
     if (listenerType == HierarchyListener.class)
-      return getHierarchyListeners();
+      return (T[]) getHierarchyListeners();
     if (listenerType == HierarchyBoundsListener.class)
-      return getHierarchyBoundsListeners();
+      return (T[]) getHierarchyBoundsListeners();
     if (listenerType == KeyListener.class)
-      return getKeyListeners();
+      return (T[]) getKeyListeners();
     if (listenerType == MouseListener.class)
-      return getMouseListeners();
+      return (T[]) getMouseListeners();
     if (listenerType == MouseMotionListener.class)
-      return getMouseMotionListeners();
+      return (T[]) getMouseMotionListeners();
     if (listenerType == MouseWheelListener.class)
-      return getMouseWheelListeners();
+      return (T[]) getMouseWheelListeners();
     if (listenerType == InputMethodListener.class)
-      return getInputMethodListeners();
+      return (T[]) getInputMethodListeners();
     if (listenerType == PropertyChangeListener.class)
-      return getPropertyChangeListeners();
-    return (EventListener[]) Array.newInstance(listenerType, 0);
+      return (T[]) getPropertyChangeListeners();
+    return (T[]) Array.newInstance(listenerType, 0);
   }
 
   /**
@@ -3691,14 +3691,14 @@ public abstract class Component
    * 
    * @since 1.4
    */
-  public Set getFocusTraversalKeys (int id)
+  public Set<AWTKeyStroke> getFocusTraversalKeys (int id)
   {
     if (id != KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS &&
         id != KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS &&
         id != KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS)
       throw new IllegalArgumentException();
 
-    Set s = null;
+    Set<AWTKeyStroke> s = null;
 
     if (focusTraversalKeys != null)
       s = focusTraversalKeys[id];
diff --git a/java/awt/Font.java b/java/awt/Font.java
index 5de94586e..1494ea633 100644
--- a/java/awt/Font.java
+++ b/java/awt/Font.java
@@ -44,6 +44,7 @@ import gnu.java.awt.peer.ClasspathFontPeer;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
 import java.awt.font.LineMetrics;
+import java.awt.font.TextAttribute;
 import java.awt.font.TextLayout;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
@@ -51,7 +52,7 @@ import java.awt.peer.FontPeer;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
-import java.text.AttributedCharacterIterator;
+import static java.text.AttributedCharacterIterator.Attribute;
 import java.text.CharacterIterator;
 import java.text.StringCharacterIterator;
 import java.util.HashMap;
@@ -348,7 +349,7 @@ private static final long serialVersionUID = -4206021311591459213L;
     this.peer = getPeerFromToolkit (name, attrs);
   }
 
-  public Font (Map attrs)
+  public Font (Map<? extends Attribute, ?> attrs)
   {
     this(null, attrs);
   }
@@ -769,7 +770,7 @@ private static final long serialVersionUID = -4206021311591459213L;
   *
   * @since 1.2
   */
-  public Font deriveFont (Map attributes)
+  public Font deriveFont (Map<? extends Attribute, ?> attributes)
 {
     return peer.deriveFont (this, attributes);
 }
@@ -783,9 +784,9 @@ private static final long serialVersionUID = -4206021311591459213L;
   * @see java.text.AttributedCharacterIterator.Attribute
   * @see java.awt.font.TextAttribute
   */
-  public Map getAttributes ()
+  public Map<TextAttribute,?> getAttributes ()
 {
-    return peer.getAttributes (this);
+  return peer.getAttributes (this);
 }
 
 /**
@@ -797,7 +798,7 @@ private static final long serialVersionUID = -4206021311591459213L;
   * @see java.text.AttributedCharacterIterator.Attribute
   * @see java.awt.font.TextAttribute
   */
-  public AttributedCharacterIterator.Attribute[] getAvailableAttributes()
+  public Attribute[] getAvailableAttributes()
 {
     return peer.getAvailableAttributes (this);
 }
@@ -862,7 +863,7 @@ private static final long serialVersionUID = -4206021311591459213L;
   *
   * @see java.awt.font.TextAttribute  
   */
-  public static Font getFont (Map attributes)
+  public static Font getFont (Map<? extends Attribute, ?> attributes)
 {
     return getFontFromToolkit (null, attributes);
 }
diff --git a/java/awt/Graphics2D.java b/java/awt/Graphics2D.java
index 3faa9dc0c..de71993ae 100644
--- a/java/awt/Graphics2D.java
+++ b/java/awt/Graphics2D.java
@@ -116,9 +116,9 @@ public abstract class Graphics2D extends Graphics
 
   public abstract Object getRenderingHint(RenderingHints.Key hintKey);
   
-  public abstract void setRenderingHints(Map hints);
+  public abstract void setRenderingHints(Map<?,?> hints);
 
-  public abstract void addRenderingHints(Map hints);
+  public abstract void addRenderingHints(Map<?,?> hints);
 
   public abstract RenderingHints getRenderingHints();
 
diff --git a/java/awt/KeyboardFocusManager.java b/java/awt/KeyboardFocusManager.java
index a73d31ff7..a61a9a810 100644
--- a/java/awt/KeyboardFocusManager.java
+++ b/java/awt/KeyboardFocusManager.java
@@ -600,7 +600,9 @@ public abstract class KeyboardFocusManager
    * @see #UP_CYCLE_TRAVERSAL_KEYS
    * @see #DOWN_CYCLE_TRAVERSAL_KEYS
    */
-  public void setDefaultFocusTraversalKeys (int id, Set keystrokes)
+  public void setDefaultFocusTraversalKeys (int id,
+					    Set<? extends AWTKeyStroke>
+					    keystrokes)
   {
     if (id != KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS &&
         id != KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS &&
@@ -1034,9 +1036,9 @@ public abstract class KeyboardFocusManager
    * @return A list of explicitly registered key event dispatchers.
    * @see KeyboardFocusManager#addKeyEventDispatcher(java.awt.KeyEventDispatcher)
    */
-  protected List getKeyEventDispatchers ()
+  protected List<KeyEventDispatcher> getKeyEventDispatchers ()
   {
-    return (List) keyEventDispatchers.clone ();
+    return (List<KeyEventDispatcher>) keyEventDispatchers.clone ();
   }
 
   /**
@@ -1091,9 +1093,9 @@ public abstract class KeyboardFocusManager
    * @return A list of explicitly registered key event post processors.
    * @see KeyboardFocusManager#addKeyEventPostProcessor(java.awt.KeyEventPostProcessor)
    */
-  protected List getKeyEventPostProcessors ()
+  protected List<KeyEventPostProcessor> getKeyEventPostProcessors ()
   {
-    return (List) keyEventPostProcessors.clone ();
+    return (List<KeyEventPostProcessor>) keyEventPostProcessors.clone ();
   }
 
   /**
diff --git a/java/awt/MenuItem.java b/java/awt/MenuItem.java
index 3e39d118a..cc4951b58 100644
--- a/java/awt/MenuItem.java
+++ b/java/awt/MenuItem.java
@@ -517,11 +517,11 @@ removeActionListener(ActionListener l)
  * ClassClassException is thrown.
  * @since 1.3 
  */
-  public EventListener[] getListeners(Class listenerType)
+  public <T extends EventListener> T[] getListeners(Class<T> listenerType)
   {
     if (listenerType == ActionListener.class)
-      return getActionListeners();
-    return (EventListener[]) Array.newInstance(listenerType, 0);
+      return (T[]) getActionListeners();
+    return (T[]) Array.newInstance(listenerType, 0);
   }
 
 /*************************************************************************/
diff --git a/java/awt/RenderingHints.java b/java/awt/RenderingHints.java
index 0e1db72b7..ce327e369 100644
--- a/java/awt/RenderingHints.java
+++ b/java/awt/RenderingHints.java
@@ -54,7 +54,8 @@ import java.util.Set;
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
  * @author Eric Blake (ebb9@email.byu.edu)
  */
-public class RenderingHints implements Map, Cloneable
+public class RenderingHints
+  implements Map<Object,Object>, Cloneable
 {
   /**
    * The base class used to represent keys.
@@ -550,7 +551,7 @@ public class RenderingHints implements Map, Cloneable
    * @param init  a map containing a collection of hints (<code>null</code> 
    *              permitted).
    */
-  public RenderingHints(Map init)
+  public RenderingHints(Map<Key,?> init)
   {
     if (init != null)
       putAll(init);
@@ -704,7 +705,7 @@ public class RenderingHints implements Map, Cloneable
    * @throws IllegalArgumentException if the map contains a value that is
    *         not compatible with its key.
    */
-  public void putAll(Map m)
+  public void putAll(Map<?,?> m)
   {
     // preprocess map to generate appropriate exceptions
     Iterator iterator = m.keySet().iterator();
@@ -723,7 +724,7 @@ public class RenderingHints implements Map, Cloneable
    * 
    * @return A set of keys.
    */
-  public Set keySet()
+  public Set<Object> keySet()
   {
     return hintMap.keySet();
   }
@@ -735,7 +736,7 @@ public class RenderingHints implements Map, Cloneable
    * 
    * @return A collection of values.
    */
-  public Collection values()
+  public Collection<Object> values()
   {
     return hintMap.values();
   }
@@ -745,7 +746,7 @@ public class RenderingHints implements Map, Cloneable
    * 
    * @return A set of entries.
    */
-  public Set entrySet()
+  public Set<Map.Entry<Object,Object>> entrySet()
   {
     return Collections.unmodifiableSet(hintMap.entrySet());
   }
diff --git a/java/awt/Toolkit.java b/java/awt/Toolkit.java
index 2ca88b6f5..14282f666 100644
--- a/java/awt/Toolkit.java
+++ b/java/awt/Toolkit.java
@@ -47,6 +47,7 @@ import java.awt.dnd.DragSource;
 import java.awt.dnd.peer.DragSourceContextPeer;
 import java.awt.event.AWTEventListener;
 import java.awt.event.KeyEvent;
+import java.awt.font.TextAttribute;
 import java.awt.im.InputMethodHighlight;
 import java.awt.image.ColorModel;
 import java.awt.image.ImageObserver;
@@ -76,6 +77,7 @@ import java.awt.peer.WindowPeer;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.net.URL;
+import java.util.Hashtable;
 import java.util.Map;
 import java.util.Properties;
 
@@ -108,7 +110,8 @@ public abstract class Toolkit
   /** The toolkit properties. */
   private static Properties props = new Properties();
 
-  protected final Map desktopProperties = new Properties();
+  protected final Map<String,Object> desktopProperties = 
+    new Hashtable<String,Object>();
 
   protected final PropertyChangeSupport desktopPropsSupport
     = new PropertyChangeSupport(this);
@@ -906,8 +909,8 @@ public abstract class Toolkit
   /**
    * @since 1.3
    */
-  public DragGestureRecognizer
-    createDragGestureRecognizer(Class recognizer, DragSource ds,
+  public <T extends DragGestureRecognizer> T
+    createDragGestureRecognizer(Class<T> recognizer, DragSource ds,
                                 Component comp, int actions,
                                 DragGestureListener l)
   {
@@ -997,5 +1000,6 @@ public abstract class Toolkit
   /**
    * @since 1.3
    */
-  public abstract Map mapInputMethodHighlight(InputMethodHighlight highlight);
+  public abstract Map<TextAttribute,?>
+    mapInputMethodHighlight(InputMethodHighlight highlight);
 } // class Toolkit
diff --git a/java/lang/Class.java b/java/lang/Class.java
index 12fcf22e3..23226e6c0 100644
--- a/java/lang/Class.java
+++ b/java/lang/Class.java
@@ -523,7 +523,7 @@ public final class Class<T>
    * @return the declaring class of this class
    * @since 1.1
    */
-  public Class getDeclaringClass()
+  public Class<?> getDeclaringClass()
   {
     return VMClass.getDeclaringClass (this);
   }
diff --git a/java/lang/Enum.java b/java/lang/Enum.java
index 61852eb40..f115090d3 100644
--- a/java/lang/Enum.java
+++ b/java/lang/Enum.java
@@ -69,7 +69,7 @@ public abstract class Enum<T extends Enum<T>>
    * the enum etype.
    */
   @SuppressWarnings("unchecked")
-  public static <S extends Enum<S>> Enum valueOf(Class<S> etype, String s)
+  public static <S extends Enum<S>> S valueOf(Class<S> etype, String s)
   {
     if (etype == null || s == null)
       throw new NullPointerException();
diff --git a/java/lang/SecurityManager.java b/java/lang/SecurityManager.java
index 0e1ea64a0..db2c5447d 100644
--- a/java/lang/SecurityManager.java
+++ b/java/lang/SecurityManager.java
@@ -986,7 +986,7 @@ public class SecurityManager
    * @see Member#PUBLIC
    * @since 1.1
    */
-  public void checkMemberAccess(Class c, int memberType)
+  public void checkMemberAccess(Class<?> c, int memberType)
   {
     if (c == null)
       throw new NullPointerException();
diff --git a/java/lang/reflect/Array.java b/java/lang/reflect/Array.java
index 35c77da36..f64fb7051 100644
--- a/java/lang/reflect/Array.java
+++ b/java/lang/reflect/Array.java
@@ -104,7 +104,7 @@ public final class Array
    * @throws NegativeArraySizeException when length is less than 0
    * @throws OutOfMemoryError if memory allocation fails
    */
-  public static Object newInstance(Class componentType, int length)
+  public static Object newInstance(Class<?> componentType, int length)
   {
     if (! componentType.isPrimitive())
       return createObjectArray(componentType, length);
@@ -152,7 +152,7 @@ public final class Array
    *         than 0
    * @throws OutOfMemoryError if memory allocation fails
    */
-  public static Object newInstance(Class componentType, int[] dimensions)
+  public static Object newInstance(Class<?> componentType, int[] dimensions)
   {
     if (dimensions.length <= 0)
       throw new IllegalArgumentException ("Empty dimensions array.");
diff --git a/vm/reference/java/lang/reflect/Constructor.java b/vm/reference/java/lang/reflect/Constructor.java
index a5f7db791..64a779641 100644
--- a/vm/reference/java/lang/reflect/Constructor.java
+++ b/vm/reference/java/lang/reflect/Constructor.java
@@ -261,7 +261,7 @@ public final class Constructor<T>
    *         specification, version 3.
    * @since 1.5
    */
-  public TypeVariable<?>[] getTypeParameters()
+  public TypeVariable<Constructor<T>>[] getTypeParameters()
   {
     String sig = getSignature();
     MethodSignatureParser p = new MethodSignatureParser(this, sig);
diff --git a/vm/reference/java/lang/reflect/Field.java b/vm/reference/java/lang/reflect/Field.java
index eb680ac6f..af372076f 100644
--- a/vm/reference/java/lang/reflect/Field.java
+++ b/vm/reference/java/lang/reflect/Field.java
@@ -93,7 +93,7 @@ extends AccessibleObject implements Member
    * is a non-inherited member.
    * @return the class that declared this member
    */
-  public Class getDeclaringClass()
+  public Class<?> getDeclaringClass()
   {
     return declaringClass;
   }
@@ -122,7 +122,7 @@ extends AccessibleObject implements Member
    * Gets the type of this field.
    * @return the type of this field
    */
-  public native Class getType();
+  public native Class<?> getType();
 
   /**
    * Compare two objects to see if they are semantically equivalent.
diff --git a/vm/reference/java/lang/reflect/Method.java b/vm/reference/java/lang/reflect/Method.java
index 202e97b6b..4a0ffaac0 100644
--- a/vm/reference/java/lang/reflect/Method.java
+++ b/vm/reference/java/lang/reflect/Method.java
@@ -96,7 +96,7 @@ extends AccessibleObject implements Member, GenericDeclaration
    * is a non-inherited member.
    * @return the class that declared this member
    */
-  public Class getDeclaringClass()
+  public Class<?> getDeclaringClass()
   {
     return declaringClass;
   }
@@ -133,7 +133,7 @@ extends AccessibleObject implements Member, GenericDeclaration
    *
    * @return a list of the types of the method's parameters
    */
-  public native Class[] getParameterTypes();
+  public native Class<?>[] getParameterTypes();
 
   /**
    * Get the exception types this method says it throws, in no particular
@@ -142,7 +142,7 @@ extends AccessibleObject implements Member, GenericDeclaration
    *
    * @return a list of the types in the method's throws clause
    */
-  public native Class[] getExceptionTypes();
+  public native Class<?>[] getExceptionTypes();
 
   /**
    * Compare two objects to see if they are semantically equivalent.