You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/05/20 15:00:49 UTC

[3/3] ant git commit: Tidy up the code

Tidy up the code

Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/e6b20300
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e6b20300
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e6b20300

Branch: refs/heads/master
Commit: e6b2030060df21679cae372a8948a5aa4a42d155
Parents: 748e917
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sun May 20 17:00:02 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sun May 20 17:00:02 2018 +0200

----------------------------------------------------------------------
 src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java       | 1 -
 src/main/org/apache/tools/ant/taskdefs/Replace.java                | 2 +-
 .../apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/e6b20300/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java b/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
index fc861e1..00b595b 100644
--- a/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
+++ b/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
@@ -18,7 +18,6 @@
 
 package org.apache.tools.ant.attribute;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/e6b20300/src/main/org/apache/tools/ant/taskdefs/Replace.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java
index b32b4b8..0129fbf 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Replace.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java
@@ -936,7 +936,7 @@ public class Replace extends MatchingTask {
      */
     private Iterator<String> getOrderedIterator(Properties props) {
         List<String> keys = new ArrayList<>(props.stringPropertyNames());
-        keys.sort(Comparator.<String>comparingInt(String::length).reversed());
+        keys.sort(Comparator.comparingInt(String::length).reversed());
         return keys.iterator();
     }
 }

http://git-wip-us.apache.org/repos/asf/ant/blob/e6b20300/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
index e82af1d..83d3f0a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
@@ -150,7 +150,7 @@ public class FailureRecorder extends ProjectComponent implements JUnitResultForm
         super.setProject(project);
         // check if already registered
         // register if needed
-        if (!project.getBuildListeners().stream().anyMatch(FailureRecorder.class::isInstance)) {
+        if (project.getBuildListeners().stream().noneMatch(FailureRecorder.class::isInstance)) {
             verbose("Register FailureRecorder (@" + this.hashCode() + ") as BuildListener");
             project.addBuildListener(this);
         }