Repository: commons-text Updated Branches: refs/heads/master 6bbe66feb -> bf86c1d13
Fix PMD errors Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/bf86c1d1 Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/bf86c1d1 Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/bf86c1d1 Branch: refs/heads/master Commit: bf86c1d139aff068c97fd949b8b68fdb0e784835 Parents: 6bbe66f Author: Bruno P. Kinoshita <[email protected]> Authored: Tue Nov 8 21:55:21 2016 +1300 Committer: Bruno P. Kinoshita <[email protected]> Committed: Tue Nov 8 21:55:21 2016 +1300 ---------------------------------------------------------------------- .../java/org/apache/commons/text/AlphabetConverter.java | 12 +++++------- .../org/apache/commons/text/diff/StringsComparator.java | 4 ++-- .../commons/text/similarity/LevenshteinDistance.java | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-text/blob/bf86c1d1/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 db3d2a8..b3ab00b 100644 --- a/src/main/java/org/apache/commons/text/AlphabetConverter.java +++ b/src/main/java/org/apache/commons/text/AlphabetConverter.java @@ -92,11 +92,10 @@ public final class AlphabetConverter { * * @param originalToEncoded original string to be encoded * @param encodedToOriginal encoding alphabet - * @param doNotEncodeMap encoding black list * @param encodedLetterLength length of the encoded letter */ private AlphabetConverter(Map<Integer, String> originalToEncoded, Map<String, String> encodedToOriginal, - Map<Integer, String> doNotEncodeMap, int encodedLetterLength) { + int encodedLetterLength) { this.originalToEncoded = originalToEncoded; this.encodedToOriginal = encodedToOriginal; @@ -205,6 +204,7 @@ public final class AlphabetConverter { * @param originals original values * @param doNotEncodeMap map of values that should not be encoded */ + @SuppressWarnings("PMD") private void addSingleEncoding(int level, String currentEncoding, Collection<Integer> encoding, Iterator<Integer> originals, Map<Integer, String> doNotEncodeMap) { @@ -306,8 +306,7 @@ public final class AlphabetConverter { } } - return new AlphabetConverter(unmodifiableOriginalToEncoded, encodedToOriginal, doNotEncodeMap, - encodedLetterLength); + return new AlphabetConverter(unmodifiableOriginalToEncoded, encodedToOriginal, encodedLetterLength); } /** @@ -412,7 +411,7 @@ public final class AlphabetConverter { } } - return new AlphabetConverter(originalToEncoded, encodedToOriginal, doNotEncodeMap, encodedLetterLength); + return new AlphabetConverter(originalToEncoded, encodedToOriginal, encodedLetterLength); } else if (encodingCopy.size() - doNotEncodeCopy.size() < 2) { throw new IllegalArgumentException( @@ -435,8 +434,7 @@ public final class AlphabetConverter { encodedLetterLength = lettersSoFar + 1; - AlphabetConverter ac = new AlphabetConverter(originalToEncoded, encodedToOriginal, doNotEncodeMap, - encodedLetterLength); + AlphabetConverter ac = new AlphabetConverter(originalToEncoded, encodedToOriginal, encodedLetterLength); ac.addSingleEncoding(encodedLetterLength, "", encodingCopy, originalCopy.iterator(), doNotEncodeMap); http://git-wip-us.apache.org/repos/asf/commons-text/blob/bf86c1d1/src/main/java/org/apache/commons/text/diff/StringsComparator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/diff/StringsComparator.java b/src/main/java/org/apache/commons/text/diff/StringsComparator.java index ea736d2..2c8fb15 100644 --- a/src/main/java/org/apache/commons/text/diff/StringsComparator.java +++ b/src/main/java/org/apache/commons/text/diff/StringsComparator.java @@ -215,7 +215,7 @@ public class StringsComparator { } // Second step if (delta % 2 != 0 && delta - d <= k && k <= delta + d) { - if (vUp[i - delta] <= vDown[i]) { + if (vUp[i - delta] <= vDown[i]) { // NOPMD return buildSnake(vUp[i - delta], k + start1 - start2, end1, end2); } } @@ -241,7 +241,7 @@ public class StringsComparator { } // Second step if (delta % 2 == 0 && -d <= k && k <= d) { - if (vUp[i] <= vDown[i + delta]) { + if (vUp[i] <= vDown[i + delta]) { // NOPMD return buildSnake(vUp[i], k + start1 - start2, end1, end2); } } http://git-wip-us.apache.org/repos/asf/commons-text/blob/bf86c1d1/src/main/java/org/apache/commons/text/similarity/LevenshteinDistance.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/text/similarity/LevenshteinDistance.java b/src/main/java/org/apache/commons/text/similarity/LevenshteinDistance.java index 9b9f9a9..5a9ae3f 100644 --- a/src/main/java/org/apache/commons/text/similarity/LevenshteinDistance.java +++ b/src/main/java/org/apache/commons/text/similarity/LevenshteinDistance.java @@ -161,7 +161,7 @@ public class LevenshteinDistance implements EditDistance<Integer> { * @param threshold the target threshold, must not be negative * @return result distance, or -1 */ - private static int limitedCompare(CharSequence left, CharSequence right, int threshold) { + private static int limitedCompare(CharSequence left, CharSequence right, int threshold) { // NOPMD if (left == null || right == null) { throw new IllegalArgumentException("Strings must not be null"); }
