Merged gcj-eclipse branch to trunk.

From-SVN: r120621

1 files changed, 3 insertions, 3 deletions

diff --git a/libjava/classpath/java/beans/FeatureDescriptor.java b/libjava/classpath/java/beans/FeatureDescriptor.java
index aeb40949099..050885158fa 100644
--- a/libjava/classpath/java/beans/FeatureDescriptor.java
+++ b/libjava/classpath/java/beans/FeatureDescriptor.java
@@ -68,14 +68,14 @@ public class FeatureDescriptor
   boolean hidden;
   boolean preferred;
 
-  Hashtable valueHash;
+  Hashtable<String,Object> valueHash;
 
   /**
    * Instantiate this FeatureDescriptor with appropriate default values.
    */
   public FeatureDescriptor()
   {
-    valueHash = new Hashtable();
+    valueHash = new Hashtable<String,Object>();
   }
 
   /**
@@ -225,7 +225,7 @@ public class FeatureDescriptor
    * @return an Enumerator over all the programmatic key names associated
    * with this feature.
    */
-  public Enumeration attributeNames()
+  public Enumeration<String> attributeNames()
   {
     return valueHash.keys();
   }