src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeDirContext.java

@@ -27,11 +27,10 @@
 
 import java.util.Hashtable;
 
 import javax.naming.*;
 import javax.naming.directory.*;
-import javax.naming.spi.NamingManager;
 import javax.naming.spi.DirectoryManager;
 
 /*
  * Inherit from AtomicContext so that subclasses of PartialCompositeDirContext
  * can get the ns methods defined in subclasses of PartialCompositeContext.

@@ -81,23 +80,26 @@
      protected abstract DirContext p_createSubcontext(Name name,
                                                      Attributes attrs,
                                                      Continuation cont)
          throws NamingException;
 
-     protected abstract NamingEnumeration p_search(Name name,
+     protected abstract NamingEnumeration<SearchResult> p_search(
+                            Name name,
                                                    Attributes matchingAttributes,
                                                    String[] attributesToReturn,
                                                    Continuation cont)
          throws NamingException;
 
-     protected abstract NamingEnumeration p_search(Name name,
+     protected abstract NamingEnumeration<SearchResult> p_search(
+                            Name name,
                                                    String filter,
                                                    SearchControls cons,
                                                    Continuation cont)
          throws NamingException;
 
-     protected abstract NamingEnumeration p_search(Name name,
+     protected abstract NamingEnumeration<SearchResult> p_search(
+                            Name name,
                                                    String filterExpr,
                                                    Object[] filterArgs,
                                                    SearchControls cons,
                                                    Continuation cont)
          throws NamingException;

@@ -128,11 +130,11 @@
     }
 
     public Attributes getAttributes(Name name, String[] attrIds)
             throws NamingException {
         PartialCompositeDirContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
         Attributes answer;
         Name nm = name;
 
         try {

@@ -155,11 +157,11 @@
     }
 
     public void modifyAttributes(Name name, int mod_op, Attributes attrs)
             throws NamingException {
         PartialCompositeDirContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
         Name nm = name;
 
         try {
             ctx.p_modifyAttributes(nm, mod_op, attrs, cont);

@@ -180,11 +182,11 @@
     }
 
     public void modifyAttributes(Name name, ModificationItem[] mods)
             throws NamingException {
         PartialCompositeDirContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
         Name nm = name;
 
         try {
             ctx.p_modifyAttributes(nm, mods, cont);

@@ -205,11 +207,11 @@
     }
 
     public void bind(Name name, Object obj, Attributes attrs)
             throws NamingException {
         PartialCompositeDirContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
         Name nm = name;
 
         try {
             ctx.p_bind(nm, obj, attrs, cont);

@@ -230,11 +232,11 @@
     }
 
     public void rebind(Name name, Object obj, Attributes attrs)
             throws NamingException {
         PartialCompositeDirContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
         Name nm = name;
 
         try {
             ctx.p_rebind(nm, obj, attrs, cont);

@@ -255,11 +257,11 @@
     }
 
     public DirContext createSubcontext(Name name, Attributes attrs)
             throws NamingException {
         PartialCompositeDirContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
         DirContext answer;
         Name nm = name;
 
         try {

@@ -306,13 +308,13 @@
                String[] attributesToReturn)
         throws NamingException
     {
 
         PartialCompositeDirContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
-        NamingEnumeration answer;
+        NamingEnumeration<SearchResult> answer;
         Name nm = name;
 
         try {
             answer = ctx.p_search(nm, matchingAttributes,
                                   attributesToReturn, cont);

@@ -345,13 +347,13 @@
                SearchControls cons)
         throws NamingException
     {
 
         PartialCompositeDirContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
-        NamingEnumeration answer;
+        NamingEnumeration<SearchResult> answer;
         Name nm = name;
 
         try {
             answer = ctx.p_search(nm, filter, cons, cont);
             while (cont.isContinue()) {

@@ -383,13 +385,13 @@
                SearchControls cons)
         throws NamingException
     {
 
         PartialCompositeDirContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
-        NamingEnumeration answer;
+        NamingEnumeration<SearchResult> answer;
         Name nm = name;
 
         try {
             answer = ctx.p_search(nm, filterExpr, filterArgs, cons, cont);
             while (cont.isContinue()) {

@@ -409,11 +411,11 @@
         return getSchema(new CompositeName(name));
     }
 
     public DirContext getSchema(Name name) throws NamingException {
         PartialCompositeDirContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
         DirContext answer;
         Name nm = name;
 
         try {

@@ -436,11 +438,11 @@
     }
 
     public DirContext getSchemaClassDefinition(Name name)
             throws NamingException {
         PartialCompositeDirContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
         DirContext answer;
         Name nm = name;
 
         try {

@@ -507,18 +509,18 @@
             OperationNotSupportedException e = new
                 OperationNotSupportedException();
             throw cont.fillInException(e);
         }
 
-    protected NamingEnumeration a_list(
+    protected NamingEnumeration<NameClassPair> a_list(
         Continuation cont) throws NamingException {
             OperationNotSupportedException e = new
                 OperationNotSupportedException();
             throw cont.fillInException(e);
         }
 
-    protected NamingEnumeration a_listBindings(
+    protected NamingEnumeration<Binding> a_listBindings(
         Continuation cont) throws NamingException {
             OperationNotSupportedException e = new
                 OperationNotSupportedException();
             throw cont.fillInException(e);
         }