Index: java/lang/Byte.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/Byte.java,v retrieving revision 1.21 diff -u -r1.21 Byte.java --- java/lang/Byte.java 25 Feb 2002 20:02:58 -0000 1.21 +++ java/lang/Byte.java 17 Apr 2004 17:07:31 -0000 @@ -147,7 +147,7 @@ * * @param s the String to convert * @param radix the radix (base) to use in the conversion - * @return the String argument converted to byte + * @return the String argument converted to byte * @throws NumberFormatException if s cannot be parsed as a * byte */ Index: java/lang/CharSequence.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/CharSequence.java,v retrieving revision 1.4 diff -u -r1.4 CharSequence.java --- java/lang/CharSequence.java 9 Mar 2002 04:01:12 -0000 1.4 +++ java/lang/CharSequence.java 17 Apr 2004 17:07:31 -0000 @@ -78,7 +78,7 @@ int length(); /** - * Returns a new CharSequence of the indicated range. + * Returns a new CharSequence of the indicated range. * * @param begin the start index (inclusive) * @param end the end index (exclusive) Index: java/lang/Class.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/Class.java,v retrieving revision 1.17 diff -u -r1.17 Class.java --- java/lang/Class.java 14 Mar 2004 14:17:55 -0000 1.17 +++ java/lang/Class.java 17 Apr 2004 17:07:32 -0000 @@ -154,6 +154,9 @@ * @param initialize whether or not to initialize the class at this time * @param classloader the classloader to use to find the class; null means * to use the bootstrap class loader + * + * @return the class object for the given class + * * @throws ClassNotFoundException if the class was not found by the * classloader * @throws LinkageError if linking the class fails @@ -296,14 +299,14 @@ * @see #getConstructors() * @since 1.1 */ - public Constructor getConstructor(Class[] args) throws NoSuchMethodException + public Constructor getConstructor(Class[] types) throws NoSuchMethodException { memberAccessCheck(Member.PUBLIC); Constructor[] constructors = getDeclaredConstructors(true); for (int i = 0; i < constructors.length; i++) { Constructor constructor = constructors[i]; - if (matchParameters(args, constructor.getParameterTypes())) + if (matchParameters(types, constructor.getParameterTypes())) return constructor; } throw new NoSuchMethodException(); @@ -341,7 +344,7 @@ * @see #getDeclaredConstructors() * @since 1.1 */ - public Constructor getDeclaredConstructor(Class[] args) + public Constructor getDeclaredConstructor(Class[] types) throws NoSuchMethodException { memberAccessCheck(Member.DECLARED); @@ -349,7 +352,7 @@ for (int i = 0; i < constructors.length; i++) { Constructor constructor = constructors[i]; - if (matchParameters(args, constructor.getParameterTypes())) + if (matchParameters(types, constructor.getParameterTypes())) return constructor; } throw new NoSuchMethodException(); @@ -452,8 +455,8 @@ /** * Get a method declared in this class, where name is its simple name. The * implicit methods of Object are not available from arrays or interfaces. - * Constructors (named "" in the class file) and class initializers - * (name "") are not available. The Virtual Machine allows + * Constructors (named "<init>" in the class file) and class initializers + * (name "<clinit>") are not available. The Virtual Machine allows * multiple methods with the same signature but differing return types; in * such a case the most specific return types are favored, then the final * choice is arbitrary. If the method takes no argument, an array of zero @@ -470,11 +473,11 @@ * @see #getDeclaredMethods() * @since 1.1 */ - public Method getDeclaredMethod(String methodName, Class[] args) + public Method getDeclaredMethod(String methodName, Class[] types) throws NoSuchMethodException { memberAccessCheck(Member.DECLARED); - Method match = matchMethod(getDeclaredMethods(false), methodName, args); + Method match = matchMethod(getDeclaredMethods(false), methodName, types); if (match == null) throw new NoSuchMethodException(methodName); return match; @@ -656,8 +659,8 @@ /** * Get a public method declared or inherited in this class, where name is * its simple name. The implicit methods of Object are not available from - * interfaces. Constructors (named "" in the class file) and class - * initializers (name "") are not available. The Virtual + * interfaces. Constructors (named "<init>" in the class file) and class + * initializers (name "<clinit>") are not available. The Virtual * Machine allows multiple methods with the same signature but differing * return types, and the class can inherit multiple methods of the same * return type; in such a case the most specific return types are favored, @@ -675,11 +678,11 @@ * @see #getMethods() * @since 1.1 */ - public Method getMethod(String methodName, Class[] args) + public Method getMethod(String methodName, Class[] types) throws NoSuchMethodException { memberAccessCheck(Member.PUBLIC); - Method method = internalGetMethod(methodName, args); + Method method = internalGetMethod(methodName, types); if (method == null) throw new NoSuchMethodException(methodName); return method; @@ -853,6 +856,7 @@ * array type [element type * class or interface, alone: <dotted name> * class or interface, as element type: L<dotted name>; + * * * @return the name of this class */ Index: java/lang/ClassLoader.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/ClassLoader.java,v retrieving revision 1.29 diff -u -r1.29 ClassLoader.java --- java/lang/ClassLoader.java 12 Apr 2004 14:32:59 -0000 1.29 +++ java/lang/ClassLoader.java 17 Apr 2004 17:07:32 -0000 @@ -475,6 +475,7 @@ * null. A security check may be performed on * RuntimePermission("getClassLoader"). * + * @return the parent ClassLoader * @throws SecurityException if the security check fails * @since 1.2 */ Index: java/lang/Double.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/Double.java,v retrieving revision 1.33 diff -u -r1.33 Double.java --- java/lang/Double.java 12 Apr 2004 14:32:59 -0000 1.33 +++ java/lang/Double.java 17 Apr 2004 17:07:33 -0000 @@ -243,7 +243,7 @@ * @see #NEGATIVE_INFINITY * @since 1.2 */ - public static native double parseDouble(String s); + public static native double parseDouble(String str); /** * Return true if the double has the same Index: java/lang/Float.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/Float.java,v retrieving revision 1.27 diff -u -r1.27 Float.java --- java/lang/Float.java 12 Apr 2004 14:32:59 -0000 1.27 +++ java/lang/Float.java 17 Apr 2004 17:07:33 -0000 @@ -240,11 +240,11 @@ * @see #NEGATIVE_INFINITY * @since 1.2 */ - public static float parseFloat(String s) + public static float parseFloat(String str) { // XXX Rounding parseDouble() causes some errors greater than 1 ulp from // the infinitely precise decimal. - return (float) Double.parseDouble(s); + return (float) Double.parseDouble(str); } /** Index: java/lang/Integer.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/Integer.java,v retrieving revision 1.28 diff -u -r1.28 Integer.java --- java/lang/Integer.java 13 Jun 2002 17:28:54 -0000 1.28 +++ java/lang/Integer.java 17 Apr 2004 17:07:33 -0000 @@ -220,9 +220,9 @@ * within MIN_VALUE to MAX_VALUE, inclusive. * Unlike Double.parseDouble, you may not have a leading '+'. * - * @param s the String to convert + * @param str the String to convert * @param radix the radix (base) to use in the conversion - * @return the String argument converted to int + * @return the String argument converted to int * @throws NumberFormatException if s cannot be parsed as an * int */ @@ -414,7 +414,7 @@ * interpret the value of the property. * * @param nm the name of the system property - * @param val the default value + * @param def the default value * @return the value of the system property, or the default * @throws SecurityException if accessing the system property is forbidden * @see System#getProperty(String) @@ -461,7 +461,7 @@ * Finally, the value must be in the range MIN_VALUE to * MAX_VALUE, or an exception is thrown. * - * @param s the String to interpret + * @param str the String to interpret * @return the value of the String as an Integer * @throws NumberFormatException if s cannot be parsed as a * int Index: java/lang/Long.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/Long.java,v retrieving revision 1.18 diff -u -r1.18 Long.java --- java/lang/Long.java 12 Apr 2004 14:32:59 -0000 1.18 +++ java/lang/Long.java 17 Apr 2004 17:07:33 -0000 @@ -223,7 +223,7 @@ * 'L' as the last character is only valid in radices 22 or greater, where * it is a digit and not a type indicator. * - * @param s the String to convert + * @param str the String to convert * @param radix the radix (base) to use in the conversion * @return the String argument converted to long * @throws NumberFormatException if s cannot be parsed as a @@ -306,7 +306,7 @@ * MAX_VALUE, or an exception is thrown. Note that you cannot * use a trailing 'l' or 'L', unlike in Java source code. * - * @param s the String to interpret + * @param str the String to interpret * @return the value of the String as a Long * @throws NumberFormatException if s cannot be parsed as a * long @@ -455,7 +455,7 @@ * interpret the value of the property. * * @param nm the name of the system property - * @param val the default value + * @param def the default value * @return the value of the system property, or the default * @throws SecurityException if accessing the system property is forbidden * @see System#getProperty(String) Index: java/lang/Number.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/Number.java,v retrieving revision 1.8 diff -u -r1.8 Number.java --- java/lang/Number.java 25 Feb 2002 20:02:58 -0000 1.8 +++ java/lang/Number.java 17 Apr 2004 17:07:33 -0000 @@ -69,7 +69,7 @@ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', - 'u', 'v', 'w', 'x', 'y', 'z' + 'u', 'v', 'w', 'x', 'y', 'z', }; /** Index: java/lang/Object.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/Object.java,v retrieving revision 1.16 diff -u -r1.16 Object.java --- java/lang/Object.java 29 Mar 2004 07:07:26 -0000 1.16 +++ java/lang/Object.java 17 Apr 2004 17:07:33 -0000 @@ -113,7 +113,7 @@ * returned on all later invocations. *
  • a.equals(null) must be false.
    • *
  • It must be consistent with hashCode(). That is, - * a.equals(b) must imply + * a.equals(b) must imply * a.hashCode() == b.hashCode(). * The reverse is not true; two objects that are not * equal may have the same hashcode, but that has Index: java/lang/Package.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/Package.java,v retrieving revision 1.10 diff -u -r1.10 Package.java --- java/lang/Package.java 16 Aug 2003 08:58:52 -0000 1.10 +++ java/lang/Package.java 17 Apr 2004 17:07:33 -0000 @@ -227,7 +227,10 @@ * getSpecificationVersion. * * @param version the (minimal) desired version of the specification - * @throws NumberFormatException if either version string is invalid + * + * @return true if the version is compatible, false otherwise + * + * @Throws NumberFormatException if either version string is invalid * @throws NullPointerException if either version string is null */ public boolean isCompatibleWith(String version) Index: java/lang/Runtime.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/Runtime.java,v retrieving revision 1.5 diff -u -r1.5 Runtime.java --- java/lang/Runtime.java 12 Apr 2004 14:32:59 -0000 1.5 +++ java/lang/Runtime.java 17 Apr 2004 17:07:34 -0000 @@ -689,9 +689,11 @@ * System.mapLibraryName(libname). There may be a security * check, of checkLink. * - * @param filename the file to load + * @param libname the library to load + * * @throws SecurityException if permission is denied * @throws UnsatisfiedLinkError if the library is not found + * * @see System#mapLibraryName(String) * @see ClassLoader#findLibrary(String) */ Index: java/lang/SecurityManager.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/SecurityManager.java,v retrieving revision 1.17 diff -u -r1.17 SecurityManager.java --- java/lang/SecurityManager.java 9 Apr 2004 15:02:21 -0000 1.17 +++ java/lang/SecurityManager.java 17 Apr 2004 17:07:34 -0000 @@ -86,7 +86,7 @@ * // now, in worker thread * if (sm != null) * sm.checkPermission(permission, context); - * 
    + *
    * *

    Permissions fall into these categories: File, Socket, Net, Security, * Runtime, Property, AWT, Reflect, and Serializable. Each of these @@ -174,13 +174,15 @@ * Find the ClassLoader of the first non-system class on the execution * stack. A non-system class is one whose ClassLoader is not equal to * address@hidden ClassLoader#getSystemClassLoader()} or its ancestors. This - * will return null in three cases:
    + * will return null in three cases: + * + *

      *
    • All methods on the stack are from system classes
      • *
    • All methods on the stack up to the first "privileged" caller, as * created by address@hidden AccessController.doPrivileged(PrivilegedAction)}, * are from system classes
      • *
    • A check of java.security.AllPermission succeeds.
      • - * + *
    * * @return the most recent non-system ClassLoader on the execution stack * @deprecated use address@hidden #checkPermission(Permission)} instead @@ -194,13 +196,15 @@ * Find the first non-system class on the execution stack. A non-system * class is one whose ClassLoader is not equal to * address@hidden ClassLoader#getSystemClassLoader()} or its ancestors. This - * will return null in three cases:
    + * will return null in three cases: + * + *
      *
    • All methods on the stack are from system classes
      • *
    • All methods on the stack up to the first "privileged" caller, as * created by address@hidden AccessController.doPrivileged(PrivilegedAction)}, * are from system classes
      • *
    • A check of java.security.AllPermission succeeds.
      • - * + *
    * * @return the most recent non-system Class on the execution stack * @deprecated use address@hidden #checkPermission(Permission)} instead @@ -231,13 +235,15 @@ * Get the depth on the execution stack of the most recent non-system class. * A non-system class is one whose ClassLoader is not equal to * address@hidden ClassLoader#getSystemClassLoader()} or its ancestors. This - * will return -1 in three cases:
    + * will return -1 in three cases: + * + *
      *
    • All methods on the stack are from system classes
      • *
    • All methods on the stack up to the first "privileged" caller, as * created by address@hidden AccessController.doPrivileged(PrivilegedAction)}, * are from system classes
      • *
    • A check of java.security.AllPermission succeeds.
      • - * + *
    * * @return the index of the most recent non-system Class on the stack * @deprecated use address@hidden #checkPermission(Permission)} instead @@ -365,8 +371,8 @@ * Check if the current thread is allowed to modify another Thread. This is * called by Thread.stop(), suspend(), resume(), interrupt(), destroy(), * setPriority(), setName(), and setDaemon(). The default implementation - * checks RuntimePermission("modifyThread") on system threads (ie. - * threads in ThreadGroup with a null parent), and returns silently on + * checks RuntimePermission("modifyThread") on system threads + * (ie. threads in ThreadGroup with a null parent), and returns silently on * other threads. * *

    If you override this, you must do two things. First, call @@ -398,8 +404,8 @@ * ThreadGroup.ThreadGroup() (to add this ThreadGroup to a parent), * ThreadGroup.stop(), suspend(), resume(), interrupt(), destroy(), * setDaemon(), and setMaxPriority(). The default implementation - * checks RuntimePermission("modifyThread") on the system group (ie. - * the one with a null parent), and returns silently on other groups. + * checks RuntimePermission("modifyThread") on the system group + * (ie. the one with a null parent), and returns silently on other groups. * *

    If you override this, you must do two things. First, call * super.checkAccess(t), to make sure you are not relaxing @@ -651,13 +657,15 @@ * @param host the host to connect to * @param port the port to connect on * @param context the context to determine access for + * * @throws SecurityException if permission is denied, or if context is * not an AccessControlContext * @throws NullPointerException if host is null + * * @see #getSecurityContext() * @see AccessControlContext#checkPermission(Permission) */ - public void checkConnect(String host, int port, Object securityContext) + public void checkConnect(String host, int port, Object context) { // XXX Should be: // if (! (context instanceof AccessControlContext)) @@ -776,9 +784,12 @@ * you override this, call super.checkPropertyAccess rather * than throwing an exception. * + * @param key the key of the property to check + * * @throws SecurityException if permission is denied * @throws NullPointerException if key is null * @throws IllegalArgumentException if key is "" + * * @see System#getProperty(String) */ public void checkPropertyAccess(String key) Index: java/lang/String.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/String.java,v retrieving revision 1.54 diff -u -r1.54 String.java --- java/lang/String.java 15 Jul 2003 20:39:48 -0000 1.54 +++ java/lang/String.java 17 Apr 2004 17:07:35 -0000 @@ -766,7 +766,7 @@ * * @param toffset index to start comparison at for this String * @param other String to compare region to this String - * @param oofset index to start comparison at for other + * @param ooffset index to start comparison at for other * @param len number of characters to compare * @return true if regions match (case sensitive) * @throws NullPointerException if other is null @@ -788,7 +788,7 @@ * @param ignoreCase true if case should be ignored in comparision * @param toffset index to start comparison at for this String * @param other String to compare region to this String - * @param oofset index to start comparison at for other + * @param ooffset index to start comparison at for other * @param len number of characters to compare * @return true if regions match, false otherwise * @throws NullPointerException if other is null @@ -838,7 +838,7 @@ * Predicate which determines if this String starts with a given prefix. * If the prefix is an empty String, true is returned. * - * @param prefex String to compare + * @param prefix String to compare * @return true if this String starts with the prefix * @throws NullPointerException if prefix is null * @see #startsWith(String, int) @@ -1034,8 +1034,8 @@ * Creates a substring of this String, starting at a specified index * and ending at one character before a specified index. * - * @param begin index to start substring (inclusive, base 0) - * @param end index to end at (exclusive) + * @param beginIndex index to start substring (inclusive, base 0) + * @param endIndex index to end at (exclusive) * @return new String which is a substring of this String * @throws IndexOutOfBoundsException if begin < 0 || end > length() * || begin > end (while unspecified, this is a Index: java/lang/StringBuffer.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/StringBuffer.java,v retrieving revision 1.26 diff -u -r1.26 StringBuffer.java --- java/lang/StringBuffer.java 27 Feb 2004 11:30:52 -0000 1.26 +++ java/lang/StringBuffer.java 17 Apr 2004 17:07:35 -0000 @@ -396,7 +396,7 @@ /** * Append the char to this StringBuffer. * - * @param c the char to append + * @param ch the char to append * @return this StringBuffer */ public synchronized StringBuffer append(char ch) Index: java/lang/ThreadGroup.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/ThreadGroup.java,v retrieving revision 1.15 diff -u -r1.15 ThreadGroup.java --- java/lang/ThreadGroup.java 14 Mar 2004 14:14:06 -0000 1.15 +++ java/lang/ThreadGroup.java 17 Apr 2004 17:07:35 -0000 @@ -238,16 +238,16 @@ * Check whether this ThreadGroup is an ancestor of the specified * ThreadGroup, or if they are the same. * - * @param g the group to test on + * @param group the group to test on * @return whether this ThreadGroup is a parent of the specified group */ - public final boolean parentOf(ThreadGroup tg) + public final boolean parentOf(ThreadGroup group) { - while (tg != null) + while (group != null) { - if (tg == this) + if (group == this) return true; - tg = tg.parent; + group = group.parent; } return false; } @@ -535,7 +535,7 @@ * manner. * * @param thread the thread that exited - * @param exception the uncaught exception + * @param t the uncaught throwable * @throws NullPointerException if t is null * @see ThreadDeath * @see System#err Index: java/lang/Throwable.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/Throwable.java,v retrieving revision 1.20 diff -u -r1.20 Throwable.java --- java/lang/Throwable.java 29 Mar 2004 07:07:26 -0000 1.20 +++ java/lang/Throwable.java 17 Apr 2004 17:07:36 -0000 @@ -392,7 +392,7 @@ * then a line starting with three spaces and the string "... X more" is * printed, where X is the number of remaining stackframes. * - * @param w the PrintWriter to write the trace to + * @param pw the PrintWriter to write the trace to * @since 1.1 */ public void printStackTrace (PrintWriter pw)