Repository: commons-text Updated Branches: refs/heads/master 61cbf0afe -> dabd0846d
- fix some typos (closes #69) - simplify `if` condition with direct return Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/dabd0846 Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/dabd0846 Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/dabd0846 Branch: refs/heads/master Commit: dabd0846d0b14d7520e8659969a3ecf2db5b6997 Parents: 61cbf0a Author: abrasha <[email protected]> Authored: Thu Oct 12 16:44:47 2017 +0300 Committer: Pascal Schumacher <[email protected]> Committed: Thu Oct 12 20:19:51 2017 +0200 ---------------------------------------------------------------------- .../org/apache/commons/text/AlphabetConverter.java | 2 +- .../apache/commons/text/ExtendedMessageFormat.java | 5 +---- .../apache/commons/text/RandomStringGenerator.java | 4 ++-- src/main/java/org/apache/commons/text/StrBuilder.java | 2 +- .../java/org/apache/commons/text/StrTokenizer.java | 2 +- .../commons/text/similarity/SimilarityScore.java | 2 +- .../commons/text/translate/LookupTranslator.java | 2 +- .../org/apache/commons/text/FormattableUtilsTest.java | 2 +- .../java/org/apache/commons/text/StrBuilderTest.java | 14 +++++++------- 9 files changed, 16 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-text/blob/dabd0846/src/main/java/org/apache/commons/text/AlphabetConverter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/AlphabetConverter.java b/src/main/java/org/apache/commons/text/AlphabetConverter.java index dcc2eee..658525e 100644 --- a/src/main/java/org/apache/commons/text/AlphabetConverter.java +++ b/src/main/java/org/apache/commons/text/AlphabetConverter.java @@ -63,7 +63,7 @@ import java.util.Set; * </pre> * * <p> - * #ThreadSafe# AlphabetConverter class methods are threadsafe as they do not + * #ThreadSafe# AlphabetConverter class methods are thread-safe as they do not * change internal state. * </p> * http://git-wip-us.apache.org/repos/asf/commons-text/blob/dabd0846/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java b/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java index 372ae34..6145615 100644 --- a/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java +++ b/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java @@ -320,10 +320,7 @@ public class ExtendedMessageFormat extends MessageFormat { if (!Objects.equals(toPattern, rhs.toPattern)) { return false; } - if (!Objects.equals(registry, rhs.registry)) { - return false; - } - return true; + return Objects.equals(registry, rhs.registry); } /** http://git-wip-us.apache.org/repos/asf/commons-text/blob/dabd0846/src/main/java/org/apache/commons/text/RandomStringGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/RandomStringGenerator.java b/src/main/java/org/apache/commons/text/RandomStringGenerator.java index 02af0d4..dd50f96 100644 --- a/src/main/java/org/apache/commons/text/RandomStringGenerator.java +++ b/src/main/java/org/apache/commons/text/RandomStringGenerator.java @@ -337,7 +337,7 @@ public final class RandomStringGenerator { * } * </pre> * - * @param pairs array of charachters array, expected is to pass min, max pairs through this arg. + * @param pairs array of characters array, expected is to pass min, max pairs through this arg. * @return {@code this}, to allow method chaining. */ public Builder withinRange(final char[] ... pairs) { @@ -441,7 +441,7 @@ public final class RandomStringGenerator { * method will replace the previously stored Character. * </p> * - * @param chars set of preefined Characters for random string generation + * @param chars set of predefined Characters for random string generation * the Character can be, may be {@code null} or empty * @return {@code this}, to allow method chaining * @since 1.2 http://git-wip-us.apache.org/repos/asf/commons-text/blob/dabd0846/src/main/java/org/apache/commons/text/StrBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/StrBuilder.java b/src/main/java/org/apache/commons/text/StrBuilder.java index 1eafba6..0d0a127 100644 --- a/src/main/java/org/apache/commons/text/StrBuilder.java +++ b/src/main/java/org/apache/commons/text/StrBuilder.java @@ -1158,7 +1158,7 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build public <T> StrBuilder appendAll(@SuppressWarnings("unchecked") final T... array) { /* * @SuppressWarnings used to hide warning about vararg usage. We cannot - * use @SafeVarargs, since this method is not final. Using @SupressWarnings + * use @SafeVarargs, since this method is not final. Using @SuppressWarnings * is fine, because it isn't inherited by subclasses, so each subclass must * vouch for itself whether its use of 'array' is safe. */ http://git-wip-us.apache.org/repos/asf/commons-text/blob/dabd0846/src/main/java/org/apache/commons/text/StrTokenizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/StrTokenizer.java b/src/main/java/org/apache/commons/text/StrTokenizer.java index 66126ec..41b3f09 100644 --- a/src/main/java/org/apache/commons/text/StrTokenizer.java +++ b/src/main/java/org/apache/commons/text/StrTokenizer.java @@ -865,7 +865,7 @@ public class StrTokenizer implements ListIterator<String>, Cloneable { /** * Sets the field delimiter matcher. * <p> - * The delimitier is used to separate one token from another. + * The delimiter is used to separate one token from another. * * @param delim the delimiter matcher to use * @return this, to enable chaining http://git-wip-us.apache.org/repos/asf/commons-text/blob/dabd0846/src/main/java/org/apache/commons/text/similarity/SimilarityScore.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/similarity/SimilarityScore.java b/src/main/java/org/apache/commons/text/similarity/SimilarityScore.java index bca8d05..e71fae9 100644 --- a/src/main/java/org/apache/commons/text/similarity/SimilarityScore.java +++ b/src/main/java/org/apache/commons/text/similarity/SimilarityScore.java @@ -41,7 +41,7 @@ package org.apache.commons.text.similarity; * Further, this intended to be BiFunction<CharSequence, CharSequence, R>. * The <code>apply</code> method * accepts a pair of {@link CharSequence} parameters - * and returns an <code>R</code> type similarity score. We have ommitted the explicit + * and returns an <code>R</code> type similarity score. We have omitted the explicit * statement of extending BiFunction due to it only being implemented in Java 1.8, and we * wish to maintain Java 1.7 compatibility. * </p> http://git-wip-us.apache.org/repos/asf/commons-text/blob/dabd0846/src/main/java/org/apache/commons/text/translate/LookupTranslator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/translate/LookupTranslator.java b/src/main/java/org/apache/commons/text/translate/LookupTranslator.java index db66fc5..80eee30 100644 --- a/src/main/java/org/apache/commons/text/translate/LookupTranslator.java +++ b/src/main/java/org/apache/commons/text/translate/LookupTranslator.java @@ -43,7 +43,7 @@ public class LookupTranslator extends CharSequenceTranslator { /** * Define the lookup table to be used in translation * - * Note that, as of Lang 3.1 (the orgin of this code), the key to the lookup + * Note that, as of Lang 3.1 (the origin of this code), the key to the lookup * table is converted to a java.lang.String. This is because we need the key * to support hashCode and equals(Object), allowing it to be the key for a * HashMap. See LANG-882. http://git-wip-us.apache.org/repos/asf/commons-text/blob/dabd0846/src/test/java/org/apache/commons/text/FormattableUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/text/FormattableUtilsTest.java b/src/test/java/org/apache/commons/text/FormattableUtilsTest.java index c0ad546..b937b84 100644 --- a/src/test/java/org/apache/commons/text/FormattableUtilsTest.java +++ b/src/test/java/org/apache/commons/text/FormattableUtilsTest.java @@ -141,6 +141,6 @@ public class FormattableUtilsTest { public void formatTo(final Formatter formatter, final int flags, final int width, final int precision) { formatter.format(text); } - }; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/commons-text/blob/dabd0846/src/test/java/org/apache/commons/text/StrBuilderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/text/StrBuilderTest.java b/src/test/java/org/apache/commons/text/StrBuilderTest.java index c841efc..e8970a8 100644 --- a/src/test/java/org/apache/commons/text/StrBuilderTest.java +++ b/src/test/java/org/apache/commons/text/StrBuilderTest.java @@ -232,7 +232,7 @@ public class StrBuilderTest { assertTrue(sb.capacity() >= 32); assertEquals(3, sb.length()); assertEquals(3, sb.size()); - assertTrue(sb.isEmpty() == false); + assertFalse(sb.isEmpty()); sb.clear(); assertTrue(sb.capacity() >= 32); @@ -244,19 +244,19 @@ public class StrBuilderTest { assertTrue(sb.capacity() > 32); assertEquals(33, sb.length()); assertEquals(33, sb.size()); - assertTrue(sb.isEmpty() == false); + assertFalse(sb.isEmpty()); sb.ensureCapacity(16); assertTrue(sb.capacity() > 16); assertEquals(33, sb.length()); assertEquals(33, sb.size()); - assertTrue(sb.isEmpty() == false); + assertFalse(sb.isEmpty()); sb.minimizeCapacity(); assertEquals(33, sb.capacity()); assertEquals(33, sb.length()); assertEquals(33, sb.size()); - assertTrue(sb.isEmpty() == false); + assertFalse(sb.isEmpty()); try { sb.setLength(-1); @@ -269,21 +269,21 @@ public class StrBuilderTest { assertEquals(33, sb.capacity()); assertEquals(33, sb.length()); assertEquals(33, sb.size()); - assertTrue(sb.isEmpty() == false); + assertFalse(sb.isEmpty()); sb.setLength(16); assertTrue(sb.capacity() >= 16); assertEquals(16, sb.length()); assertEquals(16, sb.size()); assertEquals("1234567890123456", sb.toString()); - assertTrue(sb.isEmpty() == false); + assertFalse(sb.isEmpty()); sb.setLength(32); assertTrue(sb.capacity() >= 32); assertEquals(32, sb.length()); assertEquals(32, sb.size()); assertEquals("1234567890123456\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", sb.toString()); - assertTrue(sb.isEmpty() == false); + assertFalse(sb.isEmpty()); sb.setLength(0); assertTrue(sb.capacity() >= 32);
