CVSROOT: /cvsroot/classpath Module name: classpath Branch: generics-branch Changes by: Andrew John Hughes <gnu_andrew> 06/06/14 20:29:27
Modified files: . : ChangeLog javax/naming : InitialContext.java Log message: 2006-06-14 Andrew John Hughes <[EMAIL PROTECTED]> * javax/naming/InitialContext.java: (list(javax.naming.Name)): Fixed generic type. (list(String)): Likewise. (listBindings(javax.naming.Name)): Likewise. (listBindings(String)): Likewise. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.267&r2=1.2386.2.268 http://cvs.savannah.gnu.org/viewcvs/classpath/javax/naming/InitialContext.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.7.2.5&r2=1.7.2.6 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/classpath/classpath/ChangeLog,v retrieving revision 1.2386.2.267 retrieving revision 1.2386.2.268 diff -u -b -r1.2386.2.267 -r1.2386.2.268 --- ChangeLog 11 Jun 2006 18:23:15 -0000 1.2386.2.267 +++ ChangeLog 14 Jun 2006 20:29:25 -0000 1.2386.2.268 @@ -1,3 +1,11 @@ +2006-06-14 Andrew John Hughes <[EMAIL PROTECTED]> + + * javax/naming/InitialContext.java: + (list(javax.naming.Name)): Fixed generic type. + (list(String)): Likewise. + (listBindings(javax.naming.Name)): Likewise. + (listBindings(String)): Likewise. + 2006-06-11 Raif S. Naffah <[EMAIL PROTECTED]> PR Classpath/26065 Index: javax/naming/InitialContext.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/naming/InitialContext.java,v retrieving revision 1.7.2.5 retrieving revision 1.7.2.6 diff -u -b -r1.7.2.5 -r1.7.2.6 --- javax/naming/InitialContext.java 4 Jun 2006 21:26:33 -0000 1.7.2.5 +++ javax/naming/InitialContext.java 14 Jun 2006 20:29:26 -0000 1.7.2.6 @@ -424,25 +424,25 @@ } /** @inheritDoc */ - public NamingEnumeration list (Name name) throws NamingException + public NamingEnumeration<NameClassPair> list (Name name) throws NamingException { return getURLOrDefaultInitCtx (name).list (name); } /** @inheritDoc */ - public NamingEnumeration list (String name) throws NamingException + public NamingEnumeration<NameClassPair> list (String name) throws NamingException { return getURLOrDefaultInitCtx (name).list (name); } /** @inheritDoc */ - public NamingEnumeration listBindings (Name name) throws NamingException + public NamingEnumeration<Binding> listBindings (Name name) throws NamingException { return getURLOrDefaultInitCtx (name).listBindings (name); } /** @inheritDoc */ - public NamingEnumeration listBindings (String name) throws NamingException + public NamingEnumeration<Binding> listBindings (String name) throws NamingException { return getURLOrDefaultInitCtx (name).listBindings (name); }