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

@@ -25,11 +25,10 @@
 
 package com.sun.jndi.toolkit.ctx;
 
 import javax.naming.*;
 import javax.naming.directory.*;
-import javax.naming.spi.ResolveResult;
 
 /**
  * Direct subclasses of AtomicDirContext must provide implementations for
  * the abstract a_ DirContext methods, and override the a_ Context methods
  * (which are no longer abstract because they have been overriden by

@@ -77,24 +76,29 @@
     protected abstract DirContext a_createSubcontext(String name,
                                                     Attributes attrs,
                                                     Continuation cont)
         throws NamingException;
 
-    protected abstract NamingEnumeration a_search(Attributes matchingAttributes,
+    protected abstract NamingEnumeration<SearchResult> a_search(
+                                                  Attributes matchingAttributes,
                                                   String[] attributesToReturn,
                                                   Continuation cont)
         throws NamingException;
 
-    protected abstract NamingEnumeration a_search(String name,
+    protected abstract NamingEnumeration<SearchResult> a_search(
+                                                  String name,
                                                   String filterExpr,
                                                   Object[] filterArgs,
-                                                  SearchControls cons, Continuation cont)
+                                                  SearchControls cons,
+                                                  Continuation cont)
         throws NamingException;
 
-    protected abstract NamingEnumeration a_search(String name,
+    protected abstract NamingEnumeration<SearchResult> a_search(
+                                                  String name,
                                                   String filter,
-                                                  SearchControls cons, Continuation cont)
+                                                  SearchControls cons,
+                                                  Continuation cont)
         throws NamingException;
 
     protected abstract DirContext a_getSchema(Continuation cont)
         throws NamingException;
 

@@ -161,29 +165,30 @@
         throws NamingException  {
             a_processJunction_nns(name, cont);
             return null;
         }
 
-    protected NamingEnumeration a_search_nns(Attributes matchingAttributes,
+    protected NamingEnumeration<SearchResult> a_search_nns(
+                                             Attributes matchingAttributes,
                                              String[] attributesToReturn,
                                              Continuation cont)
         throws NamingException {
             a_processJunction_nns(cont);
             return null;
         }
 
-    protected NamingEnumeration a_search_nns(String name,
+    protected NamingEnumeration<SearchResult> a_search_nns(String name,
                                              String filterExpr,
                                              Object[] filterArgs,
                                              SearchControls cons,
                                              Continuation cont)
         throws NamingException {
             a_processJunction_nns(name, cont);
             return null;
         }
 
-    protected NamingEnumeration a_search_nns(String name,
+    protected NamingEnumeration<SearchResult> a_search_nns(String name,
                                              String filter,
                                              SearchControls cons,
                                              Continuation cont)
         throws NamingException  {
             a_processJunction_nns(name, cont);

@@ -248,33 +253,35 @@
                 return a_createSubcontext(name.toString(),
                                           attrs, cont);
             return null;
         }
 
-    protected NamingEnumeration c_search(Name name,
+    protected NamingEnumeration<SearchResult> c_search(Name name,
                                          Attributes matchingAttributes,
                                          String[] attributesToReturn,
                                          Continuation cont)
         throws NamingException  {
             if (resolve_to_context(name, cont))
                 return a_search(matchingAttributes, attributesToReturn, cont);
             return null;
         }
 
-    protected NamingEnumeration c_search(Name name,
+    protected NamingEnumeration<SearchResult> c_search(Name name,
                                          String filter,
-                                         SearchControls cons, Continuation cont)
+                                                       SearchControls cons,
+                                                       Continuation cont)
         throws NamingException {
             if (resolve_to_penultimate_context(name, cont))
                 return a_search(name.toString(), filter, cons, cont);
             return null;
         }
 
-    protected NamingEnumeration c_search(Name name,
+    protected NamingEnumeration<SearchResult> c_search(Name name,
                                          String filterExpr,
                                          Object[] filterArgs,
-                                         SearchControls cons, Continuation cont)
+                                                       SearchControls cons,
+                                                       Continuation cont)
         throws NamingException  {
             if (resolve_to_penultimate_context(name, cont))
                 return a_search(name.toString(), filterExpr, filterArgs, cons, cont);
             return null;
         }

@@ -338,29 +345,31 @@
             if (resolve_to_penultimate_context_nns(name, cont))
                 return a_createSubcontext_nns(name.toString(), attrs, cont);
             return null;
         }
 
-    protected NamingEnumeration c_search_nns(Name name,
+    protected NamingEnumeration<SearchResult> c_search_nns(
+                                         Name name,
                                          Attributes matchingAttributes,
                                          String[] attributesToReturn,
                                          Continuation cont)
         throws NamingException  {
             resolve_to_nns_and_continue(name, cont);
             return null;
         }
 
-    protected NamingEnumeration c_search_nns(Name name,
+    protected NamingEnumeration<SearchResult> c_search_nns(Name name,
                                          String filter,
-                                         SearchControls cons, Continuation cont)
+                                                           SearchControls cons,
+                                                           Continuation cont)
         throws NamingException {
             if (resolve_to_penultimate_context_nns(name, cont))
                 return a_search_nns(name.toString(), filter, cons, cont);
             return null;
         }
 
-    protected NamingEnumeration c_search_nns(Name name,
+    protected NamingEnumeration<SearchResult> c_search_nns(Name name,
                                              String filterExpr,
                                              Object[] filterArgs,
                                              SearchControls cons,
                                              Continuation cont)
         throws NamingException  {