* javax/swing/text/StyleContext.java (getStyleNames): Genericized.

	* javax/swing/text/MutableAttributeSet.java (removeAttributes):
	Genericized.
	* javax/swing/text/DefaultFormatter.java (getValueClass): Genericized.
	(setValueClass): Likewise.
	* javax/swing/text/AttributeSet.java (getAttributeNames): Genericized.
	* javax/swing/text/AbstractDocument.java (getDocumentProperties):
	Genericized.
	(setDocumentProperties): Likewise.
	(removeAttributes): Likewise.
	* javax/swing/SwingUtilities.java (getAncestorOfClass): Genericized.
	* javax/swing/LookAndFeel.java (makeIcon): Genericized.
	* javax/swing/JTable.java (getColumnClass): Genericized.
	(getDefaultRenderer): Likewise.
	(setDefaultRenderer): Likewise.
	(getDefaultEditor): Likewise.
	(setDefaultEditor): Likewise.
	* javax/swing/JLayeredPane.java (getComponentToLayer): Genericized.
	* javax/swing/DefaultListModel.java (elements): Genericized.
	* javax/swing/ButtonGroup.java (buttons): Genericized.
	(getElements): Likewise.
	* javax/swing/SpinnerListModel.java (SpinnerListModel): Genericized.
	(getList): Likewise.
	(setList): Likewise.
	* javax/swing/SortingFocusTraversalPolicy.java
	(SortingFocusTraversalPolicy): Genericized.
	(getComparator): Likewise.
	(setComparator): Likewise.
	* javax/swing/JTree.java (JTree): Genericized.
	(getDescendantToggledPaths): Likewise.
	(getExpandedDescendants): Likewise.
	(removeDescendantToggledPaths): Likewise.
	* javax/swing/JList.java (JList): Genericized.
	Likewise.
	* javax/swing/JComboBox.java (JComboBox): Genericized.
	* javax/swing/DefaultComboBoxModel.java (DefaultComboBoxModel):
	Genericized.
	* javax/swing/UIDefaults.java: Genericized superclass.
	(getUIClass): Likewise.
	* javax/swing/event/EventListenerList.java (getListenerCount):
	Genericized.
	* javax/swing/plaf/basic/BasicDirectoryModel.java (getDirectories):
	Genericized.
	(getFiles): Likewise.
	(sort): Likewise.
	* javax/swing/plaf/basic/BasicTreeUI.java (drawingCache): Genericized.
	* javax/swing/plaf/basic/BasicFileChooserUI.java (iconCache):
	Genericized.
	* javax/swing/table/TableModel.java (getColumnClass): Genericized.
	* javax/swing/table/DefaultTableColumnModel.java (tableColumns):
	Genericized.
	(getColumns): Likewise.
	(moveColumn): Updated.
	* javax/swing/text/html/parser/ContentModel.java (getElements):
	Genericized.
	* javax/swing/text/html/parser/DTD.java (entityHash): Fixed type.
	* javax/swing/text/html/parser/AttributeList.java (AttributeList):
	Genericized.
	(values): Likewise.
	(getValues): Likewise.
	* javax/swing/tree/AbstractLayoutCache.java (getVisiblePathsFrom):
	Genericized.
	* javax/swing/tree/DefaultMutableTreeNode.java (EMPTY_ENUMERATION):
	Genericized.
	* javax/swing/undo/StateEditable.java (restoreState): Genericized.
	(storeState): Likewise.

8 files changed, 16 insertions, 14 deletions

diff --git a/javax/swing/text/AbstractDocument.java b/javax/swing/text/AbstractDocument.java
index b66c895ec..9dd4c125a 100644
--- a/javax/swing/text/AbstractDocument.java
+++ b/javax/swing/text/AbstractDocument.java
@@ -376,7 +376,7 @@ public abstract class AbstractDocument implements Document, Serializable
    *
    * @return the properties of this <code>Document</code>
    */
-  public Dictionary getDocumentProperties()
+  public Dictionary<Object, Object> getDocumentProperties()
   {
     // FIXME: make me thread-safe
     if (properties == null)
@@ -849,7 +849,7 @@ public abstract class AbstractDocument implements Document, Serializable
    *
    * @param p the document properties to set
    */
-  public void setDocumentProperties(Dictionary p)
+  public void setDocumentProperties(Dictionary<Object, Object> p)
   {
     // FIXME: make me thread-safe
     properties = p;
@@ -1023,7 +1023,7 @@ public abstract class AbstractDocument implements Document, Serializable
      * @return the attributes of <code>old</code> minus the attributes in
      *         <code>attributes</code>
      */
-    AttributeSet removeAttributes(AttributeSet old, Enumeration names);
+    AttributeSet removeAttributes(AttributeSet old, Enumeration<?> names);
   }
 
   /**
diff --git a/javax/swing/text/AttributeSet.java b/javax/swing/text/AttributeSet.java
index 01d148c06..2d39881c2 100644
--- a/javax/swing/text/AttributeSet.java
+++ b/javax/swing/text/AttributeSet.java
@@ -158,7 +158,7 @@ public interface AttributeSet
    * @return the names of the attributes that are stored in this
    *         <code>AttributeSet</code>
    */
-  Enumeration getAttributeNames();
+  Enumeration<?> getAttributeNames();
 
   /**
    * Returns the resolving parent of this <code>AttributeSet</code>.
diff --git a/javax/swing/text/DefaultFormatter.java b/javax/swing/text/DefaultFormatter.java
index f9e0f10e6..1b339366d 100644
--- a/javax/swing/text/DefaultFormatter.java
+++ b/javax/swing/text/DefaultFormatter.java
@@ -331,7 +331,7 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
    *
    * @return the class that is used for values
    */
-  public Class getValueClass()
+  public Class<?> getValueClass()
   {
     return valueClass;
   }
@@ -343,7 +343,7 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
    *
    * @see #getValueClass()
    */
-  public void setValueClass(Class valueClass)
+  public void setValueClass(Class<?> valueClass)
   {
     this.valueClass = valueClass;
   }
diff --git a/javax/swing/text/MutableAttributeSet.java b/javax/swing/text/MutableAttributeSet.java
index 2fe9ad50f..1eb92ebb4 100644
--- a/javax/swing/text/MutableAttributeSet.java
+++ b/javax/swing/text/MutableAttributeSet.java
@@ -69,7 +69,7 @@ public interface MutableAttributeSet extends AttributeSet
    * removeAttributes
    * @param names TODO
    */
-  void removeAttributes(Enumeration names);
+  void removeAttributes(Enumeration<?> names);
 
   /**
    * removeAttributes
diff --git a/javax/swing/text/StyleContext.java b/javax/swing/text/StyleContext.java
index d73f430b0..a78e99626 100644
--- a/javax/swing/text/StyleContext.java
+++ b/javax/swing/text/StyleContext.java
@@ -479,7 +479,7 @@ public class StyleContext
    * Get the names of the style. The returned enumeration always
    * contains at least one member, the default style.
    */
-  public Enumeration getStyleNames()
+  public Enumeration<?> getStyleNames()
   {
     return styleTable.keys();
   }
diff --git a/javax/swing/text/html/parser/AttributeList.java b/javax/swing/text/html/parser/AttributeList.java
index 5bca0bfa7..d48266d47 100644
--- a/javax/swing/text/html/parser/AttributeList.java
+++ b/javax/swing/text/html/parser/AttributeList.java
@@ -122,7 +122,7 @@ public final class AttributeList
    * null, if this parameter was not specified.
    * Values, defined in DTD, are case insensitive.
    */
-  public Vector values;
+  public Vector<?> values;
 
   /**
    * The modifier of this attribute. This field contains one of the
@@ -176,7 +176,7 @@ public final class AttributeList
    * Equals to null for the last attribute definition.
    */
   public AttributeList(String a_name, int a_type, int a_modifier,
-                       String a_default, Vector allowed_values,
+                       String a_default, Vector<?> allowed_values,
                        AttributeList a_next
                       )
   {
@@ -251,7 +251,7 @@ public final class AttributeList
   /**
    * Get the allowed values of this attribute.
    */
-  public Enumeration getValues()
+  public Enumeration<?> getValues()
   {
     return values.elements();
   }
diff --git a/javax/swing/text/html/parser/ContentModel.java b/javax/swing/text/html/parser/ContentModel.java
index 70e9c2acb..d5c4418de 100644
--- a/javax/swing/text/html/parser/ContentModel.java
+++ b/javax/swing/text/html/parser/ContentModel.java
@@ -151,13 +151,15 @@ public final class ContentModel
    * discarded.
    * @param elements - a vector to add the values to.
    */
-  public void getElements(Vector elements)
+  public void getElements(Vector<Element> elements)
   {
     ContentModel c = this;
 
     while (c != null)
       {
-        elements.add(c.content);
+        // FIXME: correct?
+        if (c.content instanceof Element)
+          elements.add((Element) c.content);
         c = c.next;
       }
   }
diff --git a/javax/swing/text/html/parser/DTD.java b/javax/swing/text/html/parser/DTD.java
index 6e7aeb407..ae3c184f1 100644
--- a/javax/swing/text/html/parser/DTD.java
+++ b/javax/swing/text/html/parser/DTD.java
@@ -154,7 +154,7 @@ public class DTD
   /**
    * The entity table for accessing all DTD entities by name.
    */
-  public Hashtable<String,Entity> entityHash = new Hashtable<String,Entity>();
+  public Hashtable<Object, Entity> entityHash = new Hashtable<Object, Entity>();
 
   /**
    *  The name of this DTD.