Index: src/main/java/java/lang/Runtime.java =================================================================== --- src/main/java/java/lang/Runtime.java (revision 486783) +++ src/main/java/java/lang/Runtime.java (working copy) @@ -37,7 +37,7 @@ } /** - * Execute progAray[0] in a separate platform process The new process + * Execute progArray[0] in a separate platform process The new process * inherits the environment of the caller. * * @param progArray the array containing the program to execute as well as @@ -52,7 +52,7 @@ } /** - * Execute progArray[0] in a seperate platform process The new process uses + * Execute progArray[0] in a separate platform process The new process uses * the environment provided in envp * * @param progArray the array containing the program to execute a well as @@ -69,7 +69,7 @@ } /** - * Execute progArray[0] in a seperate platform process. The new process uses + * Execute progArray[0] in a separate platform process. The new process uses * the environment provided in envp * * @param progArray the array containing the program to execute a well as @@ -89,7 +89,7 @@ } /** - * Execute program in a seperate platform process The new process inherits + * Execute program in a separate platform process The new process inherits * the environment of the caller. * * @param prog the name of the program to execute @@ -103,7 +103,7 @@ } /** - * Execute prog in a seperate platform process The new process uses the + * Execute prog in a separate platform process The new process uses the * environment provided in envp * * @param prog the name of the program to execute @@ -119,7 +119,7 @@ } /** - * Execute prog in a seperate platform process The new process uses the + * Execute prog in a separate platform process The new process uses the * environment provided in envp * * @param prog the name of the program to execute Index: src/main/java/java/lang/reflect/Method.java =================================================================== --- src/main/java/java/lang/reflect/Method.java (revision 486783) +++ src/main/java/java/lang/reflect/Method.java (working copy) @@ -203,7 +203,7 @@ } /** - * Return the modifiers for the modelled method. The Modifier class + * Return the modifiers for the modeled method. The Modifier class * should be used to decode the result. * * @return the modifiers @@ -214,7 +214,7 @@ } /** - * Return the name of the modelled method. + * Return the name of the modeled method. * * @return the name */ @@ -257,19 +257,19 @@ } /** - * Return the result of dynamically invoking the modelled method. This + * Return the result of dynamically invoking the modeled method. This * reproduces the effect of * receiver.methodName(arg1, arg2, ... , argN) This method * performs the following: * - *
  • If the modelled method is static, it is invoked directly. If it is - * non-static, the modelled method and the receiver are then used to perform + *
  • If the modeled method is static, it is invoked directly. If it is + * non-static, the modeled method and the receiver are then used to perform * a standard dynamic method lookup. The resulting method is then invoked. *
  • *
  • If an exception is thrown during the invocation it is caught and @@ -295,14 +295,14 @@ * * * @param receiver - * The object on which to call the modelled method + * The object on which to call the modeled method * @param args * the arguments to the method * @return the new, initialized, object * @throws java.lang.NullPointerException * if the receiver is null for a non-static method * @throws java.lang.IllegalAccessException - * if the modelled method is not accessible + * if the modeled method is not accessible * @throws java.lang.IllegalArgumentException * if an incorrect number of arguments are passed, the * receiver is incompatible with the declaring class, or an Index: src/main/java/java/lang/reflect/Field.java =================================================================== --- src/main/java/java/lang/reflect/Field.java (revision 486783) +++ src/main/java/java/lang/reflect/Field.java (working copy) @@ -106,13 +106,13 @@ * Return the value of the field in the specified object. This reproduces * the effect of object.fieldName *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. *

    * The value of the field is returned. If the type of this field is a base @@ -126,7 +126,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native Object get(Object object) throws IllegalAccessException, IllegalArgumentException; @@ -135,13 +135,13 @@ * Return the value of the field in the specified object as a boolean. This * reproduces the effect of object.fieldName *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. * * @param object @@ -152,7 +152,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native boolean getBoolean(Object object) throws IllegalAccessException, IllegalArgumentException; @@ -161,13 +161,13 @@ * Return the value of the field in the specified object as a byte. This * reproduces the effect of object.fieldName *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. * * @param object @@ -178,7 +178,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native byte getByte(Object object) throws IllegalAccessException, IllegalArgumentException; @@ -187,13 +187,13 @@ * Return the value of the field in the specified object as a char. This * reproduces the effect of object.fieldName *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. * * @param object @@ -204,7 +204,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native char getChar(Object object) throws IllegalAccessException, IllegalArgumentException; @@ -223,13 +223,13 @@ * Return the value of the field in the specified object as a double. This * reproduces the effect of object.fieldName *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. * * @param object @@ -240,7 +240,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native double getDouble(Object object) throws IllegalAccessException, IllegalArgumentException; @@ -249,13 +249,13 @@ * Return the value of the field in the specified object as a float. This * reproduces the effect of object.fieldName *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. * * @param object @@ -266,7 +266,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native float getFloat(Object object) throws IllegalAccessException, IllegalArgumentException; @@ -275,13 +275,13 @@ * Return the value of the field in the specified object as an int. This * reproduces the effect of object.fieldName *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. * * @param object @@ -292,7 +292,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native int getInt(Object object) throws IllegalAccessException, IllegalArgumentException; @@ -301,13 +301,13 @@ * Return the value of the field in the specified object as a long. This * reproduces the effect of object.fieldName *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. * * @param object @@ -318,13 +318,13 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native long getLong(Object object) throws IllegalAccessException, IllegalArgumentException; /** - * Return the modifiers for the modelled field. The Modifier class should be + * Return the modifiers for the modeled field. The Modifier class should be * used to decode the result. * * @return the modifiers @@ -333,7 +333,7 @@ public native int getModifiers(); /** - * Return the name of the modelled field. + * Return the name of the modeled field. * * @return the name */ @@ -345,13 +345,13 @@ * Return the value of the field in the specified object as a short. This * reproduces the effect of object.fieldName *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. *

    * @@ -363,7 +363,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native short getShort(Object object) throws IllegalAccessException, IllegalArgumentException; @@ -395,13 +395,13 @@ * Set the value of the field in the specified object to the boolean value. * This reproduces the effect of object.fieldName = value *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. *

    * If the field type is a base type, the value is automatically unwrapped. @@ -418,7 +418,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native void set(Object object, Object value) throws IllegalAccessException, IllegalArgumentException; @@ -427,13 +427,13 @@ * Set the value of the field in the specified object to the boolean value. * This reproduces the effect of object.fieldName = value *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. *

    * If the value cannot be converted to the field type via a widening @@ -448,7 +448,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native void setBoolean(Object object, boolean value) throws IllegalAccessException, IllegalArgumentException; @@ -457,13 +457,13 @@ * Set the value of the field in the specified object to the byte value. * This reproduces the effect of object.fieldName = value *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. *

    * If the value cannot be converted to the field type via a widening @@ -478,7 +478,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native void setByte(Object object, byte value) throws IllegalAccessException, IllegalArgumentException; @@ -487,13 +487,13 @@ * Set the value of the field in the specified object to the char value. * This reproduces the effect of object.fieldName = value *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. *

    * If the value cannot be converted to the field type via a widening @@ -508,7 +508,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native void setChar(Object object, char value) throws IllegalAccessException, IllegalArgumentException; @@ -517,13 +517,13 @@ * Set the value of the field in the specified object to the double value. * This reproduces the effect of object.fieldName = value *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. *

    * If the value cannot be converted to the field type via a widening @@ -538,7 +538,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native void setDouble(Object object, double value) throws IllegalAccessException, IllegalArgumentException; @@ -547,13 +547,13 @@ * Set the value of the field in the specified object to the float value. * This reproduces the effect of object.fieldName = value *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. *

    * If the value cannot be converted to the field type via a widening @@ -568,7 +568,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native void setFloat(Object object, float value) throws IllegalAccessException, IllegalArgumentException; @@ -577,13 +577,13 @@ * Set the value of the field in the specified object to the int value. This * reproduces the effect of object.fieldName = value *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. *

    * If the value cannot be converted to the field type via a widening @@ -598,7 +598,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native void setInt(Object object, int value) throws IllegalAccessException, IllegalArgumentException; @@ -607,13 +607,13 @@ * Set the value of the field in the specified object to the long value. * This reproduces the effect of object.fieldName = value *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. *

    * If the value cannot be converted to the field type via a widening @@ -628,7 +628,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native void setLong(Object object, long value) throws IllegalAccessException, IllegalArgumentException; @@ -637,13 +637,13 @@ * Set the value of the field in the specified object to the short value. * This reproduces the effect of object.fieldName = value *

    - * If the modelled field is static, the object argument is ignored. + * If the modeled field is static, the object argument is ignored. * Otherwise, if the object is null, a NullPointerException is thrown. If * the object is not an instance of the declaring class of the method, an * IllegalArgumentException is thrown. *

    * If this Field object is enforcing access control (see AccessibleObject) - * and the modelled field is not accessible from the current context, an + * and the modeled field is not accessible from the current context, an * IllegalAccessException is thrown. *

    * If the value cannot be converted to the field type via a widening @@ -658,7 +658,7 @@ * @throws IllegalArgumentException * if the object is not compatible with the declaring class * @throws IllegalAccessException - * if modelled field is not accessible + * if modeled field is not accessible */ public native void setShort(Object object, short value) throws IllegalAccessException, IllegalArgumentException; Index: src/main/java/java/lang/reflect/Constructor.java =================================================================== --- src/main/java/java/lang/reflect/Constructor.java (revision 486783) +++ src/main/java/java/lang/reflect/Constructor.java (working copy) @@ -161,7 +161,7 @@ } /** - * Return the modifiers for the modelled constructor. The Modifier class + * Return the modifiers for the modeled constructor. The Modifier class * should be used to decode the result. * * @return the modifiers @@ -172,7 +172,7 @@ } /** - * Return the name of the modelled constructor. This is the name of the + * Return the name of the modeled constructor. This is the name of the * declaring class. * * @return the name @@ -207,7 +207,7 @@ /** * Return a new instance of the declaring class, initialized by dynamically - * invoking the modelled constructor. This reproduces the effect of + * invoking the modeled constructor. This reproduces the effect of * new declaringClass(arg1, arg2, ... , argN) This method * performs the following: *

    - *
  • The modelled constructor is then invoked. If an exception is thrown + *
  • The modeled constructor is then invoked. If an exception is thrown * during the invocation, it is caught and wrapped in an * InvocationTargetException. This exception is then thrown. If the * invocation completes normally, the newly initialized object is returned. @@ -237,7 +237,7 @@ * @return the new, initialized, object * @exception java.lang.InstantiationException if the class cannot be * instantiated - * @exception java.lang.IllegalAccessException if the modelled constructor + * @exception java.lang.IllegalAccessException if the modeled constructor * is not accessible * @exception java.lang.IllegalArgumentException if an incorrect number of * arguments are passed, or an argument could not be converted by Index: src/main/java/java/lang/ThreadGroup.java =================================================================== --- src/main/java/java/lang/ThreadGroup.java (revision 486783) +++ src/main/java/java/lang/ThreadGroup.java (working copy) @@ -510,7 +510,7 @@ /** * Outputs to System.out a text representation of the * hierarchy of Threads and ThreadGroups in the receiver (and recursively). - * Proper identation is done to suggest the nesting of groups inside groups + * Proper indentation is done to suggest the nesting of groups inside groups * and threads inside groups. */ public void list() { @@ -522,9 +522,9 @@ /* * Outputs to System.outa text representation of the * hierarchy of Threads and ThreadGroups in the receiver (and recursively). - * The identation will be four spaces per level of nesting. + * The indentation will be four spaces per level of nesting. * - * @param levels How many levels of nesting, so that proper identetion can + * @param levels How many levels of nesting, so that proper indentation can * be output. */ private void list(int levels) { @@ -535,10 +535,10 @@ // Print the receiver System.out.println(this.toString()); - // Print the children threads, with 1 extra identation + // Print the children threads, with 1 extra indentation synchronized (this.childrenThreadsLock) { for (int i = 0; i < numThreads; i++) { - // children get an extra identation, 4 spaces for each level + // children get an extra indentation, 4 spaces for each level for (int j = 0; j <= levels; j++) { System.out.print(" "); } Index: src/main/java/java/lang/Object.java =================================================================== --- src/main/java/java/lang/Object.java (revision 486783) +++ src/main/java/java/lang/Object.java (working copy) @@ -210,8 +210,7 @@ * starts running. * * @param time long The maximum time to wait in milliseconds. - * @param frac int The fraction of a mSec to wait, specified in nano - * seconds. + * @param frac int The fraction of a mSec to wait, specified in nanoseconds. * @throws InterruptedException to interrupt the wait. * @see #notify * @see #notifyAll Index: src/main/java/java/lang/StackTraceElement.java =================================================================== --- src/main/java/java/lang/StackTraceElement.java (revision 486783) +++ src/main/java/java/lang/StackTraceElement.java (working copy) @@ -201,7 +201,7 @@ } /** - * Return a String representating this StackTraceElement object + * Return a String representing this StackTraceElement object * * @return String representing this object */ Index: src/main/java/org/apache/harmony/kernel/vm/VM.java =================================================================== --- src/main/java/org/apache/harmony/kernel/vm/VM.java (revision 486783) +++ src/main/java/org/apache/harmony/kernel/vm/VM.java (working copy) @@ -228,7 +228,7 @@ /** * Return the type of the specified entry on the class path for a - * ClassLoader. Valid tyes are: CPE_TYPE_UNKNOWN CPE_TYPE_DIRECTORY + * ClassLoader. Valid types are: CPE_TYPE_UNKNOWN CPE_TYPE_DIRECTORY * CPE_TYPE_JAR CPE_TYPE_TCP - this is obsolete CPE_TYPE_UNUSABLE * * @param classLoader the ClassLoader