diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 2a86e3022..f3e0da337 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -22,6 +22,7 @@ + Spelling fixes Fix examples contained in javadoc of StringUtils.center methods Add StringUtils API to call String.replaceAll in DOTALL a.k.a. single-line mode ArrayUtils removeElements methods use unnecessary HashSet @@ -212,7 +213,7 @@ ExceptionUtils not thread-safe. ObjectUtils.coalesce. StrBuilder should implement CharSequence and Appendable. - StringEscapeUtils.escapeHtml() escapes multibyte characters like Chinese, Japanes, etc. + StringEscapeUtils.escapeHtml() escapes multibyte characters like Chinese, Japanese, etc. Finally start using generics. StrBuilder does not implement clone(). EnumUtils for JDK 5.0. @@ -547,7 +548,7 @@ Should ToStringBuilder.reflectionToString handle arrays?. EnumUtils nit: The import java.io.Serializable is never used. Example in Javadoc for ToStringBuilder wrong for append. - Added class hierachy support to HashCodeBuilder.reflectionHashCode(). + Added class hierarchy support to HashCodeBuilder.reflectionHashCode(). ExceptionUtils new methods. Infinite loop in StringUtils.replace(text, repl, with) + FIX. StackOverflow due to ToStringBuilder. @@ -579,7 +580,7 @@ Resurrect the WordWrapUtils from commons-sandbox/utils. EnumTest fails on Linux Sun JDK 1.3.0. What to do with FastDateFormat unused private constructors. - Added class hierachy support to CompareToBuilder.reflectionCompare(). + Added class hierarchy support to CompareToBuilder.reflectionCompare(). Removed compile warning in FastDateFormat. typo in the Javadoc example code. MethodUtils: Removed unused code/unused local vars. diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java b/src/main/java/org/apache/commons/lang3/ArrayUtils.java index e4ff2676c..5fc4c85a2 100644 --- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java +++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java @@ -1362,7 +1362,7 @@ public class ArrayUtils { * * @param array the array to retrieve the length from, may be null * @return The length of the array, or {@code 0} if the array is {@code null} - * @throws IllegalArgumentException if the object arguement is not an array. + * @throws IllegalArgumentException if the object argument is not an array. * @since 2.1 */ public static int getLength(Object array) { diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java b/src/main/java/org/apache/commons/lang3/ClassUtils.java index 433941ef4..465f9bd7b 100644 --- a/src/main/java/org/apache/commons/lang3/ClassUtils.java +++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java @@ -905,7 +905,7 @@ public class ClassUtils { * @param parameterTypes the list of parameters * @return the method * @throws NullPointerException if the class is null - * @throws SecurityException if a a security violation occured + * @throws SecurityException if a security violation occurred * @throws NoSuchMethodException if the method is not found in the given class * or if the metothod doen't conform with the requirements */ diff --git a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java index 6c24cdcab..a693ba532 100644 --- a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java +++ b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java @@ -381,7 +381,7 @@ public class ExceptionUtils { * negative treated as zero, larger than chain size returns -1 * @param subclass if true, compares with {@link Class#isAssignableFrom(Class)}, otherwise compares * using references - * @return index of the type within throwables nested withing the specified throwable + * @return index of the type within throwables nested within the specified throwable */ private static int indexOf(Throwable throwable, Class type, int fromIndex, boolean subclass) { if (throwable == null || type == null) { diff --git a/src/main/java/org/apache/commons/lang3/math/Fraction.java b/src/main/java/org/apache/commons/lang3/math/Fraction.java index 19269deaa..ea50e6e8a 100644 --- a/src/main/java/org/apache/commons/lang3/math/Fraction.java +++ b/src/main/java/org/apache/commons/lang3/math/Fraction.java @@ -922,7 +922,7 @@ public final class Fraction extends Number implements Comparable { *

Gets the fraction as a proper String in the format X Y/Z.

* *

The format used in 'wholeNumber numerator/denominator'. - * If the whole number is zero it will be ommitted. If the numerator is zero, + * If the whole number is zero it will be omitted. If the numerator is zero, * only the whole number is returned.

* * @return a String form of the fraction diff --git a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java index e251ef9d7..fce7b9811 100644 --- a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java +++ b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java @@ -1688,7 +1688,7 @@ public class StrBuilder implements CharSequence, Appendable, Serializable { * Deletes all parts of the builder that the matcher matches. *

* Matchers can be used to perform advanced deletion behaviour. - * For example you could write a matcher to delete all occurances + * For example you could write a matcher to delete all occurrences * where the character 'a' is followed by a number. * * @param matcher the matcher to use to find the deletion, null causes no action @@ -1838,7 +1838,7 @@ public class StrBuilder implements CharSequence, Appendable, Serializable { * Replaces all matches within the builder with the replace string. *

* Matchers can be used to perform advanced replace behaviour. - * For example you could write a matcher to replace all occurances + * For example you could write a matcher to replace all occurrences * where the character 'a' is followed by a number. * * @param matcher the matcher to use to find the deletion, null causes no action @@ -1869,7 +1869,7 @@ public class StrBuilder implements CharSequence, Appendable, Serializable { * Advanced search and replaces within the builder using a matcher. *

* Matchers can be used to perform advanced behaviour. - * For example you could write a matcher to delete all occurances + * For example you could write a matcher to delete all occurrences * where the character 'a' is followed by a number. * * @param matcher the matcher to use to find the deletion, null causes no action @@ -1892,7 +1892,7 @@ public class StrBuilder implements CharSequence, Appendable, Serializable { * Replaces within the builder using a matcher. *

* Matchers can be used to perform advanced behaviour. - * For example you could write a matcher to delete all occurances + * For example you could write a matcher to delete all occurrences * where the character 'a' is followed by a number. * * @param matcher the matcher to use to find the deletion, null causes no action diff --git a/src/main/java/org/apache/commons/lang3/text/StrMatcher.java b/src/main/java/org/apache/commons/lang3/text/StrMatcher.java index 8048c2bfd..5ebb68f4c 100644 --- a/src/main/java/org/apache/commons/lang3/text/StrMatcher.java +++ b/src/main/java/org/apache/commons/lang3/text/StrMatcher.java @@ -230,7 +230,7 @@ public abstract class StrMatcher { * Only values in the buffer between the specifed indices may be accessed. *

* The matching code may check one character or many. - * It may check characters preceeding pos as well as those + * It may check characters preceding pos as well as those * after, so long as no checks exceed the bounds specified. *

* It must return zero for no match, or a positive number if a match was found. @@ -254,7 +254,7 @@ public abstract class StrMatcher { * The API guarantees that pos is a valid index for buffer. *

* The matching code may check one character or many. - * It may check characters preceeding pos as well as those after. + * It may check characters preceding pos as well as those after. *

* It must return zero for no match, or a positive number if a match was found. * The number indicates the number of characters that matched. diff --git a/src/main/java/org/apache/commons/lang3/time/StopWatch.java b/src/main/java/org/apache/commons/lang3/time/StopWatch.java index 0c3dad1fa..1b6f87022 100644 --- a/src/main/java/org/apache/commons/lang3/time/StopWatch.java +++ b/src/main/java/org/apache/commons/lang3/time/StopWatch.java @@ -288,7 +288,7 @@ public class StopWatch { } else if (this.runningState == STATE_RUNNING) { return System.nanoTime() - this.startTime; } - throw new RuntimeException("Illegal running state has occured. "); + throw new RuntimeException("Illegal running state has occurred."); } /** diff --git a/src/site/resources/release-notes/RELEASE-NOTES-1.0.txt b/src/site/resources/release-notes/RELEASE-NOTES-1.0.txt index 95b8882cb..3164f74d9 100644 --- a/src/site/resources/release-notes/RELEASE-NOTES-1.0.txt +++ b/src/site/resources/release-notes/RELEASE-NOTES-1.0.txt @@ -42,7 +42,7 @@ StringUtils.convertUnicodeToNative and convertNativeToUnicode both removed. DEPRECATIONS: -Much of the exception subpackage was reworked betwen 1.0-b1 and 1.0. Apart +Much of the exception subpackage was reworked between 1.0-b1 and 1.0. Apart from this the API should have a high level of backward compatibility. diff --git a/src/site/resources/release-notes/RELEASE-NOTES-2.0.txt b/src/site/resources/release-notes/RELEASE-NOTES-2.0.txt index 55cb3483f..ce6d25e4d 100644 --- a/src/site/resources/release-notes/RELEASE-NOTES-2.0.txt +++ b/src/site/resources/release-notes/RELEASE-NOTES-2.0.txt @@ -127,8 +127,8 @@ ID Sev Pri Plt Owner State Result Summary 16193 Hierarchy support in EqualsBuilder.reflectionEquals() 16202 typo in the javadoc example code 16204 Infinite loop in StringUtils.replace(text, repl, with) + FIX -16227 Added class hierachy support to CompareToBuilder.reflectionC -16228 Added class hierachy support to HashCodeBuilder.reflectionHa +16227 Added class hierarchy support to CompareToBuilder.reflectionC +16228 Added class hierarchy support to HashCodeBuilder.reflectionHa 16284 MethodUtils: Removed unused code/unused local vars. 16341 No Javadoc for NestableDelegate 16622 Removed compile warning in FastDateFormat diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.0.txt b/src/site/resources/release-notes/RELEASE-NOTES-3.0.txt index 94b20383d..d753bfbe6 100644 --- a/src/site/resources/release-notes/RELEASE-NOTES-3.0.txt +++ b/src/site/resources/release-notes/RELEASE-NOTES-3.0.txt @@ -111,7 +111,7 @@ BUG FIXES IN 3.0 [LANG-11] Depend on JDK 1.5+. [LANG-302] StrBuilder does not implement clone(). - [LANG-339] StringEscapeUtils.escapeHtml() escapes multibyte characters like Chinese, Japanes, etc. + [LANG-339] StringEscapeUtils.escapeHtml() escapes multibyte characters like Chinese, Japanese, etc. [LANG-369] ExceptionUtils not thread-safe. [LANG-418] Javadoc incorrect for StringUtils.endsWithIgnoreCase. [LANG-428] StringUtils.isAlpha, isAlphanumeric and isNumeric now return false for "" diff --git a/src/site/xdoc/developerguide.xml b/src/site/xdoc/developerguide.xml index fc645c509..21d3445d1 100644 --- a/src/site/xdoc/developerguide.xml +++ b/src/site/xdoc/developerguide.xml @@ -141,7 +141,7 @@ However, it's not something to get worked up about. Lots of spelling difference

5.BUILDING

Building a Release

-The currently targetted version of Java is 1.5. +The currently targeted version of Java is 1.5.

To build Lang: diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml index 83c3ed92d..e7bf4b74d 100644 --- a/src/site/xdoc/mail-lists.xml +++ b/src/site/xdoc/mail-lists.xml @@ -149,7 +149,7 @@ limitations under the License. Commons Commits List

- Only for e-mails automatically generated by the source control sytem. + Only for e-mails automatically generated by the source control system.

Subscribe diff --git a/src/site/xdoc/upgradeto2_0.xml b/src/site/xdoc/upgradeto2_0.xml index e1f7b5b04..10fee359a 100644 --- a/src/site/xdoc/upgradeto2_0.xml +++ b/src/site/xdoc/upgradeto2_0.xml @@ -149,8 +149,8 @@ ID Sev Pri Plt Owner State Result Summary 16193 Hierarchy support in EqualsBuilder.reflectionEquals() 16202 typo in the javadoc example code 16204 Infinite loop in StringUtils.replace(text, repl, with) + FIX -16227 Added class hierachy support to CompareToBuilder.reflectionC -16228 Added class hierachy support to HashCodeBuilder.reflectionHa +16227 Added class hierarchy support to CompareToBuilder.reflectionC +16228 Added class hierarchy support to HashCodeBuilder.reflectionHa 16284 MethodUtils: Removed unused code/unused local vars. 16341 No Javadoc for NestableDelegate 16622 Removed compile warning in FastDateFormat diff --git a/src/site/xdoc/upgradeto3_0.xml b/src/site/xdoc/upgradeto3_0.xml index 09981e138..9bbda8d3f 100644 --- a/src/site/xdoc/upgradeto3_0.xml +++ b/src/site/xdoc/upgradeto3_0.xml @@ -124,7 +124,7 @@ BUG FIXES IN 3.0 [LANG-11] Depend on JDK 1.5+. [LANG-302] StrBuilder does not implement clone(). - [LANG-339] StringEscapeUtils.escapeHtml() escapes multibyte characters like Chinese, Japanes, etc. + [LANG-339] StringEscapeUtils.escapeHtml() escapes multibyte characters like Chinese, Japanese, etc. [LANG-369] ExceptionUtils not thread-safe. [LANG-418] Javadoc incorrect for StringUtils.endsWithIgnoreCase. [LANG-428] StringUtils.isAlpha, isAlphanumeric and isNumeric now return false for "" diff --git a/src/site/xdoc/userguide.xml b/src/site/xdoc/userguide.xml index 5ed1e7fb5..61d8ca552 100644 --- a/src/site/xdoc/userguide.xml +++ b/src/site/xdoc/userguide.xml @@ -294,7 +294,7 @@ public class ServerThread implements Runnable { high load, if multiple threads access the initializer concurrently, it is possible that the initialize() method is invoked multiple times. The class guarantees that get() always returns the - same object though; so objects created accidently are immideately discarded. + same object though; so objects created accidentally are immideately discarded.

With AtomicSafeInitializer there is yet another variant @@ -536,7 +536,7 @@ MyClass obj = ConcurrentUtils.initializeUnchecked(initializer); need on demand. However, sometimes it is desired to set some properties of the newly created worker threads. This is possible through the ThreadFactory interface; an implementation of this interface - has to be created and pased to an executor on creation time. Currently, the + has to be created and passed to an executor on creation time. Currently, the JDK does not provide an implementation of ThreadFactory, so one has to start from scratch.