I'm checking this in on the generics branch. The 1.5 japi results seem to lag cvs by a couple of days. I found these missing genericizations when looking through the results today. Unfortunately due to the lag it is kind of hard to tell what is really unfinished; some of the things it claims are wrong actually are not.
Tom 2005-12-02 Tom Tromey <[EMAIL PROTECTED]> * javax/naming/directory/InitialDirContext.java (search): Genericized. * javax/naming/directory/BasicAttributes.java (getAll): Genericized. (getIDs): Likewise. * javax/naming/directory/BasicAttribute.java (getAll): Fixed return type. * javax/naming/InitialContext.java: Genericized. (list): Likewise. (listBindings): Likewise. * javax/naming/CompoundName.java (getAll): Genericized. * javax/naming/CompositeName.java (getAll): Genericized. Index: javax/naming/CompositeName.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/naming/CompositeName.java,v retrieving revision 1.2.2.3 diff -u -r1.2.2.3 CompositeName.java --- javax/naming/CompositeName.java 27 Nov 2005 18:28:17 -0000 1.2.2.3 +++ javax/naming/CompositeName.java 2 Dec 2005 22:30:30 -0000 @@ -224,7 +224,7 @@ return (String) elts.get (posn); } - public Enumeration getAll () + public Enumeration<String> getAll () { return elts.elements (); } Index: javax/naming/CompoundName.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/naming/CompoundName.java,v retrieving revision 1.6.2.5 diff -u -r1.6.2.5 CompoundName.java --- javax/naming/CompoundName.java 27 Nov 2005 18:28:17 -0000 1.6.2.5 +++ javax/naming/CompoundName.java 2 Dec 2005 22:30:30 -0000 @@ -285,7 +285,7 @@ return (String) elts.get (posn); } - public Enumeration getAll () + public Enumeration<String> getAll () { return elts.elements (); } Index: javax/naming/InitialContext.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/naming/InitialContext.java,v retrieving revision 1.7.2.2 diff -u -r1.7.2.2 InitialContext.java --- javax/naming/InitialContext.java 27 Nov 2005 18:28:17 -0000 1.7.2.2 +++ javax/naming/InitialContext.java 2 Dec 2005 22:30:30 -0000 @@ -293,22 +293,26 @@ 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 @@ return myProps.remove (propName); } - public Hashtable getEnvironment () throws NamingException + public Hashtable<?, ?> getEnvironment () throws NamingException { return myProps; } Index: javax/naming/directory/BasicAttribute.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/naming/directory/BasicAttribute.java,v retrieving revision 1.2.2.3 diff -u -r1.2.2.3 BasicAttribute.java --- javax/naming/directory/BasicAttribute.java 27 Nov 2005 18:28:18 -0000 1.2.2.3 +++ javax/naming/directory/BasicAttribute.java 2 Dec 2005 22:30:30 -0000 @@ -178,7 +178,7 @@ return values.get (index); } - public NamingEnumeration<Attribute> getAll () + public NamingEnumeration<?> getAll () throws NamingException { return new BasicAttributeEnumeration (); Index: javax/naming/directory/BasicAttributes.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/naming/directory/BasicAttributes.java,v retrieving revision 1.2.2.4 diff -u -r1.2.2.4 BasicAttributes.java --- javax/naming/directory/BasicAttributes.java 2 Aug 2005 20:12:35 -0000 1.2.2.4 +++ javax/naming/directory/BasicAttributes.java 2 Dec 2005 22:30:30 -0000 @@ -123,12 +123,12 @@ return null; } - public NamingEnumeration getAll () + public NamingEnumeration<Attribute> getAll () { return new BasicAttributesEnumeration (false); } - public NamingEnumeration getIDs () + public NamingEnumeration<String> getIDs () { return new BasicAttributesEnumeration (true); } Index: javax/naming/directory/InitialDirContext.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/naming/directory/InitialDirContext.java,v retrieving revision 1.2.2.3 diff -u -r1.2.2.3 InitialDirContext.java --- javax/naming/directory/InitialDirContext.java 27 Nov 2005 18:28:18 -0000 1.2.2.3 +++ javax/naming/directory/InitialDirContext.java 2 Dec 2005 22:30:30 -0000 @@ -205,58 +205,65 @@ return getURLOrDefaultInitDirCtx (name).getSchemaClassDefinition (name); } - public NamingEnumeration search(Name name, Attributes matchingAttributes, - String[] attributesToReturn) + public NamingEnumeration<SearchResult> search(Name name, + Attributes matchingAttributes, + String[] attributesToReturn) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes, attributesToReturn); } - public NamingEnumeration search(String name, Attributes matchingAttributes, - String[] attributesToReturn) + public NamingEnumeration<SearchResult> search(String name, + Attributes matchingAttributes, + String[] attributesToReturn) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes, attributesToReturn); } - public NamingEnumeration search(Name name, Attributes matchingAttributes) + public NamingEnumeration<SearchResult> search(Name name, + Attributes matchingAttributes) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes); } - public NamingEnumeration search(String name, Attributes matchingAttributes) + public NamingEnumeration<SearchResult> search(String name, + Attributes matchingAttributes) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes); } - public NamingEnumeration search(Name name, String filter, - SearchControls cons) + public NamingEnumeration<SearchResult> search(Name name, String filter, + SearchControls cons) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, filter, cons); } - public NamingEnumeration search(String name, String filter, - SearchControls cons) + public NamingEnumeration<SearchResult> search(String name, String filter, + SearchControls cons) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, filter, cons); } - public NamingEnumeration search(Name name, String filterExpr, - Object[] filterArgs, SearchControls cons) + public NamingEnumeration<SearchResult> search(Name name, String filterExpr, + Object[] filterArgs, + SearchControls cons) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, filterExpr, filterArgs, cons); } - public NamingEnumeration search(String name, String filterExpr, - Object[] filterArgs, SearchControls cons) + public NamingEnumeration<SearchResult> search(String name, + String filterExpr, + Object[] filterArgs, + SearchControls cons) throws NamingException { return getURLOrDefaultInitDirCtx (name).search (name, filterExpr, _______________________________________________ Classpath-patches mailing list Classpath-patches@gnu.org http://lists.gnu.org/mailman/listinfo/classpath-patches