* javax/naming/directory/InitialDirContext.java (search): Genericized.

	* javax/naming/directory/BasicAttributes.java (getAll): Genericized.
	(getIDs): Likewise.
	* javax/naming/directory/BasicAttribute.java (getAll): Fixed return
	type.
	* javax/naming/InitialContext.java: Genericized.
	(list): Likewise.
	(listBindings): Likewise.
	* javax/naming/CompoundName.java (getAll): Genericized.
	* javax/naming/CompositeName.java (getAll): Genericized.

6 files changed, 35 insertions, 24 deletions

diff --git a/javax/naming/CompositeName.java b/javax/naming/CompositeName.java
index c4d41a74e..6c4b1df46 100644
--- a/javax/naming/CompositeName.java
+++ b/javax/naming/CompositeName.java
@@ -224,7 +224,7 @@ public class CompositeName implements Name, Cloneable, Serializable
     return (String) elts.get (posn);
   }
 
-  public Enumeration getAll ()
+  public Enumeration<String> getAll ()
   {
     return elts.elements ();
   }
diff --git a/javax/naming/CompoundName.java b/javax/naming/CompoundName.java
index 9b766b6c5..e48a49064 100644
--- a/javax/naming/CompoundName.java
+++ b/javax/naming/CompoundName.java
@@ -285,7 +285,7 @@ public class CompoundName implements Name, Cloneable, Serializable
     return (String) elts.get (posn);
   }
 
-  public Enumeration getAll ()
+  public Enumeration<String> getAll ()
   {
     return elts.elements ();
   }
diff --git a/javax/naming/InitialContext.java b/javax/naming/InitialContext.java
index 571536950..7e153c5f7 100644
--- a/javax/naming/InitialContext.java
+++ b/javax/naming/InitialContext.java
@@ -293,22 +293,26 @@ public class InitialContext implements Context
     getURLOrDefaultInitCtx (oldName).rename (oldName, newName);
   }
 
-  public NamingEnumeration list (Name name) throws NamingException
+  public NamingEnumeration<NameClassPair> list (Name name)
+    throws NamingException
   {
     return getURLOrDefaultInitCtx (name).list (name);
   }
 
-  public NamingEnumeration list (String name) throws NamingException
+  public NamingEnumeration<NameClassPair> list (String name)
+    throws NamingException
   {
     return getURLOrDefaultInitCtx (name).list (name);
   }
 
-  public NamingEnumeration listBindings (Name name) throws NamingException
+  public NamingEnumeration<Binding> listBindings (Name name)
+   throws NamingException
   {
     return getURLOrDefaultInitCtx (name).listBindings (name);
   }
 
-  public NamingEnumeration listBindings (String name) throws NamingException
+  public NamingEnumeration<Binding> listBindings (String name)
+    throws NamingException
   {
     return getURLOrDefaultInitCtx (name).listBindings (name);
   }
@@ -375,7 +379,7 @@ public class InitialContext implements Context
     return myProps.remove (propName);
   }
 
-  public Hashtable getEnvironment () throws NamingException
+  public Hashtable<?, ?> getEnvironment () throws NamingException
   {
     return myProps;
   }
diff --git a/javax/naming/directory/BasicAttribute.java b/javax/naming/directory/BasicAttribute.java
index 67803e2ad..bc1487fd4 100644
--- a/javax/naming/directory/BasicAttribute.java
+++ b/javax/naming/directory/BasicAttribute.java
@@ -178,7 +178,7 @@ public class BasicAttribute implements Attribute
     return values.get (index);
   }
 
-  public NamingEnumeration<Attribute> getAll ()
+  public NamingEnumeration<?> getAll ()
     throws NamingException
   {
     return new BasicAttributeEnumeration ();
diff --git a/javax/naming/directory/BasicAttributes.java b/javax/naming/directory/BasicAttributes.java
index 37ec19577..8ab4f2e8c 100644
--- a/javax/naming/directory/BasicAttributes.java
+++ b/javax/naming/directory/BasicAttributes.java
@@ -123,12 +123,12 @@ public class BasicAttributes implements Attributes
     return null;
   }
 
-  public NamingEnumeration getAll ()
+  public NamingEnumeration<Attribute> getAll ()
   {
     return new BasicAttributesEnumeration (false);
   }
 
-  public NamingEnumeration getIDs ()
+  public NamingEnumeration<String> getIDs ()
   {
     return new BasicAttributesEnumeration (true);
   }
diff --git a/javax/naming/directory/InitialDirContext.java b/javax/naming/directory/InitialDirContext.java
index fd8a59ff3..8c7852fbb 100644
--- a/javax/naming/directory/InitialDirContext.java
+++ b/javax/naming/directory/InitialDirContext.java
@@ -205,58 +205,65 @@ public class InitialDirContext extends InitialContext implements DirContext
     return getURLOrDefaultInitDirCtx (name).getSchemaClassDefinition (name);
   }
 
-  public NamingEnumeration search(Name name, Attributes matchingAttributes,
-				  String[] attributesToReturn)
+  public NamingEnumeration<SearchResult> search(Name name,
+                                                Attributes matchingAttributes,
+                                                String[] attributesToReturn)
     throws NamingException
   {
     return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes,
 						    attributesToReturn);
   }
 
-  public NamingEnumeration search(String name, Attributes matchingAttributes,
-				  String[] attributesToReturn)
+  public NamingEnumeration<SearchResult> search(String name,
+                                                Attributes matchingAttributes,
+                                                String[] attributesToReturn)
     throws NamingException
   {
     return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes,
 						    attributesToReturn);
   }
 
-  public NamingEnumeration search(Name name, Attributes matchingAttributes)
+  public NamingEnumeration<SearchResult> search(Name name,
+                                                Attributes matchingAttributes)
     throws NamingException
   {
     return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes);
   }
 
-  public NamingEnumeration search(String name, Attributes matchingAttributes)
+  public NamingEnumeration<SearchResult> search(String name,
+                                                Attributes matchingAttributes)
     throws NamingException
   {
     return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes);
   }
 
-  public NamingEnumeration search(Name name, String filter,
-				  SearchControls cons)
+  public NamingEnumeration<SearchResult> search(Name name, String filter,
+                                                SearchControls cons)
     throws NamingException
   {
     return getURLOrDefaultInitDirCtx (name).search (name, filter, cons);
   }
 
-  public NamingEnumeration search(String name, String filter,
-				  SearchControls cons)
+  public NamingEnumeration<SearchResult> search(String name, String filter,
+                                                SearchControls cons)
     throws NamingException
   {
     return getURLOrDefaultInitDirCtx (name).search (name, filter, cons);
   }
 
-  public NamingEnumeration search(Name name, String filterExpr,
-				  Object[] filterArgs, SearchControls cons)
+  public NamingEnumeration<SearchResult> search(Name name, String filterExpr,
+                                                Object[] filterArgs,
+                                                SearchControls cons)
     throws NamingException
   {
     return getURLOrDefaultInitDirCtx (name).search (name, filterExpr,
 						    filterArgs, cons);
   }
 
-  public NamingEnumeration search(String name, String filterExpr,
-				  Object[] filterArgs, SearchControls cons)
+  public NamingEnumeration<SearchResult> search(String name,
+                                                String filterExpr,
+                                                Object[] filterArgs,
+                                                SearchControls cons)
     throws NamingException
   {
     return getURLOrDefaultInitDirCtx (name).search (name, filterExpr,