Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 4 insertions, 3 deletions

diff --git a/libjava/classpath/java/beans/PropertyEditorManager.java b/libjava/classpath/java/beans/PropertyEditorManager.java
index da2a5678c5c..0dd3b176dea 100644
--- a/libjava/classpath/java/beans/PropertyEditorManager.java
+++ b/libjava/classpath/java/beans/PropertyEditorManager.java
@@ -83,7 +83,8 @@ import java.awt.Font;
 
 public class PropertyEditorManager
 {
-  static java.util.Hashtable editors = new java.util.Hashtable();
+  static java.util.Hashtable<Class<?>,Class<?>> editors =
+    new java.util.Hashtable<Class<?>,Class<?>>();
   static String[] editorSearchPath = { "gnu.java.beans.editors",
                                        "sun.beans.editors" };
 
@@ -118,7 +119,7 @@ public class PropertyEditorManager
    *        will edit.
    * @param editorClass the PropertyEditor class.
    */
-  public static void registerEditor(Class editedClass, Class editorClass)
+  public static void registerEditor(Class<?> editedClass, Class<?> editorClass)
   {
     editors.put(editedClass, editorClass);
   }
@@ -132,7 +133,7 @@ public class PropertyEditorManager
    * @return a PropertyEditor instance that can edit the
    *         specified class.
    */
-  public static PropertyEditor findEditor(Class editedClass)
+  public static PropertyEditor findEditor(Class<?> editedClass)
   {
     try
       {