You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2016/11/06 21:22:25 UTC
[1/3] [text] Add myself as a developer.
Repository: commons-text
Updated Branches:
refs/heads/master a0cf8337d -> a0db3fa8f
Add myself as a developer.
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/3c6c1451
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/3c6c1451
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/3c6c1451
Branch: refs/heads/master
Commit: 3c6c14516f707f2946678c61004c7e73c53c2fea
Parents: a0cf833
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Nov 6 13:19:25 2016 -0800
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Nov 6 13:19:25 2016 -0800
----------------------------------------------------------------------
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/3c6c1451/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7d3ac36..11a9d8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,11 @@
<id>chtompki</id>
<email>chtompki@apache.org</email>
</developer>
+ <developer>
+ <name>Gary Gregory</name>
+ <id>ggregory</id>
+ <email>ggregory@apache.org</email>
+ </developer>
</developers>
<contributors>
[2/3] [text] Update release description.
Posted by gg...@apache.org.
Update release description.
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/3fe8c73b
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/3fe8c73b
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/3fe8c73b
Branch: refs/heads/master
Commit: 3fe8c73b527f741b3ce630ef725644ab0261d382
Parents: 3c6c145
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Nov 6 13:20:37 2016 -0800
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Nov 6 13:20:37 2016 -0800
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/3fe8c73b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 11a9d8b..e28eaeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
<commons.componentid>text</commons.componentid>
<!-- Current 3.x release series -->
<commons.release.version>0.1</commons.release.version>
- <commons.release.desc>(Java 6.0+)</commons.release.desc>
+ <commons.release.desc>(Java 7+)</commons.release.desc>
<commons.jira.id>TEXT</commons.jira.id>
<commons.jira.pid>12318221</commons.jira.pid>
[3/3] [text] Use diamond notation.
Posted by gg...@apache.org.
Use diamond notation.
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/a0db3fa8
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/a0db3fa8
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/a0db3fa8
Branch: refs/heads/master
Commit: a0db3fa8fa5ed0dfc84892334ac1ea13149ee620
Parents: 3fe8c73
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Nov 6 13:22:20 2016 -0800
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Nov 6 13:22:20 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/commons/text/diff/EditScript.java | 2 +-
.../org/apache/commons/text/diff/ReplacementsFinder.java | 4 ++--
.../org/apache/commons/text/diff/StringsComparator.java | 10 +++++-----
.../apache/commons/text/similarity/CosineSimilarity.java | 2 +-
.../java/org/apache/commons/text/similarity/Counter.java | 2 +-
.../apache/commons/text/similarity/RegexTokenizer.java | 2 +-
.../apache/commons/text/diff/StringsComparatorTest.java | 2 +-
.../similarity/ParameterizedEditDistanceFromTest.java | 2 +-
.../commons/text/similarity/StringMetricFromTest.java | 4 ++--
9 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/a0db3fa8/src/main/java/org/apache/commons/text/diff/EditScript.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/diff/EditScript.java b/src/main/java/org/apache/commons/text/diff/EditScript.java
index 7b1b74c..800f044 100644
--- a/src/main/java/org/apache/commons/text/diff/EditScript.java
+++ b/src/main/java/org/apache/commons/text/diff/EditScript.java
@@ -57,7 +57,7 @@ public class EditScript<T> {
* Simple constructor. Creates a new empty script.
*/
public EditScript() {
- commands = new ArrayList<EditCommand<T>>();
+ commands = new ArrayList<>();
lcsLength = 0;
modifications = 0;
}
http://git-wip-us.apache.org/repos/asf/commons-text/blob/a0db3fa8/src/main/java/org/apache/commons/text/diff/ReplacementsFinder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/diff/ReplacementsFinder.java b/src/main/java/org/apache/commons/text/diff/ReplacementsFinder.java
index ced87c2..02aff5f 100644
--- a/src/main/java/org/apache/commons/text/diff/ReplacementsFinder.java
+++ b/src/main/java/org/apache/commons/text/diff/ReplacementsFinder.java
@@ -73,8 +73,8 @@ public class ReplacementsFinder<T> implements CommandVisitor<T> {
* @param handler handler to call when synchronized sequences are found
*/
public ReplacementsFinder(final ReplacementsHandler<T> handler) {
- pendingInsertions = new ArrayList<T>();
- pendingDeletions = new ArrayList<T>();
+ pendingInsertions = new ArrayList<>();
+ pendingDeletions = new ArrayList<>();
skipped = 0;
this.handler = handler;
}
http://git-wip-us.apache.org/repos/asf/commons-text/blob/a0db3fa8/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 47613aa..ea736d2 100644
--- a/src/main/java/org/apache/commons/text/diff/StringsComparator.java
+++ b/src/main/java/org/apache/commons/text/diff/StringsComparator.java
@@ -108,7 +108,7 @@ public class StringsComparator {
* sequences
*/
public EditScript<Character> getScript() {
- final EditScript<Character> script = new EditScript<Character>();
+ final EditScript<Character> script = new EditScript<>();
buildScript(0, left.length(), 0, right.length(), script);
return script;
}
@@ -134,15 +134,15 @@ public class StringsComparator {
int j = start2;
while (i < end1 || j < end2) {
if (i < end1 && j < end2 && left.charAt(i) == right.charAt(j)) {
- script.append(new KeepCommand<Character>(left.charAt(i)));
+ script.append(new KeepCommand<>(left.charAt(i)));
++i;
++j;
} else {
if (end1 - start1 > end2 - start2) {
- script.append(new DeleteCommand<Character>(left.charAt(i)));
+ script.append(new DeleteCommand<>(left.charAt(i)));
++i;
} else {
- script.append(new InsertCommand<Character>(right.charAt(j)));
+ script.append(new InsertCommand<>(right.charAt(j)));
++j;
}
}
@@ -154,7 +154,7 @@ public class StringsComparator {
start2, middle.getStart() - middle.getDiag(),
script);
for (int i = middle.getStart(); i < middle.getEnd(); ++i) {
- script.append(new KeepCommand<Character>(left.charAt(i)));
+ script.append(new KeepCommand<>(left.charAt(i)));
}
buildScript(middle.getEnd(), end1,
middle.getEnd() - middle.getDiag(), end2,
http://git-wip-us.apache.org/repos/asf/commons-text/blob/a0db3fa8/src/main/java/org/apache/commons/text/similarity/CosineSimilarity.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/similarity/CosineSimilarity.java b/src/main/java/org/apache/commons/text/similarity/CosineSimilarity.java
index 9956785..b33a0de 100644
--- a/src/main/java/org/apache/commons/text/similarity/CosineSimilarity.java
+++ b/src/main/java/org/apache/commons/text/similarity/CosineSimilarity.java
@@ -72,7 +72,7 @@ public class CosineSimilarity {
*/
private Set<CharSequence> getIntersection(Map<CharSequence, Integer> leftVector,
Map<CharSequence, Integer> rightVector) {
- Set<CharSequence> intersection = new HashSet<CharSequence>(leftVector.keySet());
+ Set<CharSequence> intersection = new HashSet<>(leftVector.keySet());
intersection.retainAll(rightVector.keySet());
return intersection;
}
http://git-wip-us.apache.org/repos/asf/commons-text/blob/a0db3fa8/src/main/java/org/apache/commons/text/similarity/Counter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/similarity/Counter.java b/src/main/java/org/apache/commons/text/similarity/Counter.java
index 5eefc51..1302aef 100644
--- a/src/main/java/org/apache/commons/text/similarity/Counter.java
+++ b/src/main/java/org/apache/commons/text/similarity/Counter.java
@@ -45,7 +45,7 @@ final class Counter {
* @return dict, where the elements are key, and the count the value
*/
public static Map<CharSequence, Integer> of(CharSequence[] tokens) {
- final Map<CharSequence, Integer> innerCounter = new HashMap<CharSequence, Integer>();
+ final Map<CharSequence, Integer> innerCounter = new HashMap<>();
for (CharSequence token : tokens) {
if (innerCounter.containsKey(token)) {
int value = innerCounter.get(token);
http://git-wip-us.apache.org/repos/asf/commons-text/blob/a0db3fa8/src/main/java/org/apache/commons/text/similarity/RegexTokenizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/similarity/RegexTokenizer.java b/src/main/java/org/apache/commons/text/similarity/RegexTokenizer.java
index 5a6c5d3..2853111 100644
--- a/src/main/java/org/apache/commons/text/similarity/RegexTokenizer.java
+++ b/src/main/java/org/apache/commons/text/similarity/RegexTokenizer.java
@@ -40,7 +40,7 @@ class RegexTokenizer implements Tokenizer<CharSequence> {
}
Pattern pattern = Pattern.compile("(\\w)+");
Matcher matcher = pattern.matcher(text.toString());
- List<String> tokens = new ArrayList<String>();
+ List<String> tokens = new ArrayList<>();
while (matcher.find()) {
tokens.add(matcher.group(0));
}
http://git-wip-us.apache.org/repos/asf/commons-text/blob/a0db3fa8/src/test/java/org/apache/commons/text/diff/StringsComparatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/diff/StringsComparatorTest.java b/src/test/java/org/apache/commons/text/diff/StringsComparatorTest.java
index d5d7690..fe8ef49 100644
--- a/src/test/java/org/apache/commons/text/diff/StringsComparatorTest.java
+++ b/src/test/java/org/apache/commons/text/diff/StringsComparatorTest.java
@@ -46,7 +46,7 @@ public class StringsComparatorTest {
@Test
public void testExecution() {
for (int i = 0; i < before.size(); ++i) {
- final ExecutionVisitor<Character> ev = new ExecutionVisitor<Character>();
+ final ExecutionVisitor<Character> ev = new ExecutionVisitor<>();
new StringsComparator(before.get(i), after.get(i)).getScript().visit(ev);
Assert.assertEquals(after.get(i), ev.getString());
}
http://git-wip-us.apache.org/repos/asf/commons-text/blob/a0db3fa8/src/test/java/org/apache/commons/text/similarity/ParameterizedEditDistanceFromTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/similarity/ParameterizedEditDistanceFromTest.java b/src/test/java/org/apache/commons/text/similarity/ParameterizedEditDistanceFromTest.java
index e053dcd..f95ca1a 100644
--- a/src/test/java/org/apache/commons/text/similarity/ParameterizedEditDistanceFromTest.java
+++ b/src/test/java/org/apache/commons/text/similarity/ParameterizedEditDistanceFromTest.java
@@ -86,7 +86,7 @@ public class ParameterizedEditDistanceFromTest<R> {
@Test
public void test() {
- EditDistanceFrom<R> editDistanceFrom = new EditDistanceFrom<R>(editDistance, left);
+ EditDistanceFrom<R> editDistanceFrom = new EditDistanceFrom<>(editDistance, left);
assertThat(editDistanceFrom.apply(right), equalTo(distance));
}
http://git-wip-us.apache.org/repos/asf/commons-text/blob/a0db3fa8/src/test/java/org/apache/commons/text/similarity/StringMetricFromTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/text/similarity/StringMetricFromTest.java b/src/test/java/org/apache/commons/text/similarity/StringMetricFromTest.java
index 117b3bc..e36449b 100644
--- a/src/test/java/org/apache/commons/text/similarity/StringMetricFromTest.java
+++ b/src/test/java/org/apache/commons/text/similarity/StringMetricFromTest.java
@@ -32,7 +32,7 @@ public class StringMetricFromTest {
String left = "Apache";
String right = "a patchy";
Integer distance = 4;
- EditDistanceFrom<Integer> metricFrom = new EditDistanceFrom<Integer>(metric, left);
+ EditDistanceFrom<Integer> metricFrom = new EditDistanceFrom<>(metric, left);
assertThat(metricFrom.apply(right), equalTo(distance));
assertThat(metricFrom.apply(right), equalTo(metric.apply(left, right)));
@@ -43,7 +43,7 @@ public class StringMetricFromTest {
EditDistance<Integer> metric = new LevenshteinDistance();
String target = "Apache";
EditDistanceFrom<Integer> metricFrom =
- new EditDistanceFrom<Integer>(metric, target);
+ new EditDistanceFrom<>(metric, target);
String mostSimilar = null;
Integer shortestDistance = null;