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

@@ -23,12 +23,10 @@
  * questions.
  */
 
 package com.sun.jndi.toolkit.ctx;
 
-import java.util.Hashtable;
-
 import javax.naming.*;
 import javax.naming.spi.ResolveResult;
 
 /**
   * Provides implementation of p_* operations using

@@ -55,13 +53,13 @@
     protected abstract Object c_lookup(Name name, Continuation cont)
         throws NamingException;
     protected abstract Object c_lookupLink(Name name, Continuation cont)
         throws NamingException;
 
-    protected abstract NamingEnumeration c_list(Name name,
+    protected abstract NamingEnumeration<NameClassPair> c_list(Name name,
         Continuation cont) throws NamingException;
-    protected abstract NamingEnumeration c_listBindings(Name name,
+    protected abstract NamingEnumeration<Binding> c_listBindings(Name name,
         Continuation cont) throws NamingException;
     protected abstract void c_bind(Name name, Object obj, Continuation cont)
         throws NamingException;
     protected abstract void c_rebind(Name name, Object obj, Continuation cont)
         throws NamingException;

@@ -235,17 +233,17 @@
         throws NamingException {
             c_processJunction_nns(name, cont);
             return null;
         }
 
-    protected NamingEnumeration c_list_nns(Name name,
+    protected NamingEnumeration<NameClassPair> c_list_nns(Name name,
         Continuation cont) throws NamingException {
             c_processJunction_nns(name, cont);
             return null;
         }
 
-    protected NamingEnumeration c_listBindings_nns(Name name,
+    protected NamingEnumeration<Binding> c_listBindings_nns(Name name,
         Continuation cont) throws NamingException {
             c_processJunction_nns(name, cont);
             return null;
         }
 

@@ -493,11 +491,11 @@
 
 
     /* implementation for Resolver method */
 
     protected ResolveResult p_resolveToClass(Name name,
-                                             Class contextType,
+                                             Class<?> contextType,
                                              Continuation cont)
             throws NamingException {
 
         if (contextType.isInstance(this)) {
             cont.setSuccess();

@@ -554,13 +552,13 @@
                 break;
         }
         return ret;
     }
 
-    protected NamingEnumeration p_list(Name name, Continuation cont)
+    protected NamingEnumeration<NameClassPair> p_list(Name name, Continuation cont)
         throws NamingException {
-        NamingEnumeration ret = null;
+        NamingEnumeration<NameClassPair> ret = null;
         HeadTail res = p_resolveIntermediate(name, cont);
         switch (res.getStatus()) {
             case TERMINAL_NNS_COMPONENT:
                 if (debug > 0)
                     System.out.println("c_list_nns(" + res.getHead() + ")");

@@ -579,13 +577,13 @@
                 break;
         }
         return ret;
     }
 
-    protected NamingEnumeration p_listBindings(Name name, Continuation cont) throws
+    protected NamingEnumeration<Binding> p_listBindings(Name name, Continuation cont) throws
         NamingException {
-        NamingEnumeration ret = null;
+        NamingEnumeration<Binding> ret = null;
         HeadTail res = p_resolveIntermediate(name, cont);
         switch (res.getStatus()) {
             case TERMINAL_NNS_COMPONENT:
                 ret = c_listBindings_nns(res.getHead(), cont);
                 break;