1 files changed, 9 insertions, 5 deletions
diff --git a/javax/naming/InitialContext.java b/javax/naming/InitialContext.java
index 571536950..7e153c5f7 100644
--- a/javax/naming/InitialContext.java
+++ b/javax/naming/InitialContext.java
@@ -293,22 +293,26 @@ public class InitialContext implements Context
     getURLOrDefaultInitCtx (oldName).rename (oldName, newName);
   }
 
-  public NamingEnumeration list (Name name) throws NamingException
+  public NamingEnumeration<NameClassPair> list (Name name)
+    throws NamingException
   {
     return getURLOrDefaultInitCtx (name).list (name);
   }
 
-  public NamingEnumeration list (String name) throws NamingException
+  public NamingEnumeration<NameClassPair> list (String name)
+    throws NamingException
   {
     return getURLOrDefaultInitCtx (name).list (name);
   }
 
-  public NamingEnumeration listBindings (Name name) throws NamingException
+  public NamingEnumeration<Binding> listBindings (Name name)
+   throws NamingException
   {
     return getURLOrDefaultInitCtx (name).listBindings (name);
   }
 
-  public NamingEnumeration listBindings (String name) throws NamingException
+  public NamingEnumeration<Binding> listBindings (String name)
+    throws NamingException
   {
     return getURLOrDefaultInitCtx (name).listBindings (name);
   }
@@ -375,7 +379,7 @@ public class InitialContext implements Context
     return myProps.remove (propName);
   }
 
-  public Hashtable getEnvironment () throws NamingException
+  public Hashtable<?, ?> getEnvironment () throws NamingException
   {
     return myProps;
   }