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

@@ -26,12 +26,10 @@
 package com.sun.jndi.toolkit.ctx;
 
 import javax.naming.*;
 import javax.naming.directory.*;
 
-import javax.naming.spi.ResolveResult;
-
 /* Direct subclasses of ComponentDirContext must provide implementations for
  * the abstract c_ DirContext methods, and override the c_ Context methods
  * (which are no longer abstract because they have been overriden by
  * AtomicContext, the direct superclass of PartialDSCompositeContext).
  *

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

@@ -170,29 +171,32 @@
         throws NamingException  {
             c_processJunction_nns(name, 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 {
             c_processJunction_nns(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)
         throws NamingException  {
             c_processJunction_nns(name, 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  {

@@ -343,17 +347,18 @@
                 break;
             }
         return answer;
     }
 
-    protected NamingEnumeration p_search(Name name,
+    protected NamingEnumeration<SearchResult> p_search(
+                    Name name,
                                       Attributes matchingAttributes,
                                       String[] attributesToReturn,
                                       Continuation cont)
         throws NamingException {
         HeadTail res = p_resolveIntermediate(name, cont);
-        NamingEnumeration answer = null;
+        NamingEnumeration<SearchResult> answer = null;
         switch (res.getStatus()) {
             case TERMINAL_NNS_COMPONENT:
                 answer = c_search_nns(res.getHead(), matchingAttributes,
                                       attributesToReturn, cont);
                 break;

@@ -369,16 +374,17 @@
                 break;
             }
         return answer;
     }
 
-    protected NamingEnumeration p_search(Name name,
+    protected NamingEnumeration<SearchResult> p_search(Name name,
                                       String filter,
-                                      SearchControls cons, Continuation cont)
+                                                       SearchControls cons,
+                                                       Continuation cont)
         throws NamingException {
         HeadTail res = p_resolveIntermediate(name, cont);
-        NamingEnumeration answer = null;
+        NamingEnumeration<SearchResult> answer = null;
         switch (res.getStatus()) {
             case TERMINAL_NNS_COMPONENT:
                 answer = c_search_nns(res.getHead(), filter, cons, cont);
                 break;
 

@@ -392,18 +398,18 @@
                 break;
             }
         return answer;
     }
 
-    protected NamingEnumeration p_search(Name name,
+    protected NamingEnumeration<SearchResult> p_search(Name name,
                                          String filterExpr,
                                          Object[] filterArgs,
                                          SearchControls cons,
                                          Continuation cont)
             throws NamingException {
         HeadTail res = p_resolveIntermediate(name, cont);
-        NamingEnumeration answer = null;
+        NamingEnumeration<SearchResult> answer = null;
         switch (res.getStatus()) {
             case TERMINAL_NNS_COMPONENT:
                 answer = c_search_nns(res.getHead(),
                                       filterExpr, filterArgs, cons, cont);
                 break;