You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by pa...@apache.org on 2017/04/24 21:53:45 UTC
[text] fix some checkstyle voilations and remove their
checkstyle-suppressions
Repository: commons-text
Updated Branches:
refs/heads/master c5863f4f9 -> 66cf58776
fix some checkstyle voilations and remove their checkstyle-suppressions
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/66cf5877
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/66cf5877
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/66cf5877
Branch: refs/heads/master
Commit: 66cf58776ccc495f7710896b74060c15378cfac3
Parents: c5863f4
Author: Pascal Schumacher <pa...@gmx.net>
Authored: Mon Apr 24 23:51:47 2017 +0200
Committer: Pascal Schumacher <pa...@gmx.net>
Committed: Mon Apr 24 23:51:47 2017 +0200
----------------------------------------------------------------------
checkstyle-suppressions.xml | 5 -----
.../java/org/apache/commons/text/StrLookup.java | 1 +
.../text/similarity/JaroWinklerDistance.java | 2 +-
.../commons/text/translate/LookupTranslator.java | 18 +++++++++---------
4 files changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/66cf5877/checkstyle-suppressions.xml
----------------------------------------------------------------------
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index d52e173..bdf6ecf 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -35,19 +35,14 @@
<suppress checks="MagicNumber" files="JaccardSimilarity.java" lines="0-99999" />
<suppress checks="MagicNumber" files="JaroWinklerDistance.java" lines="0-99999" />
- <suppress checks="NoWhitespaceAfter" files="JaroWinklerDistance.java" lines="0-99999" />
<suppress checks="FileLength" files="StrBuilder.java" lines="0-99999" />
<suppress checks="MagicNumber" files="StrBuilder.java" lines="0-99999" />
<suppress checks="MagicNumber" files="StringEscapeUtils.java" lines="0-99999" />
- <suppress checks="EmptyBlock" files="StrLookup.java" lines="0-99999" />
-
<suppress checks="MagicNumber" files="StrMatcher.java" lines="0-99999" />
- <suppress checks="LocalVariableName" files="LookupTranslator.java" lines="0-99999" />
-
<suppress checks="MagicNumber" files="NumericEntityEscaper.java" lines="0-99999" />
<suppress checks="MagicNumber" files="NumericEntityUnescaper.java" lines="0-99999" />
http://git-wip-us.apache.org/repos/asf/commons-text/blob/66cf5877/src/main/java/org/apache/commons/text/StrLookup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/StrLookup.java b/src/main/java/org/apache/commons/text/StrLookup.java
index 7c87670..d5abf43 100644
--- a/src/main/java/org/apache/commons/text/StrLookup.java
+++ b/src/main/java/org/apache/commons/text/StrLookup.java
@@ -173,6 +173,7 @@ public abstract class StrLookup<V> {
return System.getProperty(key);
} catch (final SecurityException scex) {
// Squelched. All lookup(String) will return null.
+ return null;
}
}
return null;
http://git-wip-us.apache.org/repos/asf/commons-text/blob/66cf5877/src/main/java/org/apache/commons/text/similarity/JaroWinklerDistance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/similarity/JaroWinklerDistance.java b/src/main/java/org/apache/commons/text/similarity/JaroWinklerDistance.java
index f1c4d01..272b184 100644
--- a/src/main/java/org/apache/commons/text/similarity/JaroWinklerDistance.java
+++ b/src/main/java/org/apache/commons/text/similarity/JaroWinklerDistance.java
@@ -150,7 +150,7 @@ public class JaroWinklerDistance implements SimilarityScore<Double> {
break;
}
}
- return new int[] { matches, transpositions / 2, prefix, max.length() };
+ return new int[] {matches, transpositions / 2, prefix, max.length()};
}
}
http://git-wip-us.apache.org/repos/asf/commons-text/blob/66cf5877/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 532c877..c4d5e2e 100644
--- a/src/main/java/org/apache/commons/text/translate/LookupTranslator.java
+++ b/src/main/java/org/apache/commons/text/translate/LookupTranslator.java
@@ -56,9 +56,9 @@ public class LookupTranslator extends CharSequenceTranslator {
throw new InvalidParameterException("lookupMap cannot be null");
}
this.lookupMap = new HashMap<>();
- prefixSet = new HashSet<>();
- int _shortest = Integer.MAX_VALUE;
- int _longest = 0;
+ this.prefixSet = new HashSet<>();
+ int currentShortest = Integer.MAX_VALUE;
+ int currentLongest = 0;
Iterator<Map.Entry<CharSequence, CharSequence>> it = lookupMap.entrySet().iterator();
while (it.hasNext()) {
@@ -66,15 +66,15 @@ public class LookupTranslator extends CharSequenceTranslator {
this.lookupMap.put(pair.getKey().toString(), pair.getValue().toString());
this.prefixSet.add(pair.getKey().charAt(0));
final int sz = pair.getKey().length();
- if (sz < _shortest) {
- _shortest = sz;
+ if (sz < currentShortest) {
+ currentShortest = sz;
}
- if (sz > _longest) {
- _longest = sz;
+ if (sz > currentLongest) {
+ currentLongest = sz;
}
}
- shortest = _shortest;
- longest = _longest;
+ this.shortest = currentShortest;
+ this.longest = currentLongest;
}
/**