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

	(getAttributeNames): Likewise.
	* javax/swing/text/SimpleAttributeSet.java (getAttributeNames):
	Genericized.
	(removeAttributes): Likewise.
	* javax/swing/text/DefaultStyledDocument.java (getStyleNames):
	Genericized.
	* javax/swing/text/AbstractDocument.java (getAttributeNames):
	Genericized.
	(removeAttributes): Likewise.
	* javax/swing/table/TableColumnModel.java (getColumns): Genericized.
	* javax/swing/table/AbstractTableModel.java (getColumnClass):
	Genericized.
	* javax/swing/tree/VariableHeightLayoutCache.java
	(getVisiblePathsFrom): Genericized.
	* javax/swing/tree/FixedHeightLayoutCache.java (getVisiblePathsFrom):
	Genericized.
	* javax/swing/undo/StateEdit.java (postState): Genericized.
	(preState): Likewise.
	* javax/security/sasl/SaslServerFactory.java (createSaslServer):
	Genericized.
	* javax/security/sasl/SaslClientFactory.java (createSaslClient):
	Genericized.
	(getMechanismNames): Likewise.
	* javax/security/sasl/Sasl.java (createSaslClient): Genericized.
	(createSaslServer): Likewise.
	(getSaslClientFactories): Likewise.
	(getSaslServerFactories): Likewise.
	* javax/security/auth/spi/LoginModule.java (initialize): Genericized.
	* javax/security/auth/login/AppConfigurationEntry.java
	(AppConfigurationEntry): Genericized.
	(getOptions): Likewise.
	* javax/sql/RowSet.java (getTypeMap): Genericized.
	(setTypeMap): Likewise.
	* java/sql/Array.java (getResultSet): Genericized.
	* java/security/cert/X509CertSelector.java (getExtendedKeyUsage):
	Genericized.
	* java/security/Permissions.java (elements): Genericized.
	* java/rmi/server/RMIClassLoader.java (loadClass): Genericized.

20 files changed, 77 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 876096d50..272f08b0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2005-11-29  Tom Tromey  <tromey@redhat.com>
+
+	* javax/swing/text/StyleContext.java (removeAttributes): Genericized.
+	(getAttributeNames): Likewise.
+	* javax/swing/text/SimpleAttributeSet.java (getAttributeNames):
+	Genericized.
+	(removeAttributes): Likewise.
+	* javax/swing/text/DefaultStyledDocument.java (getStyleNames):
+	Genericized.
+	* javax/swing/text/AbstractDocument.java (getAttributeNames):
+	Genericized.
+	(removeAttributes): Likewise.
+	* javax/swing/table/TableColumnModel.java (getColumns): Genericized.
+	* javax/swing/table/AbstractTableModel.java (getColumnClass):
+	Genericized.
+	* javax/swing/tree/VariableHeightLayoutCache.java
+	(getVisiblePathsFrom): Genericized.
+	* javax/swing/tree/FixedHeightLayoutCache.java (getVisiblePathsFrom):
+	Genericized.
+	* javax/swing/undo/StateEdit.java (postState): Genericized.
+	(preState): Likewise.
+	* javax/security/sasl/SaslServerFactory.java (createSaslServer):
+	Genericized.
+	* javax/security/sasl/SaslClientFactory.java (createSaslClient):
+	Genericized.
+	(getMechanismNames): Likewise.
+	* javax/security/sasl/Sasl.java (createSaslClient): Genericized.
+	(createSaslServer): Likewise.
+	(getSaslClientFactories): Likewise.
+	(getSaslServerFactories): Likewise.
+	* javax/security/auth/spi/LoginModule.java (initialize): Genericized.
+	* javax/security/auth/login/AppConfigurationEntry.java
+	(AppConfigurationEntry): Genericized.
+	(getOptions): Likewise.
+	* javax/sql/RowSet.java (getTypeMap): Genericized.
+	(setTypeMap): Likewise.
+	* java/sql/Array.java (getResultSet): Genericized.
+	* java/security/cert/X509CertSelector.java (getExtendedKeyUsage):
+	Genericized.
+	* java/security/Permissions.java (elements): Genericized.
+	* java/rmi/server/RMIClassLoader.java (loadClass): Genericized.
+
 2005-11-27  Tom Tromey  <tromey@redhat.com>
 
 	* javax/print/attribute/standard/PrinterStateReasons.java:
diff --git a/java/rmi/server/RMIClassLoader.java b/java/rmi/server/RMIClassLoader.java
index cc5b51894..21dd19b0c 100644
--- a/java/rmi/server/RMIClassLoader.java
+++ b/java/rmi/server/RMIClassLoader.java
@@ -102,7 +102,7 @@ public class RMIClassLoader
    * @throws MalformedURLException if the URL is not well formed
    * @throws ClassNotFoundException if the requested class cannot be found
    */
-  public static Class loadClass(URL codeBase, String name)
+  public static Class<?> loadClass(URL codeBase, String name)
     throws MalformedURLException, ClassNotFoundException
   {
     RMIClassLoaderSpi spi = getProviderInstance();
diff --git a/java/security/Permissions.java b/java/security/Permissions.java
index e3fd06970..56f5ad8f5 100644
--- a/java/security/Permissions.java
+++ b/java/security/Permissions.java
@@ -150,7 +150,7 @@ public final class Permissions extends PermissionCollection
    *
    * @return an <code>Enumeration</code> of this collection's elements
    */
-  public Enumeration elements()
+  public Enumeration<Permission> elements()
   {
     return new Enumeration()
     {
diff --git a/java/security/cert/X509CertSelector.java b/java/security/cert/X509CertSelector.java
index d7f6f7754..d7bd8c66b 100644
--- a/java/security/cert/X509CertSelector.java
+++ b/java/security/cert/X509CertSelector.java
@@ -574,7 +574,7 @@ public class X509CertSelector implements CertSelector, Cloneable
    *
    * @return The set of key purpose OIDs (strings).
    */
-  public Set getExtendedKeyUsage()
+  public Set<String> getExtendedKeyUsage()
   {
     if (keyPurposeSet != null)
       return Collections.unmodifiableSet(keyPurposeSet);
diff --git a/java/sql/Array.java b/java/sql/Array.java
index b37a89cc4..2cc1aa130 100644
--- a/java/sql/Array.java
+++ b/java/sql/Array.java
@@ -181,6 +181,6 @@ public interface Array
    * @exception SQLException If an error occurs.
    * @see ResultSet
    */  
-  ResultSet getResultSet(long index, int count, Map map)
+  ResultSet getResultSet(long index, int count, Map<String, Class<?>> map)
     throws SQLException;
 }
diff --git a/javax/security/auth/login/AppConfigurationEntry.java b/javax/security/auth/login/AppConfigurationEntry.java
index 557d3d7f8..ce0db2ee6 100644
--- a/javax/security/auth/login/AppConfigurationEntry.java
+++ b/javax/security/auth/login/AppConfigurationEntry.java
@@ -57,7 +57,7 @@ public class AppConfigurationEntry
 
   public AppConfigurationEntry (final String loginModuleName,
                                 final LoginModuleControlFlag controlFlag,
-                                final Map options)
+                                final Map<String, ?> options)
   {
     if (loginModuleName == null || loginModuleName.length() == 0)
       throw new IllegalArgumentException ("module name cannot be null nor empty");
@@ -86,7 +86,7 @@ public class AppConfigurationEntry
     return loginModuleName;
   }
 
-  public Map getOptions()
+  public Map<String, ?> getOptions()
   {
     return options;
   }
diff --git a/javax/security/auth/spi/LoginModule.java b/javax/security/auth/spi/LoginModule.java
index 00b33c517..197cd692e 100644
--- a/javax/security/auth/spi/LoginModule.java
+++ b/javax/security/auth/spi/LoginModule.java
@@ -95,7 +95,7 @@ public interface LoginModule
    * @param options A mapping of options given to this module.
    */
   void initialize(Subject subject, CallbackHandler handler,
-                  Map sharedState, Map options);
+                  Map<String, ?> sharedState, Map<String, ?> options);
 
   /**
    * Authenticates a subject to the system. This is the primary
diff --git a/javax/security/sasl/Sasl.java b/javax/security/sasl/Sasl.java
index dbe4cc8c2..52210d971 100644
--- a/javax/security/sasl/Sasl.java
+++ b/javax/security/sasl/Sasl.java
@@ -356,7 +356,8 @@ public class Sasl
   public static SaslClient createSaslClient(String[] mechanisms,
                                             String authorizationID,
                                             String protocol,
-                                            String serverName, Map props,
+                                            String serverName,
+                                            Map<String, ?> props,
                                             CallbackHandler cbh)
     throws SaslException
   {
@@ -444,7 +445,7 @@ public class Sasl
    * {@link SaslClient} instance.
    * @see #createSaslClient(String[],String,String,String,Map,CallbackHandler)
    */
-  public static Enumeration getSaslClientFactories()
+  public static Enumeration<SaslClientFactory> getSaslClientFactories()
   {
     Vector result = new Vector();
     HashSet names = new HashSet();
@@ -559,7 +560,8 @@ public class Sasl
    */
   public static SaslServer createSaslServer(String mechanism, String protocol,
                                             String serverName,
-                                            Map props, CallbackHandler cbh)
+                                            Map<String, ?> props,
+                                            CallbackHandler cbh)
     throws SaslException
   {
     if (mechanism == null)
@@ -636,7 +638,7 @@ public class Sasl
    * {@link SaslServer} instance.
    * @see #createSaslServer(String,String,String,Map,CallbackHandler)
    */
-  public static Enumeration getSaslServerFactories()
+  public static Enumeration<SaslServerFactory> getSaslServerFactories()
   {
     Vector result = new Vector();
     HashSet names = new HashSet();
diff --git a/javax/security/sasl/SaslClientFactory.java b/javax/security/sasl/SaslClientFactory.java
index ae36171c5..be80fd9f1 100644
--- a/javax/security/sasl/SaslClientFactory.java
+++ b/javax/security/sasl/SaslClientFactory.java
@@ -97,8 +97,8 @@ public interface SaslClientFactory
    * because of an error.
    */
   SaslClient createSaslClient(String[] mechanisms, String authorizationID,
-                              String protocol, String serverName, Map props,
-                              CallbackHandler cbh)
+                              String protocol, String serverName,
+                              Map<String, ?> props, CallbackHandler cbh)
     throws SaslException;
 
   /**
@@ -114,5 +114,5 @@ public interface SaslClientFactory
    * properties, if present in props, are ignored.
    * @return a non-null array containing IANA-registered SASL mechanism names.
    */
-  String[] getMechanismNames(Map props);
+  String[] getMechanismNames(Map<String, ?> props);
 }
diff --git a/javax/security/sasl/SaslServerFactory.java b/javax/security/sasl/SaslServerFactory.java
index fc43fb636..b51ce3dba 100644
--- a/javax/security/sasl/SaslServerFactory.java
+++ b/javax/security/sasl/SaslServerFactory.java
@@ -95,7 +95,8 @@ public interface SaslServerFactory
    * of an error.
    */
   SaslServer createSaslServer(String mechanism, String protocol,
-                              String serverName, Map props, CallbackHandler cbh)
+                              String serverName, Map<String, ?> props,
+                              CallbackHandler cbh)
     throws SaslException;
 
   /**
@@ -111,5 +112,5 @@ public interface SaslServerFactory
    * properties, if present in props, are ignored.
    * @return a non-null array containing IANA-registered SASL mechanism names.
    */
-  String[] getMechanismNames(Map props);
+  String[] getMechanismNames(Map<String, ?> props);
 }
diff --git a/javax/sql/RowSet.java b/javax/sql/RowSet.java
index 46b776b3c..2a9ad2784 100644
--- a/javax/sql/RowSet.java
+++ b/javax/sql/RowSet.java
@@ -78,9 +78,9 @@ public interface RowSet extends ResultSet
 
   void setTransactionIsolation(int level) throws SQLException;
 
-  Map getTypeMap() throws SQLException;
+  Map<String, Class<?>> getTypeMap() throws SQLException;
 
-  void setTypeMap(Map map) throws SQLException;
+  void setTypeMap(Map<String, Class<?>> map) throws SQLException;
 
   String getCommand();
 
diff --git a/javax/swing/table/AbstractTableModel.java b/javax/swing/table/AbstractTableModel.java
index 5085e6017..bda716ee7 100644
--- a/javax/swing/table/AbstractTableModel.java
+++ b/javax/swing/table/AbstractTableModel.java
@@ -125,7 +125,7 @@ public abstract class AbstractTableModel implements TableModel, Serializable
    * 
    * @return The class.
    */
-  public Class getColumnClass(int columnIndex)
+  public Class<?> getColumnClass(int columnIndex)
   {
     return Object.class;
   }
diff --git a/javax/swing/table/TableColumnModel.java b/javax/swing/table/TableColumnModel.java
index b006f9ad4..66f52e619 100644
--- a/javax/swing/table/TableColumnModel.java
+++ b/javax/swing/table/TableColumnModel.java
@@ -96,7 +96,7 @@ public interface TableColumnModel
    * getColumns
    * @return Enumeration of columns
    */
-  Enumeration getColumns();
+  Enumeration<TableColumn> getColumns();
 
   /**
    * Returns the index of the {@link TableColumn} with the given identifier.
diff --git a/javax/swing/text/AbstractDocument.java b/javax/swing/text/AbstractDocument.java
index 35188234c..76e758c6d 100644
--- a/javax/swing/text/AbstractDocument.java
+++ b/javax/swing/text/AbstractDocument.java
@@ -1257,7 +1257,7 @@ public abstract class AbstractDocument implements Document, Serializable
      *
      * @param names the names of the attributes to be removed
      */
-    public void removeAttributes(Enumeration names)
+    public void removeAttributes(Enumeration<?> names)
     {
       attributes = getAttributeContext().removeAttributes(attributes, names);
     }
@@ -1345,7 +1345,7 @@ public abstract class AbstractDocument implements Document, Serializable
      *
      * @return the names of the attributes of this element
      */
-    public Enumeration getAttributeNames()
+    public Enumeration<?> getAttributeNames()
     {
       return attributes.getAttributeNames();
     }
diff --git a/javax/swing/text/DefaultStyledDocument.java b/javax/swing/text/DefaultStyledDocument.java
index bdb198efa..49ab14e54 100644
--- a/javax/swing/text/DefaultStyledDocument.java
+++ b/javax/swing/text/DefaultStyledDocument.java
@@ -1490,7 +1490,7 @@ public class DefaultStyledDocument extends AbstractDocument
    *
    * @return an enumeration of all style names
    */
-  public Enumeration getStyleNames()
+  public Enumeration<?> getStyleNames()
   {
     StyleContext context = (StyleContext) getAttributeContext();
     return context.getStyleNames();
diff --git a/javax/swing/text/SimpleAttributeSet.java b/javax/swing/text/SimpleAttributeSet.java
index 0c9f607b1..692bfa634 100644
--- a/javax/swing/text/SimpleAttributeSet.java
+++ b/javax/swing/text/SimpleAttributeSet.java
@@ -158,7 +158,7 @@ public class SimpleAttributeSet
     return tab.size();
   }
 
-  public Enumeration getAttributeNames()
+  public Enumeration<?> getAttributeNames()
   {
     return tab.keys();
   }
@@ -216,7 +216,7 @@ public class SimpleAttributeSet
       }
   }
 
-  public void removeAttributes(Enumeration names)
+  public void removeAttributes(Enumeration<?> names)
   {
     while (names.hasMoreElements())
       {
diff --git a/javax/swing/text/StyleContext.java b/javax/swing/text/StyleContext.java
index a78e99626..4dfca6de1 100644
--- a/javax/swing/text/StyleContext.java
+++ b/javax/swing/text/StyleContext.java
@@ -168,7 +168,7 @@ public class StyleContext
       return attributes.getAttributeCount();
     }
 
-    public Enumeration getAttributeNames()
+    public Enumeration<?> getAttributeNames()
     {
       return attributes.getAttributeNames();
     }
@@ -195,7 +195,7 @@ public class StyleContext
       fireStateChanged();
     }
 
-    public void removeAttributes(Enumeration names)
+    public void removeAttributes(Enumeration<?> names)
     {
       attributes = StyleContext.this.removeAttributes(attributes, names);
       fireStateChanged();
@@ -323,7 +323,7 @@ public class StyleContext
       return attrs.length / 2;
     }
 
-    public Enumeration getAttributeNames()
+    public Enumeration<?> getAttributeNames()
     {      
       return new Enumeration() 
         {
diff --git a/javax/swing/tree/FixedHeightLayoutCache.java b/javax/swing/tree/FixedHeightLayoutCache.java
index 535417ec3..05e049a3a 100644
--- a/javax/swing/tree/FixedHeightLayoutCache.java
+++ b/javax/swing/tree/FixedHeightLayoutCache.java
@@ -174,7 +174,7 @@ public class FixedHeightLayoutCache
 	 * @param value0 TODO
 	 * @returns Enumeration
 	 */
-	public Enumeration getVisiblePathsFrom(TreePath value0)
+	public Enumeration<TreePath> getVisiblePathsFrom(TreePath value0)
 	{
 		return null; // TODO
 	} // getVisiblePathsFrom()
diff --git a/javax/swing/tree/VariableHeightLayoutCache.java b/javax/swing/tree/VariableHeightLayoutCache.java
index 2c9136c51..fbeb318c3 100644
--- a/javax/swing/tree/VariableHeightLayoutCache.java
+++ b/javax/swing/tree/VariableHeightLayoutCache.java
@@ -188,7 +188,7 @@ public class VariableHeightLayoutCache extends AbstractLayoutCache {
 	 * @param value0 TODO
 	 * @returns Enumeration
 	 */
-	public Enumeration getVisiblePathsFrom(TreePath value0) {
+	public Enumeration<TreePath> getVisiblePathsFrom(TreePath value0) {
 		return null; // TODO
 	} // getVisiblePathsFrom()
 
diff --git a/javax/swing/undo/StateEdit.java b/javax/swing/undo/StateEdit.java
index 80e4e33ec..674a1306c 100644
--- a/javax/swing/undo/StateEdit.java
+++ b/javax/swing/undo/StateEdit.java
@@ -119,14 +119,14 @@ public class StateEdit
    * The state of <code>object</code> at the time of constructing
    * this <code>StateEdit</code>.
    */
-  protected Hashtable preState;
+  protected Hashtable<Object, Object> preState;
 
 
   /**
    * The state of <code>object</code> at the time when {@link #end()}
    * was called.
    */
-  protected Hashtable postState;
+  protected Hashtable<Object, Object> postState;
 
 
   /**