# HG changeset patch # User igerasim # Date 1584733420 25200 # Fri Mar 20 12:43:40 2020 -0700 # Node ID 43cf585651578d2b1cd13d7fa5ac60555dd09101 # Parent 5df90c29762d164e00903e10fadd1d7e4d7c5b95 [mq]: XXXXXXX-typos diff --git a/src/java.base/share/classes/java/io/FilePermission.java b/src/java.base/share/classes/java/io/FilePermission.java --- a/src/java.base/share/classes/java/io/FilePermission.java +++ b/src/java.base/share/classes/java/io/FilePermission.java @@ -540,7 +540,7 @@ * If {@code jdk.io.permissionsUseCanonicalPath} is {@code true}, a * simple {@code cpath} is inside a wildcard {@code cpath} if and only if * after removing the base name (the last name in the pathname's name - * sequence) from the former the remaining part equals to the latter, + * sequence) from the former the remaining part is equal to the latter, * a simple {@code cpath} is recursively inside a wildcard {@code cpath} * if and only if the former starts with the latter. *
diff --git a/src/java.base/share/classes/java/io/Reader.java b/src/java.base/share/classes/java/io/Reader.java --- a/src/java.base/share/classes/java/io/Reader.java +++ b/src/java.base/share/classes/java/io/Reader.java @@ -62,7 +62,7 @@ * effect. * *
While the stream is open, the {@code read()}, {@code read(char[])}, - * {@code read(char[], int, int)}, {@code read(Charbuffer)}, {@code + * {@code read(char[], int, int)}, {@code read(CharBuffer)}, {@code * ready()}, {@code skip(long)}, and {@code transferTo()} methods all * behave as if end of stream has been reached. After the stream has been * closed, these methods all throw {@code IOException}. diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java --- a/src/java.base/share/classes/java/lang/Character.java +++ b/src/java.base/share/classes/java/lang/Character.java @@ -9732,7 +9732,7 @@ } /** - * Determines if the specified character (Unicode code point) is an alphabet. + * Determines if the specified character (Unicode code point) is alphabetic. *
* A character is considered to be alphabetic if its general category type, * provided by {@link Character#getType(int) getType(codePoint)}, is any of diff --git a/src/java.base/share/classes/java/lang/ProcessHandleImpl.java b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java --- a/src/java.base/share/classes/java/lang/ProcessHandleImpl.java +++ b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java @@ -319,7 +319,7 @@ * @param pids an allocated long array to receive the pids * @param ppids an allocated long array to receive the parent pids; may be null * @param starttimes an allocated long array to receive the child start times; may be null - * @return if greater than or equals to zero is the number of pids in the array; + * @return if greater than or equal to zero is the number of pids in the array; * if greater than the length of the arrays, the arrays are too small */ private static native int getProcessPids0(long pid, long[] pids, diff --git a/src/java.base/share/classes/java/lang/Runtime.java b/src/java.base/share/classes/java/lang/Runtime.java --- a/src/java.base/share/classes/java/lang/Runtime.java +++ b/src/java.base/share/classes/java/lang/Runtime.java @@ -960,7 +960,7 @@ /* * List of version number components passed to this constructor MUST - * be at least unmodifiable (ideally immutable). In the case on an + * be at least unmodifiable (ideally immutable). In the case of an * unmodifiable list, the caller MUST hand the list over to this * constructor and never change the underlying list. */ diff --git a/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java b/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java --- a/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java +++ b/src/java.base/share/classes/java/lang/constant/DirectMethodHandleDescImpl.java @@ -195,7 +195,7 @@ * @param o a {@code DirectMethodHandleDescImpl} to compare to this * {@code DirectMethodHandleDescImpl} * @return {@code true} if the specified {@code DirectMethodHandleDescImpl} is - * equals to this {@code DirectMethodHandleDescImpl}. + * equal to this {@code DirectMethodHandleDescImpl}. */ @Override public boolean equals(Object o) { diff --git a/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java b/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java --- a/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java +++ b/src/java.base/share/classes/java/lang/constant/DynamicCallSiteDesc.java @@ -250,7 +250,7 @@ * @param o the {@code DynamicCallSiteDesc} to compare to this * {@code DynamicCallSiteDesc} * @return {@code true} if the specified {@code DynamicCallSiteDesc} is - * equals to this {@code DynamicCallSiteDesc}. + * equal to this {@code DynamicCallSiteDesc}. */ @Override public final boolean equals(Object o) { diff --git a/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java b/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java --- a/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java +++ b/src/java.base/share/classes/java/lang/constant/DynamicConstantDesc.java @@ -351,7 +351,7 @@ * @param o the {@code DynamicConstantDesc} to compare to this * {@code DynamicConstantDesc} * @return {@code true} if the specified {@code DynamicConstantDesc} is - * equals to this {@code DynamicConstantDesc}. + * equal to this {@code DynamicConstantDesc}. * */ @Override diff --git a/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java b/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java --- a/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java +++ b/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java @@ -159,7 +159,7 @@ * @param o the {@code MethodTypeDescImpl} to compare to this * {@code MethodTypeDescImpl} * @return {@code true} if the specified {@code MethodTypeDescImpl} is - * equals to this {@code MethodTypeDescImpl}. + * equal to this {@code MethodTypeDescImpl}. */ @Override public boolean equals(Object o) { diff --git a/src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java b/src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java --- a/src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java +++ b/src/java.base/share/classes/java/lang/constant/ReferenceClassDescImpl.java @@ -88,7 +88,7 @@ * @param o the {@code ClassDesc} to compare to this * {@code ClassDesc} * @return {@code true} if the specified {@code ClassDesc} is - * equals to this {@code ClassDesc}. + * equal to this {@code ClassDesc}. */ @Override public boolean equals(Object o) { diff --git a/src/java.base/share/classes/java/lang/invoke/MethodType.java b/src/java.base/share/classes/java/lang/invoke/MethodType.java --- a/src/java.base/share/classes/java/lang/invoke/MethodType.java +++ b/src/java.base/share/classes/java/lang/invoke/MethodType.java @@ -1379,12 +1379,12 @@ /** * This implementation returns {@code true} if {@code obj} is another - * {@code WeakEntry} whose referent is equals to this referent, or - * if {@code obj} is equals to the referent of this. This allows + * {@code WeakEntry} whose referent is equal to this referent, or + * if {@code obj} is equal to the referent of this. This allows * lookups to be made without wrapping in a {@code WeakEntry}. * * @param obj the object to compare - * @return true if {@code obj} is equals to this or the referent of this + * @return true if {@code obj} is equal to this or the referent of this * @see MethodType#equals(Object) * @see Object#equals(Object) */ diff --git a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java --- a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java +++ b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java @@ -536,14 +536,14 @@ *
{@code new Double(d1).equals(new Double(d2))}* (Unlike the {@code ==} operator, this method considers - * {@code NaN} equals to itself, and 0.0d unequal to -0.0d.) + * {@code NaN} equal to itself, and 0.0d unequal to -0.0d.) * * @param a one array to be tested for equality * @param a2 the other array to be tested for equality @@ -2827,7 +2827,7 @@ *
Two doubles {@code d1} and {@code d2} are considered equal if: *
{@code new Double(d1).equals(new Double(d2))}* (Unlike the {@code ==} operator, this method considers - * {@code NaN} equals to itself, and 0.0d unequal to -0.0d.) + * {@code NaN} equal to itself, and 0.0d unequal to -0.0d.) * * @param a the first array to be tested for equality * @param aFromIndex the index (inclusive) of the first element in the @@ -2877,7 +2877,7 @@ * Two floats {@code f1} and {@code f2} are considered equal if: *
{@code new Float(f1).equals(new Float(f2))}* (Unlike the {@code ==} operator, this method considers - * {@code NaN} equals to itself, and 0.0f unequal to -0.0f.) + * {@code NaN} equal to itself, and 0.0f unequal to -0.0f.) * * @param a one array to be tested for equality * @param a2 the other array to be tested for equality @@ -2910,7 +2910,7 @@ *
Two floats {@code f1} and {@code f2} are considered equal if: *
{@code new Float(f1).equals(new Float(f2))}* (Unlike the {@code ==} operator, this method considers - * {@code NaN} equals to itself, and 0.0f unequal to -0.0f.) + * {@code NaN} equal to itself, and 0.0f unequal to -0.0f.) * * @param a the first array to be tested for equality * @param aFromIndex the index (inclusive) of the first element in the @@ -7493,7 +7493,7 @@ *
Two non-{@code null} arrays, {@code a} and {@code b} with specified * ranges [{@code aFromIndex}, {@code atoIndex}) and * [{@code bFromIndex}, {@code btoIndex}) respectively, share a proper - * if the following expression is true: + * prefix if the following expression is true: *
{@code * (aToIndex - aFromIndex) != (bToIndex - bFromIndex) && * Arrays.equals(a, 0, Math.min(aToIndex - aFromIndex, bToIndex - bFromIndex), @@ -7620,7 +7620,7 @@ *Two non-{@code null} arrays, {@code a} and {@code b} with specified * ranges [{@code aFromIndex}, {@code atoIndex}) and * [{@code bFromIndex}, {@code btoIndex}) respectively, share a proper - * if the following expression is true: + * prefix if the following expression is true: *
{@code * (aToIndex - aFromIndex) != (bToIndex - bFromIndex) && * Arrays.equals(a, 0, Math.min(aToIndex - aFromIndex, bToIndex - bFromIndex), @@ -7747,7 +7747,7 @@ *Two non-{@code null} arrays, {@code a} and {@code b} with specified * ranges [{@code aFromIndex}, {@code atoIndex}) and * [{@code bFromIndex}, {@code btoIndex}) respectively, share a proper - * if the following expression is true: + * prefix if the following expression is true: *
{@code * (aToIndex - aFromIndex) != (bToIndex - bFromIndex) && * Arrays.equals(a, 0, Math.min(aToIndex - aFromIndex, bToIndex - bFromIndex), @@ -7874,7 +7874,7 @@ *Two non-{@code null} arrays, {@code a} and {@code b} with specified * ranges [{@code aFromIndex}, {@code atoIndex}) and * [{@code bFromIndex}, {@code btoIndex}) respectively, share a proper - * if the following expression is true: + * prefix if the following expression is true: *
{@code * (aToIndex - aFromIndex) != (bToIndex - bFromIndex) && * Arrays.equals(a, 0, Math.min(aToIndex - aFromIndex, bToIndex - bFromIndex), @@ -8001,7 +8001,7 @@ *Two non-{@code null} arrays, {@code a} and {@code b} with specified * ranges [{@code aFromIndex}, {@code atoIndex}) and * [{@code bFromIndex}, {@code btoIndex}) respectively, share a proper - * if the following expression is true: + * prefix if the following expression is true: *
{@code * (aToIndex - aFromIndex) != (bToIndex - bFromIndex) && * Arrays.equals(a, 0, Math.min(aToIndex - aFromIndex, bToIndex - bFromIndex), @@ -8128,7 +8128,7 @@ *Two non-{@code null} arrays, {@code a} and {@code b} with specified * ranges [{@code aFromIndex}, {@code atoIndex}) and * [{@code bFromIndex}, {@code btoIndex}) respectively, share a proper - * if the following expression is true: + * prefix if the following expression is true: *
{@code * (aToIndex - aFromIndex) != (bToIndex - bFromIndex) && * Arrays.equals(a, 0, Math.min(aToIndex - aFromIndex, bToIndex - bFromIndex), @@ -8255,7 +8255,7 @@ *Two non-{@code null} arrays, {@code a} and {@code b} with specified * ranges [{@code aFromIndex}, {@code atoIndex}) and * [{@code bFromIndex}, {@code btoIndex}) respectively, share a proper - * if the following expression is true: + * prefix if the following expression is true: *
{@code * (aToIndex - aFromIndex) != (bToIndex - bFromIndex) && * Arrays.equals(a, 0, Math.min(aToIndex - aFromIndex, bToIndex - bFromIndex), @@ -8382,7 +8382,7 @@ *Two non-{@code null} arrays, {@code a} and {@code b} with specified * ranges [{@code aFromIndex}, {@code atoIndex}) and * [{@code bFromIndex}, {@code btoIndex}) respectively, share a proper - * if the following expression is true: + * prefix if the following expression is true: *
{@code * (aToIndex - aFromIndex) != (bToIndex - bFromIndex) && * Arrays.equals(a, 0, Math.min(aToIndex - aFromIndex, bToIndex - bFromIndex), @@ -8513,7 +8513,7 @@ *Two non-{@code null} arrays, {@code a} and {@code b} with specified * ranges [{@code aFromIndex}, {@code atoIndex}) and * [{@code bFromIndex}, {@code btoIndex}) respectively, share a proper - * if the following expression is true: + * prefix if the following expression is true: *
{@code * (aToIndex - aFromIndex) != (bToIndex - bFromIndex) && * Arrays.equals(a, 0, Math.min(aToIndex - aFromIndex, bToIndex - bFromIndex), @@ -8659,7 +8659,7 @@ *Two non-{@code null} arrays, {@code a} and {@code b} with specified * ranges [{@code aFromIndex}, {@code atoIndex}) and * [{@code bFromIndex}, {@code btoIndex}) respectively, share a proper - * if the following expression is true: + * prefix if the following expression is true: *
{@code * (aToIndex - aFromIndex) != (bToIndex - bFromIndex) && * Arrays.equals(a, 0, Math.min(aToIndex - aFromIndex, bToIndex - bFromIndex), diff --git a/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java b/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java --- a/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java +++ b/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java @@ -139,7 +139,7 @@ * Compares other with this VersionInfo. * @param other VersionInfo to be compared * @return 0 if the argument is a VersionInfo object that has version - * information equals to this object. + * information equal to this object. * Less than 0 if the argument is a VersionInfo object that has * version information greater than this object. * Greater than 0 if the argument is a VersionInfo object that diff --git a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java --- a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java +++ b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java @@ -176,7 +176,7 @@ Field root = langReflectAccess.getRoot(field); if (root != null) { // FieldAccessor will use the root unless the modifiers have - // been overrridden + // been overridden if (root.getModifiers() == field.getModifiers() || !override) { field = root; } diff --git a/src/java.base/share/classes/sun/security/provider/AbstractDrbg.java b/src/java.base/share/classes/sun/security/provider/AbstractDrbg.java --- a/src/java.base/share/classes/sun/security/provider/AbstractDrbg.java +++ b/src/java.base/share/classes/sun/security/provider/AbstractDrbg.java @@ -490,7 +490,7 @@ // (not using derivation function) is so confusing // (does it need only strength or seedlen of entropy?) // that it's safer to assume minLength. In all other - // cases minLength equals to minEntropy. + // cases minLength is equal to minEntropy. return getEntropyInput(minLength, minLength, maxLength, isPr); } diff --git a/src/java.base/share/classes/sun/security/provider/PolicyFile.java b/src/java.base/share/classes/sun/security/provider/PolicyFile.java --- a/src/java.base/share/classes/sun/security/provider/PolicyFile.java +++ b/src/java.base/share/classes/sun/security/provider/PolicyFile.java @@ -300,7 +300,7 @@ * initialize the Policy object. */ private void init(URL url) { - // Properties are set once for each init(); ignore changes between + // Properties are set once for each init(); ignore changes // between diff invocations of initPolicyFile(policy, url, info). String numCacheStr = AccessController.doPrivileged(new PrivilegedAction<>() { @@ -325,7 +325,6 @@ } else { numCaches = DEFAULT_CACHE_SIZE; } - // System.out.println("number caches=" + numCaches); PolicyInfo newInfo = new PolicyInfo(numCaches); initPolicyFile(newInfo, url); policyInfo = newInfo;