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

@@ -75,20 +75,20 @@
 
 // ------ Abstract methods whose implementations come from subclasses
 
     /* Equivalent to method in  Resolver interface */
     protected abstract ResolveResult p_resolveToClass(Name name,
-        Class contextType, Continuation cont) throws NamingException;
+        Class<?> contextType, Continuation cont) throws NamingException;
 
     /* Equivalent to methods in Context interface */
     protected abstract Object p_lookup(Name name, Continuation cont)
         throws NamingException;
     protected abstract Object p_lookupLink(Name name, Continuation cont)
         throws NamingException;
-    protected abstract NamingEnumeration p_list(Name name,
+    protected abstract NamingEnumeration<NameClassPair> p_list(Name name,
         Continuation cont) throws NamingException;
-    protected abstract NamingEnumeration p_listBindings(Name name,
+    protected abstract NamingEnumeration<Binding> p_listBindings(Name name,
         Continuation cont) throws NamingException;
     protected abstract void p_bind(Name name, Object obj, Continuation cont)
         throws NamingException;
     protected abstract void p_rebind(Name name, Object obj, Continuation cont)
         throws NamingException;

@@ -113,11 +113,11 @@
      * getEnvironment(), which most implementations clone before returning.
      * Subclass should ALWAYS override this with the cheapest possible way.
      * The toolkit knows to clone when necessary.
      * @return The possibly null environment of the context.
      */
-    protected Hashtable p_getEnvironment() throws NamingException {
+    protected Hashtable<?,?> p_getEnvironment() throws NamingException {
         return getEnvironment();
     }
 
 
 // ------ implementations of methods in Resolver and Context

@@ -135,11 +135,11 @@
     public ResolveResult resolveToClass(Name name,
                                         Class<? extends Context> contextType)
         throws NamingException
     {
         PartialCompositeContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
         ResolveResult answer;
         Name nm = name;
 
         try {

@@ -166,11 +166,11 @@
         return lookup(new CompositeName(name));
     }
 
     public Object lookup(Name name) throws NamingException {
         PartialCompositeContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
         Object answer;
         Name nm = name;
 
         try {

@@ -192,11 +192,11 @@
     }
 
     public void bind(Name name, Object newObj) throws NamingException {
         PartialCompositeContext ctx = this;
         Name nm = name;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
 
         try {
             ctx.p_bind(nm, newObj, cont);
             while (cont.isContinue()) {

@@ -214,11 +214,11 @@
         rebind(new CompositeName(name), newObj);
     }
     public void rebind(Name name, Object newObj) throws NamingException {
         PartialCompositeContext ctx = this;
         Name nm = name;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
 
         try {
             ctx.p_rebind(nm, newObj, cont);
             while (cont.isContinue()) {

@@ -236,11 +236,11 @@
         unbind(new CompositeName(name));
     }
     public void unbind(Name name) throws NamingException {
         PartialCompositeContext ctx = this;
         Name nm = name;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
 
         try {
             ctx.p_unbind(nm, cont);
             while (cont.isContinue()) {

@@ -260,11 +260,11 @@
     public void rename(Name oldName, Name newName)
         throws NamingException
     {
         PartialCompositeContext ctx = this;
         Name nm = oldName;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(oldName, env);
 
         try {
             ctx.p_rename(nm, newName, cont);
             while (cont.isContinue()) {

@@ -291,12 +291,12 @@
     public NamingEnumeration<NameClassPair> list(Name name)
         throws NamingException
     {
         PartialCompositeContext ctx = this;
         Name nm = name;
-        NamingEnumeration answer;
-        Hashtable env = p_getEnvironment();
+        NamingEnumeration<NameClassPair> answer;
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
 
         try {
             answer = ctx.p_list(nm, cont);
             while (cont.isContinue()) {

@@ -320,12 +320,12 @@
     public NamingEnumeration<Binding> listBindings(Name name)
         throws NamingException
     {
         PartialCompositeContext ctx = this;
         Name nm = name;
-        NamingEnumeration answer;
-        Hashtable env = p_getEnvironment();
+        NamingEnumeration<Binding> answer;
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
 
         try {
             answer = ctx.p_listBindings(nm, cont);
             while (cont.isContinue()) {

@@ -345,11 +345,11 @@
     }
 
     public void destroySubcontext(Name name) throws NamingException {
         PartialCompositeContext ctx = this;
         Name nm = name;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
 
         try {
             ctx.p_destroySubcontext(nm, cont);
             while (cont.isContinue()) {

@@ -369,11 +369,11 @@
 
     public Context createSubcontext(Name name) throws NamingException {
         PartialCompositeContext ctx = this;
         Name nm = name;
         Context answer;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
 
         try {
             answer = ctx.p_createSubcontext(nm, cont);
             while (cont.isContinue()) {

@@ -392,11 +392,11 @@
         return lookupLink(new CompositeName(name));
     }
 
     public Object lookupLink(Name name) throws NamingException {
         PartialCompositeContext ctx = this;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
         Object answer;
         Name nm = name;
 
         try {

@@ -419,11 +419,11 @@
 
     public NameParser getNameParser(Name name) throws NamingException {
         PartialCompositeContext ctx = this;
         Name nm = name;
         NameParser answer;
-        Hashtable env = p_getEnvironment();
+        Hashtable<?,?> env = p_getEnvironment();
         Continuation cont = new Continuation(name, env);
 
         try {
             answer = ctx.p_getNameParser(nm, cont);
             while (cont.isContinue()) {