2005-10-12 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* java/awt/datatransfer/DataFlavor.java:
	(DataFlavor(Class<?>,String,String): Genericized.
	* java/awt/dnd/DragGestureEvent.java:
	(DragGestureEvent(DragGestureRecognizer,int,Point,
	List<? extends InputEvent>)): Likewise.
	(iterator()): Likewise.
	* java/awt/dnd/DragSource.java:
	(createDragGestureRecognizer(Class<T>,Component,int,
	DragGestureListener)): Likewise.
	* java/awt/dnd/DropTargetContext.java:
	(getCurrentDataFlavorsAsList()): Likewise.
	* java/awt/dnd/DropTargetDragEvent.java:
	(getCurrentDataFlavorsAsList()): Likewise.
	* java/awt/dnd/DropTargetDropEvent.java:
	(getCurrentDataFlavorsAsList()): Likewise.
	* java/awt/font/TextLayout.java:
	(TextLayout(String,Map<? extends
	AttributedCharacterIterator.Attribute>, FontRenderContext)): Likewise.
	* java/awt/image/BufferedImage.java:
	(BufferedImage(ColorModel,WritableRaster,boolean,Hashtable<?,?>)):
	Likewise.
	* java/awt/image/ImageConsumer.java:
	(setProperties(Hashtable<?,?>)): Likewise.
	* java/awt/image/MemoryImageSource.java:
	(MemoryImageSource(int,int,ColorModel,byte[],int,int,Hashtable<?,?>)):
	Likewise.
	(MemoryImageSource(int,int,ColorModel,int[],int,int,Hashtable<?,?>)):
	Likewise.
	* java/awt/image/RenderedImage.java:
	(getSources()): Likewise.
	* java/awt/image/renderable/ParameterBlock.java:
	(sources): Likewise.
	(parameters): Likewise.
	(ParameterBlock()): Likewise.
	(ParameterBlock(Vector<Object>)): Likewise.
	(ParameterBlock(Vector<Object>,Vector<Object>)): Likewise.
	(clone()): Added casts to handle new Vector type.
	(getSources()): Genericized.
	(setSources(Vector<Object>)): Likewise.
	(getParameters()): Likewise.
	(setParameters(Vector<Object>)): Likewise.
	* java/awt/image/renderable/RenderableImage.java:
	(getSources()): Likewise.
	* javax/swing/tree/DefaultMutableTreeNode.java:
	(children): Likewise.
	(getSharedAncestor(DefaultMutableTreeNode)): Likewise.
	(getDepth()): Likewise.
	(pathFromAncestorEnumeration(TreeNode)): Likewise.
	(PostOrderEnumeration)): Likewise.
	* javax/swing/undo/CompoundEdit.java:
	(edits): Likewise.
	(CompoundEdit()): Likewise.
	(undo()): Likewise.
	(redo()): Likewise.
	(lastEdit()): Likewise.
	(die()): Likewise.
	(isSignificant()): Likewise.
	* javax/swing/undo/UndoableEditSupport.java:
	(listeners): Likewise.
	(getUndoableEditListeners()): Likewise.
	* lib/Makefile.am:
	Turn off listing unused imports (at least for now).
	* org/omg/CosNaming/_NamingContextExtImplBase.java:
	(_methods): Likewise.
	* org/omg/CosNaming/_NamingContextImplBase.java:
	(methods): Likewise.
	* vm/reference/java/lang/reflect/Method.java:
	(getTypeParameters()): Corrected return type.

21 files changed, 122 insertions, 50 deletions

diff --git a/ChangeLog b/ChangeLog
index 8348f6b6f..6cf092a22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,74 @@
+2005-10-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* java/awt/datatransfer/DataFlavor.java:
+	(DataFlavor(Class<?>,String,String): Genericized.
+	* java/awt/dnd/DragGestureEvent.java:
+	(DragGestureEvent(DragGestureRecognizer,int,Point,
+	List<? extends InputEvent>)): Likewise.
+	(iterator()): Likewise.
+	* java/awt/dnd/DragSource.java:
+	(createDragGestureRecognizer(Class<T>,Component,int,
+	DragGestureListener)): Likewise.
+	* java/awt/dnd/DropTargetContext.java:
+	(getCurrentDataFlavorsAsList()): Likewise.
+	* java/awt/dnd/DropTargetDragEvent.java:
+	(getCurrentDataFlavorsAsList()): Likewise.
+	* java/awt/dnd/DropTargetDropEvent.java:
+	(getCurrentDataFlavorsAsList()): Likewise.
+	* java/awt/font/TextLayout.java:
+	(TextLayout(String,Map<? extends
+	AttributedCharacterIterator.Attribute>, FontRenderContext)): Likewise.
+	* java/awt/image/BufferedImage.java:
+	(BufferedImage(ColorModel,WritableRaster,boolean,Hashtable<?,?>)):
+	Likewise.
+	* java/awt/image/ImageConsumer.java:
+	(setProperties(Hashtable<?,?>)): Likewise.
+	* java/awt/image/MemoryImageSource.java:
+	(MemoryImageSource(int,int,ColorModel,byte[],int,int,Hashtable<?,?>)):
+	Likewise.
+	(MemoryImageSource(int,int,ColorModel,int[],int,int,Hashtable<?,?>)):
+	Likewise.	
+	* java/awt/image/RenderedImage.java:
+	(getSources()): Likewise.
+	* java/awt/image/renderable/ParameterBlock.java:
+	(sources): Likewise.
+	(parameters): Likewise.
+	(ParameterBlock()): Likewise.
+	(ParameterBlock(Vector<Object>)): Likewise.
+	(ParameterBlock(Vector<Object>,Vector<Object>)): Likewise.
+	(clone()): Added casts to handle new Vector type.
+	(getSources()): Genericized.
+	(setSources(Vector<Object>)): Likewise.
+	(getParameters()): Likewise.
+	(setParameters(Vector<Object>)): Likewise.
+	* java/awt/image/renderable/RenderableImage.java:
+	(getSources()): Likewise.
+	* javax/swing/tree/DefaultMutableTreeNode.java:
+	(children): Likewise.
+	(getSharedAncestor(DefaultMutableTreeNode)): Likewise.
+	(getDepth()): Likewise.
+	(pathFromAncestorEnumeration(TreeNode)): Likewise.
+	(PostOrderEnumeration)): Likewise.
+	* javax/swing/undo/CompoundEdit.java:
+	(edits): Likewise.
+	(CompoundEdit()): Likewise.
+	(undo()): Likewise.
+	(redo()): Likewise.
+	(lastEdit()): Likewise.
+	(die()): Likewise.
+	(isSignificant()): Likewise.
+	* javax/swing/undo/UndoableEditSupport.java:
+	(listeners): Likewise.
+	(getUndoableEditListeners()): Likewise.
+	* lib/Makefile.am:
+	Turn off listing unused imports (at least for now).
+	* org/omg/CosNaming/_NamingContextExtImplBase.java:
+	(_methods): Likewise.
+	* org/omg/CosNaming/_NamingContextImplBase.java:
+	(methods): Likewise.
+	* vm/reference/java/lang/reflect/Method.java:
+	(getTypeParameters()): Corrected return type.
+
 2005-10-06  Tom Tromey  <tromey@redhat.com>
 
 	* java/util/ListResourceBundle.java (getKeys): Fixed return type.
diff --git a/java/awt/datatransfer/DataFlavor.java b/java/awt/datatransfer/DataFlavor.java
index 7678f1637..189920f96 100644
--- a/java/awt/datatransfer/DataFlavor.java
+++ b/java/awt/datatransfer/DataFlavor.java
@@ -231,7 +231,7 @@ DataFlavor()
  * Private constructor.
  */
 private
-DataFlavor(Class representationClass,
+DataFlavor(Class<?> representationClass,
 	   String mimeType,
 	   String humanPresentableName)
 {
diff --git a/java/awt/dnd/DragGestureEvent.java b/java/awt/dnd/DragGestureEvent.java
index 9f2bc7c98..ab03a33c8 100644
--- a/java/awt/dnd/DragGestureEvent.java
+++ b/java/awt/dnd/DragGestureEvent.java
@@ -68,7 +68,7 @@ public class DragGestureEvent extends EventObject
   private final int action;
 
   public DragGestureEvent(DragGestureRecognizer dgr, int action, Point origin,
-                          List events)
+                          List<? extends InputEvent> events)
   {
     super(dgr);
     if (origin == null || events == null)
@@ -93,7 +93,7 @@ public class DragGestureEvent extends EventObject
   {
     return origin;
   }
-  public Iterator iterator()
+  public Iterator<InputEvent> iterator()
   {
     return null;
   }
diff --git a/java/awt/dnd/DragSource.java b/java/awt/dnd/DragSource.java
index 380572db8..09c9fc48e 100644
--- a/java/awt/dnd/DragSource.java
+++ b/java/awt/dnd/DragSource.java
@@ -172,8 +172,8 @@ public class DragSource implements Serializable
     return flavorMap;
   }
 
-  public DragGestureRecognizer
-    createDragGestureRecognizer(Class recognizer, Component c, int actions,
+  public <T extends DragGestureRecognizer> T
+    createDragGestureRecognizer(Class<T> recognizer, Component c, int actions,
                                 DragGestureListener dgl)
   {
     return Toolkit.getDefaultToolkit ()
@@ -245,11 +245,11 @@ public class DragSource implements Serializable
   {
     if (listenerType == DragSourceListener.class)
       return DnDEventMulticaster.getListeners (dragSourceListener,
-                                               listenerType);
+					       listenerType);
 
     if (listenerType == DragSourceMotionListener.class)
       return DnDEventMulticaster.getListeners (dragSourceMotionListener,
-                                               listenerType);
+					       listenerType);
 
     // Return an empty EventListener array.
     return (T[]) new EventListener [0];
diff --git a/java/awt/dnd/DropTargetContext.java b/java/awt/dnd/DropTargetContext.java
index b2e52405f..ee15bdb7c 100644
--- a/java/awt/dnd/DropTargetContext.java
+++ b/java/awt/dnd/DropTargetContext.java
@@ -161,7 +161,7 @@ public class DropTargetContext implements Serializable
     return null;
   }
 
-  protected List getCurrentDataFlavorsAsList ()
+  protected List<DataFlavor> getCurrentDataFlavorsAsList ()
   {
     return Arrays.asList (getCurrentDataFlavors ());
   }
diff --git a/java/awt/dnd/DropTargetDragEvent.java b/java/awt/dnd/DropTargetDragEvent.java
index 6cdc3a292..63d62296e 100644
--- a/java/awt/dnd/DropTargetDragEvent.java
+++ b/java/awt/dnd/DropTargetDragEvent.java
@@ -107,7 +107,7 @@ public class DropTargetDragEvent extends DropTargetEvent
     return context.getCurrentDataFlavors ();
   }
   
-  public List getCurrentDataFlavorsAsList ()
+  public List<DataFlavor> getCurrentDataFlavorsAsList ()
   {
     return context.getCurrentDataFlavorsAsList ();
   }
diff --git a/java/awt/dnd/DropTargetDropEvent.java b/java/awt/dnd/DropTargetDropEvent.java
index 0c0777f78..399a01c4f 100644
--- a/java/awt/dnd/DropTargetDropEvent.java
+++ b/java/awt/dnd/DropTargetDropEvent.java
@@ -123,7 +123,7 @@ public class DropTargetDropEvent extends DropTargetEvent
     return context.getCurrentDataFlavors ();
   }
 
-  public List getCurrentDataFlavorsAsList ()
+  public List<DataFlavor> getCurrentDataFlavorsAsList ()
   {
     return context.getCurrentDataFlavorsAsList ();
   }
diff --git a/java/awt/font/TextLayout.java b/java/awt/font/TextLayout.java
index bb641614a..b7b1030f2 100644
--- a/java/awt/font/TextLayout.java
+++ b/java/awt/font/TextLayout.java
@@ -88,7 +88,7 @@ public final class TextLayout implements Cloneable
     peer = tk.getClasspathTextLayoutPeer(as, frc);
   }
 
-  public TextLayout (String string, Map attributes, FontRenderContext frc)  
+  public TextLayout (String string, Map<? extends AttributedCharacterIterator.Attribute,?> attributes, FontRenderContext frc)  
   {
     AttributedString as = new AttributedString (string, attributes);
     ClasspathToolkit tk = (ClasspathToolkit)(Toolkit.getDefaultToolkit ());
diff --git a/java/awt/image/BufferedImage.java b/java/awt/image/BufferedImage.java
index 124b81368..e2ac75078 100644
--- a/java/awt/image/BufferedImage.java
+++ b/java/awt/image/BufferedImage.java
@@ -224,7 +224,7 @@ public class BufferedImage extends Image
   public BufferedImage(ColorModel colormodel, 
 		       WritableRaster writableraster,
 		       boolean premultiplied,
-		       Hashtable properties)
+		       Hashtable<?,?> properties)
   {
     init(colormodel, writableraster, premultiplied, properties,
 	 TYPE_CUSTOM);
diff --git a/java/awt/image/ImageConsumer.java b/java/awt/image/ImageConsumer.java
index e1834c397..4a8ff2b14 100644
--- a/java/awt/image/ImageConsumer.java
+++ b/java/awt/image/ImageConsumer.java
@@ -136,7 +136,7 @@ public interface ImageConsumer
      *
      * @param props the list of properties associated with this image 
      */
-    void setProperties(Hashtable props);
+    void setProperties(Hashtable<?,?> props);
 
     /**
      * This <code>ColorModel</code> should indicate the model used by
diff --git a/java/awt/image/MemoryImageSource.java b/java/awt/image/MemoryImageSource.java
index c27e0bf73..94b51b455 100644
--- a/java/awt/image/MemoryImageSource.java
+++ b/java/awt/image/MemoryImageSource.java
@@ -76,7 +76,7 @@ public class MemoryImageSource implements ImageProducer
    * Constructs an ImageProducer from memory
    */
   public MemoryImageSource(int w, int h, ColorModel cm, byte[] pix, int off,
-                           int scan, Hashtable props)
+                           int scan, Hashtable<?,?> props)
   {
     width = w;
     height = h;
@@ -109,7 +109,7 @@ public class MemoryImageSource implements ImageProducer
      Constructs an ImageProducer from memory
   */
   public MemoryImageSource(int w, int h, ColorModel cm, int[] pix, int off,
-                           int scan, Hashtable props)
+                           int scan, Hashtable<?,?> props)
   {
     width = w;
     height = h;
diff --git a/java/awt/image/RenderedImage.java b/java/awt/image/RenderedImage.java
index b35f86021..067e9b98e 100644
--- a/java/awt/image/RenderedImage.java
+++ b/java/awt/image/RenderedImage.java
@@ -46,7 +46,7 @@ import java.util.Vector;
  */
 public interface RenderedImage
 {
-  Vector getSources();
+  Vector<RenderedImage> getSources();
   Object getProperty(String name);
   String[] getPropertyNames();
   ColorModel getColorModel();
diff --git a/java/awt/image/renderable/ParameterBlock.java b/java/awt/image/renderable/ParameterBlock.java
index 879d3c4fb..e484d6b87 100644
--- a/java/awt/image/renderable/ParameterBlock.java
+++ b/java/awt/image/renderable/ParameterBlock.java
@@ -45,20 +45,20 @@ import java.util.Vector;
 public class ParameterBlock implements Cloneable, Serializable
 {
   private static final long serialVersionUID = -7577115551785240750L;
-  protected Vector sources;
-  protected Vector parameters;
+  protected Vector<Object> sources;
+  protected Vector<Object> parameters;
 
   public ParameterBlock()
   {
-    this(new Vector(), new Vector());
+    this(new Vector<Object>(), new Vector<Object>());
   }
 
-  public ParameterBlock(Vector sources)
+  public ParameterBlock(Vector<Object> sources)
   {
-    this(sources, new Vector());
+    this(sources, new Vector<Object>());
   }
 
-  public ParameterBlock(Vector sources, Vector parameters)
+  public ParameterBlock(Vector<Object> sources, Vector<Object> parameters)
   {
     this.sources = sources;
     this.parameters = parameters;
@@ -80,9 +80,9 @@ public class ParameterBlock implements Cloneable, Serializable
   {
     ParameterBlock pb = (ParameterBlock) shallowClone();
     if (sources != null)
-      pb.sources = (Vector) sources.clone();
+      pb.sources = (Vector<Object>) sources.clone();
     if (parameters != null)
-      pb.parameters = (Vector) parameters.clone();
+      pb.parameters = (Vector<Object>) parameters.clone();
     return pb;
   }
 
@@ -119,12 +119,12 @@ public class ParameterBlock implements Cloneable, Serializable
     return sources.size();
   }
 
-  public Vector getSources()
+  public Vector<Object> getSources()
   {
     return sources;
   }
 
-  public void setSources(Vector sources)
+  public void setSources(Vector<Object> sources)
   {
     this.sources = sources;
   }
@@ -140,12 +140,12 @@ public class ParameterBlock implements Cloneable, Serializable
     return parameters.size();
   }
 
-  public Vector getParameters()
+  public Vector<Object> getParameters()
   {
     return parameters;
   }
 
-  public void setParameters(Vector parameters)
+  public void setParameters(Vector<Object> parameters)
   {
     this.parameters = parameters;
   }
diff --git a/java/awt/image/renderable/RenderableImage.java b/java/awt/image/renderable/RenderableImage.java
index 45d2eb7eb..c2f6ad8b0 100644
--- a/java/awt/image/renderable/RenderableImage.java
+++ b/java/awt/image/renderable/RenderableImage.java
@@ -46,7 +46,7 @@ public interface RenderableImage
 {
   String HINTS_OBSERVED = "HINTS_OBSERVED";
   
-  Vector getSources();
+  Vector<RenderableImage> getSources();
   Object getProperty(String name);
   String[] getPropertyNames();
   boolean isDynamic();
diff --git a/javax/swing/tree/DefaultMutableTreeNode.java b/javax/swing/tree/DefaultMutableTreeNode.java
index e709e2a04..4a7da7d82 100644
--- a/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/javax/swing/tree/DefaultMutableTreeNode.java
@@ -78,7 +78,7 @@ public class DefaultMutableTreeNode
   /**
    * children
    */
-  protected Vector children = new Vector();
+  protected Vector<MutableTreeNode> children = new Vector<MutableTreeNode>();
 
   /**
    * userObject
@@ -422,7 +422,7 @@ public class DefaultMutableTreeNode
   public TreeNode getSharedAncestor(DefaultMutableTreeNode node)
   {
     TreeNode current = this;
-    ArrayList list = new ArrayList();
+    ArrayList<TreeNode> list = new ArrayList<TreeNode>();
 
     while (current != null)
       {
@@ -469,7 +469,7 @@ public class DefaultMutableTreeNode
         || children.size() == 0)
       return 0;
 
-    Stack stack = new Stack();
+    Stack<Integer> stack = new Stack<Integer>();
     stack.push(new Integer(0));
     TreeNode node = getChildAt(0);
     int depth = 0;
@@ -707,7 +707,7 @@ public class DefaultMutableTreeNode
       throw new IllegalArgumentException();
     
     TreeNode parent = this;
-    Vector nodes = new Vector();
+    Vector<TreeNode> nodes = new Vector<TreeNode>();
     nodes.add(this);
 
     while (parent != node && parent != null)
@@ -1058,7 +1058,7 @@ public class DefaultMutableTreeNode
    static class PostorderEnumeration implements Enumeration
    {
 
-       Stack nodes = new Stack();
+       Stack<TreeNode> nodes = new Stack<TreeNode>();
        Stack childrenEnums = new Stack();
 
        PostorderEnumeration(TreeNode node)
diff --git a/javax/swing/undo/CompoundEdit.java b/javax/swing/undo/CompoundEdit.java
index e1cfbb619..fbff2a264 100644
--- a/javax/swing/undo/CompoundEdit.java
+++ b/javax/swing/undo/CompoundEdit.java
@@ -1,5 +1,5 @@
 /* CompoundEdit.java -- Combines multiple UndoableEdits.
-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -75,7 +75,7 @@ public class CompoundEdit
    * The <code>UndoableEdit</code>s being combined into a compound
    * editing action.
    */
-  protected Vector edits;
+  protected Vector<UndoableEdit> edits;
 
 
   /**
@@ -92,7 +92,7 @@ public class CompoundEdit
    */
   public CompoundEdit()
   {
-    edits = new Vector();
+    edits = new Vector<UndoableEdit>();
     inProgress = true;
   }
   
@@ -118,7 +118,7 @@ public class CompoundEdit
     super.undo();
 
     for (int i = edits.size() - 1; i >= 0; i--)
-      ((UndoableEdit) edits.elementAt(i)).undo();
+      edits.elementAt(i).undo();
   }
 
 
@@ -143,7 +143,7 @@ public class CompoundEdit
     super.redo();
 
     for (int i = 0; i < edits.size(); i++)
-      ((UndoableEdit) edits.elementAt(i)).redo();
+      edits.elementAt(i).redo();
   }
 
   
@@ -156,7 +156,7 @@ public class CompoundEdit
     if (edits.size() == 0)
       return null;
     else
-      return (UndoableEdit) edits.elementAt(edits.size() - 1);
+      return edits.elementAt(edits.size() - 1);
   }
 
 
@@ -172,7 +172,7 @@ public class CompoundEdit
   public void die()
   {
     for (int i = edits.size() - 1; i >= 0; i--)
-      ((UndoableEdit) edits.elementAt(i)).die();
+      edits.elementAt(i).die();
 
     super.die();
   }
@@ -316,7 +316,7 @@ public class CompoundEdit
   public boolean isSignificant()
   {
     for (int i = edits.size() - 1; i >= 0; i--)
-      if (((UndoableEdit) edits.elementAt(i)).isSignificant())
+      if (edits.elementAt(i).isSignificant())
         return true;
 
     return false;
diff --git a/javax/swing/undo/UndoableEditSupport.java b/javax/swing/undo/UndoableEditSupport.java
index 918e73523..26fcd0bc5 100644
--- a/javax/swing/undo/UndoableEditSupport.java
+++ b/javax/swing/undo/UndoableEditSupport.java
@@ -69,7 +69,8 @@ public class UndoableEditSupport
   /**
    * The currently registered listeners.
    */
-  protected Vector listeners = new Vector();
+  protected Vector<UndoableEditListener> listeners =
+    new Vector<UndoableEditListener>();
 
 
   /**
@@ -148,7 +149,7 @@ public class UndoableEditSupport
   public synchronized UndoableEditListener[] getUndoableEditListeners()
   {
     UndoableEditListener[] result = new UndoableEditListener[listeners.size()];
-    return (UndoableEditListener[]) listeners.toArray(result);
+    return listeners.toArray(result);
   }
 
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9244bd142..765e0e236 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,7 +14,7 @@ compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$
 
 # handling source to bytecode compiler programs like gcj, jikes  and kjc
 if FOUND_ECJ
-JAVAC = $(ECJ) -1.5 -warn:-deprecation,serial -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes
+JAVAC = $(ECJ) -1.5 -warn:-deprecation,serial,unusedImport -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes
 else
 if FOUND_GCJ
 ## This should never be used when gcj is the compiler.
diff --git a/org/omg/CosNaming/_NamingContextExtImplBase.java b/org/omg/CosNaming/_NamingContextExtImplBase.java
index 03630f8d6..617f7aec4 100644
--- a/org/omg/CosNaming/_NamingContextExtImplBase.java
+++ b/org/omg/CosNaming/_NamingContextExtImplBase.java
@@ -66,7 +66,7 @@ public abstract class _NamingContextExtImplBase
   extends _NamingContextImplBase
   implements NamingContextExt, InvokeHandler
 {
-  static Hashtable _methods = new Hashtable();
+  static Hashtable<String,Integer> _methods = new Hashtable<String,Integer>();
 
   static
   {
@@ -234,4 +234,4 @@ public abstract class _NamingContextExtImplBase
       }
     gnu.CORBA.ServiceRequestAdapter.invoke(request, this, result);
   }
-}
\ No newline at end of file
+}
diff --git a/org/omg/CosNaming/_NamingContextImplBase.java b/org/omg/CosNaming/_NamingContextImplBase.java
index 7c1fb3a1d..0c8b46f16 100644
--- a/org/omg/CosNaming/_NamingContextImplBase.java
+++ b/org/omg/CosNaming/_NamingContextImplBase.java
@@ -80,7 +80,7 @@ public abstract class _NamingContextImplBase
    * As there are quite many methods, it may be sensible to use the hashtable.
    * This field is also reused in NamingContextPOA.
    */
-  static Hashtable methods = new Hashtable();
+  static Hashtable<String,Integer> methods = new Hashtable<String,Integer>();
 
   /**
    * Put all methods into the table.
@@ -410,4 +410,4 @@ public abstract class _NamingContextImplBase
 
     gnu.CORBA.ServiceRequestAdapter.invoke(request, this, result);
   }
-}
\ No newline at end of file
+}
diff --git a/vm/reference/java/lang/reflect/Method.java b/vm/reference/java/lang/reflect/Method.java
index e0df75c37..6cc2ca761 100644
--- a/vm/reference/java/lang/reflect/Method.java
+++ b/vm/reference/java/lang/reflect/Method.java
@@ -346,7 +346,7 @@ extends AccessibleObject implements Member, GenericDeclaration
    *         specification, version 3.
    * @since 1.5
    */
-  public TypeVariable<?>[] getTypeParameters()
+  public TypeVariable<Method>[] getTypeParameters()
   {
     String sig = getSignature();
     MethodSignatureParser p = new MethodSignatureParser(this, sig);