* javax/naming/spi/StateFactory.java (getStateToBind): Genericized.

	* javax/naming/spi/Resolver.java (resolveToClass): Genericized.
	* javax/naming/spi/ObjectFactoryBuilder.java (createObjectFactory):
	Genericized.
	* javax/naming/spi/NamingManager.java (getInitialContext):
	Genericized.
	(getURLContext): Likewise.
	(getObjectInstance): Likewise.
	(getStateToBind): Likewise.
	* javax/naming/spi/InitialContextFactoryBuilder.java
	(createInitialContextFactory): Genericized.
	* javax/naming/spi/InitialContextFactory.java (getInitialContext):
	Genericized.
	* javax/naming/spi/DirectoryManager.java (getObjectInstance):
	Genericized.
	(getStateToBind): Likewise.
	* javax/naming/spi/DirStateFactory.java (getStateToBind):
	Genericized.
	* javax/naming/spi/ObjectFactory.java (getObjectInstance):
	Genericized.
	* javax/naming/spi/DirObjectFactory.java (getObjectInstance):
	Genericized.
	* javax/naming/ldap/LdapReferralException.java (getReferralContext):
	Genericized.
	* javax/naming/ldap/ControlFactory.java (getControlInstance):
	Genericized.
	* javax/naming/ldap/InitialLdapContext.java (InitialLdapContext):
	Genericized.
	* javax/naming/directory/DirContext.java (search): Genericized.
	* javax/naming/directory/Attributes.java (getAll): Genericized.
	(getIDs): Likewise.
	* javax/naming/directory/Attribute.java (getAll): Genericized.
	* javax/naming/directory/BasicAttribute.java (values): Genericized.
	(getAll): Likewise.
	* javax/naming/directory/InitialDirContext.java (InitialDirContext):
	Genericized.
	* javax/naming/ReferralException.java (getReferralContext):
	Genericized.
	* javax/naming/Name.java (getAll): Genericized.
	* javax/naming/Context.java (getEnvironment): Genericized.
	(list): Likewise.
	(listBindings): Likewise.
	* javax/naming/NamingEnumeration.java: Genericized.
	(next): Likewise.
	* javax/naming/Reference.java (addrs): Genericized.
	(getAll): Likewise.
	* javax/naming/CannotProceedException.java (environment): Genericized.
	(getEnvironment): Likewise.
	(setEnvironment): Likewise.
	* javax/naming/InitialContext.java (myProps): Genericized.
	(InitialContext): Likewise.
	(init): Likewise.
	* javax/naming/CompoundName.java (CompoundName): Genericized.
	* javax/naming/CompositeName.java (CompositeName): Genericized.

27 files changed, 86 insertions, 57 deletions

diff --git a/javax/naming/CannotProceedException.java b/javax/naming/CannotProceedException.java
index 3a69cd381..8a5b90745 100644
--- a/javax/naming/CannotProceedException.java
+++ b/javax/naming/CannotProceedException.java
@@ -49,7 +49,7 @@ public class CannotProceedException extends NamingException
 {
   // Serialized fields.
   protected Name remainingNewName;
-  protected Hashtable environment;
+  protected Hashtable<?, ?> environment;
   protected Name altName;
   protected Context altNameCtx;
 
@@ -63,12 +63,12 @@ public class CannotProceedException extends NamingException
     super (msg);
   }
 
-  public Hashtable getEnvironment()
+  public Hashtable<?, ?> getEnvironment()
   {
     return environment;
   }
 
-  public void setEnvironment(Hashtable environment)
+  public void setEnvironment(Hashtable<?, ?> environment)
   {
     this.environment = environment;
   }
diff --git a/javax/naming/CompositeName.java b/javax/naming/CompositeName.java
index 61adcf177..c4d41a74e 100644
--- a/javax/naming/CompositeName.java
+++ b/javax/naming/CompositeName.java
@@ -59,7 +59,7 @@ public class CompositeName implements Name, Cloneable, Serializable
     elts = new Vector ();
   }
 
-  protected CompositeName (Enumeration comps)
+  protected CompositeName (Enumeration<String> comps)
   {
     elts = new Vector ();
     try
diff --git a/javax/naming/CompoundName.java b/javax/naming/CompoundName.java
index b23736fa7..9b766b6c5 100644
--- a/javax/naming/CompoundName.java
+++ b/javax/naming/CompoundName.java
@@ -69,7 +69,7 @@ public class CompoundName implements Name, Cloneable, Serializable
     initializeSyntax ();
   }
 
-  protected CompoundName (Enumeration comps, Properties syntax)
+  protected CompoundName (Enumeration<String> comps, Properties syntax)
   {
     elts = new Vector ();
     mySyntax = syntax;
diff --git a/javax/naming/Context.java b/javax/naming/Context.java
index 9df82c684..fe67b231b 100644
--- a/javax/naming/Context.java
+++ b/javax/naming/Context.java
@@ -124,11 +124,13 @@ public interface Context
   void rename (Name oldName, Name newName) throws NamingException;
   void rename (String oldName, String newName) throws NamingException;
 
-  NamingEnumeration list (Name name) throws NamingException;
-  NamingEnumeration list (String name) throws NamingException;
+  NamingEnumeration<NameClassPair> list (Name name) throws NamingException;
+  NamingEnumeration<NameClassPair> list (String name) throws NamingException;
 
-  NamingEnumeration listBindings (Name name) throws NamingException;
-  NamingEnumeration listBindings (String name) throws NamingException;
+  NamingEnumeration<Binding> listBindings (Name name) 
+    throws NamingException;
+  NamingEnumeration<Binding> listBindings (String name) 
+    throws NamingException;
 
   void destroySubcontext (Name name) throws NamingException;
   void destroySubcontext (String name) throws NamingException;
@@ -151,7 +153,7 @@ public interface Context
 
   Object removeFromEnvironment (String propName) throws NamingException;
 
-  Hashtable getEnvironment () throws NamingException;
+  Hashtable<?, ?> getEnvironment () throws NamingException;
 
   void close () throws NamingException;
 
diff --git a/javax/naming/InitialContext.java b/javax/naming/InitialContext.java
index 1a9ee5a27..571536950 100644
--- a/javax/naming/InitialContext.java
+++ b/javax/naming/InitialContext.java
@@ -52,9 +52,9 @@ public class InitialContext implements Context
 {
   protected Context defaultInitCtx;
   protected boolean gotDefault = false;
-  protected Hashtable myProps;
+  protected Hashtable<Object, Object> myProps;
   
-  public InitialContext (Hashtable environment)
+  public InitialContext (Hashtable<?, ?> environment)
     throws NamingException
   {
     init (environment);
@@ -74,7 +74,7 @@ public class InitialContext implements Context
   }
  
   /** @since 1.3 */
-  protected void init (Hashtable environment)
+  protected void init (Hashtable<?, ?> environment)
     throws NamingException
   {
     // FIXME: Is this enough?
diff --git a/javax/naming/Name.java b/javax/naming/Name.java
index 459abeaa8..18655c339 100644
--- a/javax/naming/Name.java
+++ b/javax/naming/Name.java
@@ -80,7 +80,7 @@ public interface Name extends Cloneable, Serializable, Comparable<Object>
    * Returns a non-null (but possibly empty) <code>Enumeration</code> of the
    * components of the <code>Name</code> as <code>String</code>s.
    */
-  Enumeration getAll();
+  Enumeration<String> getAll();
 
   /**
    * Gets the component at the given index.
diff --git a/javax/naming/NamingEnumeration.java b/javax/naming/NamingEnumeration.java
index 3c9ee2d01..5f299fc98 100644
--- a/javax/naming/NamingEnumeration.java
+++ b/javax/naming/NamingEnumeration.java
@@ -40,9 +40,9 @@ package javax.naming;
 
 import java.util.Enumeration;
 
-public interface NamingEnumeration extends Enumeration
+public interface NamingEnumeration<T> extends Enumeration<T>
 {
   void close() throws NamingException;
   boolean hasMore() throws NamingException;
-  Object next() throws NamingException;
+  T next() throws NamingException;
 }
diff --git a/javax/naming/Reference.java b/javax/naming/Reference.java
index 6cc4d1570..ebf570459 100644
--- a/javax/naming/Reference.java
+++ b/javax/naming/Reference.java
@@ -135,7 +135,7 @@ public class Reference implements Cloneable, Serializable
     return null;
   }
 
-  public Enumeration getAll ()
+  public Enumeration<RefAddr> getAll ()
   {
     return addrs.elements ();
   }
@@ -187,7 +187,7 @@ public class Reference implements Cloneable, Serializable
     return x + "]";
   }
 
-  protected Vector addrs;
+  protected Vector<RefAddr> addrs;
   protected String classFactory;
   protected String classFactoryLocation;
   protected String className;
diff --git a/javax/naming/ReferralException.java b/javax/naming/ReferralException.java
index ec2178e77..c264d637f 100644
--- a/javax/naming/ReferralException.java
+++ b/javax/naming/ReferralException.java
@@ -61,7 +61,7 @@ public abstract class ReferralException extends NamingException
 
   public abstract Object getReferralInfo();
   public abstract Context getReferralContext() throws NamingException;
-  public abstract Context getReferralContext(Hashtable env)
+  public abstract Context getReferralContext(Hashtable<?, ?> env)
     throws NamingException;
   public abstract boolean skipReferral();
   public abstract void retryReferral();
diff --git a/javax/naming/directory/Attribute.java b/javax/naming/directory/Attribute.java
index 59bf66dab..d29e1eae0 100644
--- a/javax/naming/directory/Attribute.java
+++ b/javax/naming/directory/Attribute.java
@@ -51,7 +51,7 @@ public interface Attribute extends Cloneable, Serializable
 {
   long serialVersionUID = 8707690322213556804L;
 
-  NamingEnumeration getAll() throws NamingException;
+  NamingEnumeration<?> getAll() throws NamingException;
   Object get() throws NamingException;
   int size();
   String getID();
diff --git a/javax/naming/directory/Attributes.java b/javax/naming/directory/Attributes.java
index 3d5ef9f4f..2dc2c6101 100644
--- a/javax/naming/directory/Attributes.java
+++ b/javax/naming/directory/Attributes.java
@@ -52,8 +52,8 @@ public interface Attributes extends Cloneable, Serializable
   boolean isCaseIgnored();
   int size();
   Attribute get(String attrID);
-  NamingEnumeration getAll();
-  NamingEnumeration getIDs();
+  NamingEnumeration<? extends Attribute> getAll();
+  NamingEnumeration<String> getIDs();
   Attribute put(String attrID, Object val);
   Attribute put(Attribute attr);
   Attribute remove(String attrID);
diff --git a/javax/naming/directory/BasicAttribute.java b/javax/naming/directory/BasicAttribute.java
index 047036585..67803e2ad 100644
--- a/javax/naming/directory/BasicAttribute.java
+++ b/javax/naming/directory/BasicAttribute.java
@@ -58,7 +58,7 @@ public class BasicAttribute implements Attribute
   /** True if this attribute's values are ordered.  */
   protected boolean ordered;
   /** Values for this attribute.  */
-  protected transient Vector values;
+  protected transient Vector<Object> values;
 
   // Used by cloning.
   private BasicAttribute ()
@@ -178,7 +178,7 @@ public class BasicAttribute implements Attribute
     return values.get (index);
   }
 
-  public NamingEnumeration getAll ()
+  public NamingEnumeration<Attribute> getAll ()
     throws NamingException
   {
     return new BasicAttributeEnumeration ();
diff --git a/javax/naming/directory/DirContext.java b/javax/naming/directory/DirContext.java
index 002cb78a9..d7d94a345 100644
--- a/javax/naming/directory/DirContext.java
+++ b/javax/naming/directory/DirContext.java
@@ -72,12 +72,32 @@ public interface DirContext extends Context
   DirContext getSchema(String name) throws NamingException;
   DirContext getSchemaClassDefinition(Name name) throws NamingException;
   DirContext getSchemaClassDefinition(String name) throws NamingException;
-  NamingEnumeration search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException;
-  NamingEnumeration search(String name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException;
-  NamingEnumeration search(Name name, Attributes matchingAttributes) throws NamingException;
-  NamingEnumeration search(String name, Attributes matchingAttributes) throws NamingException;
-  NamingEnumeration search(Name name, String filter, SearchControls cons) throws NamingException;
-  NamingEnumeration search(String name, String filter, SearchControls cons) throws NamingException;
-  NamingEnumeration search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException;
-  NamingEnumeration search(String name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException;
+  NamingEnumeration<SearchResult> search(Name name,
+                                         Attributes matchingAttributes,
+                                         String[] attributesToReturn)
+    throws NamingException;
+  NamingEnumeration<SearchResult> search(String name,
+                                         Attributes matchingAttributes,
+                                         String[] attributesToReturn)
+    throws NamingException;
+  NamingEnumeration<SearchResult> search(Name name,
+                                         Attributes matchingAttributes)
+    throws NamingException;
+  NamingEnumeration<SearchResult> search(String name,
+                                         Attributes matchingAttributes)
+    throws NamingException;
+  NamingEnumeration<SearchResult> search(Name name, String filter,
+                                         SearchControls cons)
+    throws NamingException;
+  NamingEnumeration<SearchResult> search(String name, String filter,
+                                         SearchControls cons)
+    throws NamingException;
+  NamingEnumeration<SearchResult> search(Name name, String filterExpr,
+                                         Object[] filterArgs,
+                                         SearchControls cons)
+    throws NamingException;
+  NamingEnumeration<SearchResult> search(String name, String filterExpr,
+                                         Object[] filterArgs,
+                                         SearchControls cons)
+    throws NamingException;
 }
diff --git a/javax/naming/directory/InitialDirContext.java b/javax/naming/directory/InitialDirContext.java
index c946f416b..fd8a59ff3 100644
--- a/javax/naming/directory/InitialDirContext.java
+++ b/javax/naming/directory/InitialDirContext.java
@@ -66,7 +66,7 @@ public class InitialDirContext extends InitialContext implements DirContext
     super (lazy);
   }
 
-  public InitialDirContext (Hashtable environment)
+  public InitialDirContext (Hashtable<?, ?> environment)
     throws NamingException
   {
     super (environment);
diff --git a/javax/naming/ldap/ControlFactory.java b/javax/naming/ldap/ControlFactory.java
index f72e67a75..b8151640f 100644
--- a/javax/naming/ldap/ControlFactory.java
+++ b/javax/naming/ldap/ControlFactory.java
@@ -59,7 +59,7 @@ public abstract class ControlFactory
 
   public static Control getControlInstance (Control control,
 					    Context ctx,
-					    Hashtable env)
+					    Hashtable<?, ?> env)
     throws NamingException
   {
     String path = (String) env.get (LdapContext.CONTROL_FACTORIES);
diff --git a/javax/naming/ldap/InitialLdapContext.java b/javax/naming/ldap/InitialLdapContext.java
index 45a9eae1a..f9493c3b2 100644
--- a/javax/naming/ldap/InitialLdapContext.java
+++ b/javax/naming/ldap/InitialLdapContext.java
@@ -60,22 +60,24 @@ public class InitialLdapContext
     this (null, null);
   }
 
-  public InitialLdapContext (Hashtable environment, Control[] connControls)
+  public InitialLdapContext (Hashtable<?, ?> environment,
+                             Control[] connControls)
     throws NamingException
   {
     super (false);
 
+    Hashtable myenv = null;
     if (connControls != null)
       {
 	if (environment == null)
-	  environment = new Hashtable ();
+	  myenv = new Hashtable ();
 	else
-	  environment = (Hashtable) environment.clone ();
-	environment.put ("java.naming.ldap.control.connect",
+	  myenv = (Hashtable) environment.clone ();
+	myenv.put ("java.naming.ldap.control.connect",
 			 connControls);
       }
 
-    init (environment);
+    init (myenv);
   }
 
   private LdapContext getDefaultInitLdapCtx ()
diff --git a/javax/naming/ldap/LdapReferralException.java b/javax/naming/ldap/LdapReferralException.java
index 61a2b8e44..87942b9fc 100644
--- a/javax/naming/ldap/LdapReferralException.java
+++ b/javax/naming/ldap/LdapReferralException.java
@@ -61,8 +61,9 @@ public abstract class LdapReferralException extends ReferralException
   }
 
   public abstract Context getReferralContext() throws NamingException;
-  public abstract Context getReferralContext(Hashtable env)
+  public abstract Context getReferralContext(Hashtable<?, ?> env)
     throws NamingException;
-  public abstract Context getReferralContext(Hashtable env, Control[] reqCtls)
+  public abstract Context getReferralContext(Hashtable<?, ?> env,
+                                             Control[] reqCtls)
     throws NamingException;
 }
diff --git a/javax/naming/spi/DirObjectFactory.java b/javax/naming/spi/DirObjectFactory.java
index ea0e69706..1a71c28f7 100644
--- a/javax/naming/spi/DirObjectFactory.java
+++ b/javax/naming/spi/DirObjectFactory.java
@@ -51,6 +51,6 @@ import javax.naming.directory.Attributes;
 public interface DirObjectFactory extends ObjectFactory
 {
   Object getObjectInstance(Object obj, Name name, Context nameCtx,
-  				  Hashtable environment, Attributes attrs)
+  				  Hashtable<?, ?> environment, Attributes attrs)
 				  throws Exception;
 }
diff --git a/javax/naming/spi/DirStateFactory.java b/javax/naming/spi/DirStateFactory.java
index b5add91cb..6ddd12f36 100644
--- a/javax/naming/spi/DirStateFactory.java
+++ b/javax/naming/spi/DirStateFactory.java
@@ -77,7 +77,7 @@ public interface DirStateFactory extends StateFactory
 
   DirStateFactory.Result getStateToBind(Object obj, Name name,
   					       Context nameCtx,
-					       Hashtable environment,
+					       Hashtable<?, ?> environment,
 					       Attributes inAttrs)
 					       throws NamingException;
 }
diff --git a/javax/naming/spi/DirectoryManager.java b/javax/naming/spi/DirectoryManager.java
index fd482efb5..a6d91b20c 100644
--- a/javax/naming/spi/DirectoryManager.java
+++ b/javax/naming/spi/DirectoryManager.java
@@ -93,7 +93,7 @@ public class DirectoryManager extends NamingManager
 
   public static Object getObjectInstance (Object refInfo, Name name,
 					  Context nameCtx,
-					  Hashtable environment,
+					  Hashtable<?, ?> environment,
 					  Attributes attrs)
     throws Exception
   {
@@ -186,7 +186,7 @@ public class DirectoryManager extends NamingManager
   public static DirStateFactory.Result getStateToBind (Object obj,
 						       Name name,
 						       Context nameCtx,
-						       Hashtable environment,
+						       Hashtable<?, ?> environment,
 						       Attributes attrs)
     throws NamingException
   {
diff --git a/javax/naming/spi/InitialContextFactory.java b/javax/naming/spi/InitialContextFactory.java
index 7bfcf095e..fea451da5 100644
--- a/javax/naming/spi/InitialContextFactory.java
+++ b/javax/naming/spi/InitialContextFactory.java
@@ -45,5 +45,6 @@ import javax.naming.NamingException;
 
 public interface InitialContextFactory
 {
-  Context getInitialContext (Hashtable environment) throws NamingException;
+  Context getInitialContext (Hashtable<?, ?> environment)
+    throws NamingException;
 }
diff --git a/javax/naming/spi/InitialContextFactoryBuilder.java b/javax/naming/spi/InitialContextFactoryBuilder.java
index 76564ab5e..fef073e8a 100644
--- a/javax/naming/spi/InitialContextFactoryBuilder.java
+++ b/javax/naming/spi/InitialContextFactoryBuilder.java
@@ -44,6 +44,6 @@ import javax.naming.NamingException;
 
 public interface InitialContextFactoryBuilder
 {
-  InitialContextFactory createInitialContextFactory (Hashtable environment)
+  InitialContextFactory createInitialContextFactory (Hashtable<?, ?> environment)
     throws NamingException;
 }
diff --git a/javax/naming/spi/NamingManager.java b/javax/naming/spi/NamingManager.java
index cfc9dbd5f..9b1fae8ad 100644
--- a/javax/naming/spi/NamingManager.java
+++ b/javax/naming/spi/NamingManager.java
@@ -71,7 +71,7 @@ public class NamingManager
     return icfb != null;
   }
   
-  public static Context getInitialContext (Hashtable environment)
+  public static Context getInitialContext (Hashtable<?, ?> environment)
     throws NamingException
   {
     InitialContextFactory icf = null;
@@ -117,7 +117,7 @@ public class NamingManager
 				Name name,
 				Context nameCtx,
 				String scheme,
-				Hashtable environment) 
+				Hashtable<?, ?> environment) 
     throws NamingException
   {
     String prefixes = null;
@@ -184,7 +184,7 @@ public class NamingManager
   }
 
   public static Context getURLContext (String scheme,
-				       Hashtable environment) 
+				       Hashtable<?, ?> environment) 
        throws NamingException
   {
     return getURLContext (null, null, null, scheme, environment);
@@ -221,7 +221,7 @@ public class NamingManager
   public static Object getObjectInstance (Object refInfo,
 					  Name name,
 					  Context nameCtx,
-					  Hashtable environment)
+					  Hashtable<?, ?> environment)
     throws Exception
   {
     ObjectFactory factory = null;
@@ -353,7 +353,7 @@ public class NamingManager
   }
 
   public static Object getStateToBind (Object obj, Name name,
-				       Context nameCtx, Hashtable environment)
+				       Context nameCtx, Hashtable<?, ?> environment)
     throws NamingException
   {
     StringTokenizer tokens = getPlusPath (Context.STATE_FACTORIES,
diff --git a/javax/naming/spi/ObjectFactory.java b/javax/naming/spi/ObjectFactory.java
index 81648d9a8..3374742c1 100644
--- a/javax/naming/spi/ObjectFactory.java
+++ b/javax/naming/spi/ObjectFactory.java
@@ -46,6 +46,6 @@ import javax.naming.Name;
 public interface ObjectFactory
 {
   Object getObjectInstance (Object obj, Name name, Context nameCtx,
-                            Hashtable environment)
+                            Hashtable<?, ?> environment)
     throws Exception;
 }
diff --git a/javax/naming/spi/ObjectFactoryBuilder.java b/javax/naming/spi/ObjectFactoryBuilder.java
index a76139315..5d3f96bdc 100644
--- a/javax/naming/spi/ObjectFactoryBuilder.java
+++ b/javax/naming/spi/ObjectFactoryBuilder.java
@@ -49,6 +49,6 @@ import javax.naming.NamingException;
 public interface ObjectFactoryBuilder
 {
   ObjectFactory createObjectFactory(Object obj,
-  					   Hashtable environment)
+  					   Hashtable<?, ?> environment)
 					   throws NamingException;
 }
diff --git a/javax/naming/spi/Resolver.java b/javax/naming/spi/Resolver.java
index d80fb6169..a204fc6a6 100644
--- a/javax/naming/spi/Resolver.java
+++ b/javax/naming/spi/Resolver.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package javax.naming.spi;
 
+import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.NamingException;
  
@@ -48,8 +49,10 @@ import javax.naming.NamingException;
 
 public interface Resolver
 {
-  ResolveResult resolveToClass(Name name, Class contextType)
+  ResolveResult resolveToClass(Name name, 
+                               Class<? extends Context> contextType)
     throws NamingException;
-  ResolveResult resolveToClass(String name, Class contextType)
+  ResolveResult resolveToClass(String name,
+                               Class<? extends Context> contextType)
     throws NamingException;
 }
diff --git a/javax/naming/spi/StateFactory.java b/javax/naming/spi/StateFactory.java
index 1fbdeb1fa..af5ed11c7 100644
--- a/javax/naming/spi/StateFactory.java
+++ b/javax/naming/spi/StateFactory.java
@@ -51,5 +51,5 @@ import javax.naming.NamingException;
 public interface StateFactory
 {
   Object getStateToBind(Object obj, Name name, Context nameCtx,
-  			       Hashtable environment) throws NamingException;
+  			       Hashtable<?, ?> environment) throws NamingException;
 }