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/08/20 21:43:16 UTC
ant git commit: Remove unused imports and use more String.join()
Repository: ant
Updated Branches:
refs/heads/master 867ebc271 -> d1c59063d
Remove unused imports and use more String.join()
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d1c59063
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d1c59063
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d1c59063
Branch: refs/heads/master
Commit: d1c59063df4c4a65d611b3fc4249082abc038324
Parents: 867ebc2
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Mon Aug 20 22:57:09 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Mon Aug 20 22:57:09 2018 +0200
----------------------------------------------------------------------
.../apache/tools/ant/taskdefs/AntStructure.java | 4 ----
.../optional/junit/JUnit4TestMethodAdapter.java | 18 ++----------------
.../ant/taskdefs/optional/junit/JUnitTest.java | 13 +------------
.../tools/ant/taskdefs/optional/net/FTP.java | 6 +-----
src/main/org/apache/tools/ant/types/DirSet.java | 1 -
5 files changed, 4 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/d1c59063/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
index 10473d3..dcc787d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
@@ -19,12 +19,9 @@
package org.apache.tools.ant.taskdefs;
import java.io.File;
-import java.io.FileWriter;
import java.io.IOException;
-import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.ArrayList;
@@ -43,7 +40,6 @@ import org.apache.tools.ant.Task;
import org.apache.tools.ant.TaskContainer;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.Reference;
-import org.apache.tools.ant.util.FileUtils;
/**
* Creates a partial DTD for Ant from the currently known tasks.
http://git-wip-us.apache.org/repos/asf/ant/blob/d1c59063/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java
index b1a6401..2571c10 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java
@@ -111,18 +111,7 @@ public class JUnit4TestMethodAdapter implements Test {
@Override
public String toString() {
- String testClassName = testClass.getName();
- StringBuilder buf = new StringBuilder(testClassName.length()
- + 12 * methodNames.length)
- .append(':');
- if (methodNames.length != 0) {
- buf.append(methodNames[0]);
- for (int i = 1; i < methodNames.length; i++) {
- buf.append(',')
- .append(methodNames[i]);
- }
- }
- return buf.toString();
+ return ":" + String.join(",", methodNames);
}
private static final class MultipleMethodsFilter extends Filter {
@@ -166,10 +155,7 @@ public class JUnit4TestMethodAdapter implements Test {
buf.append("No methods");
} else {
buf.append(methodNames.length == 1 ? "Method " : "Methods ");
- for (String methodName : methodNames) {
- buf.append(methodName).append(',');
- }
- buf.setLength(buf.length() - 1);
+ buf.append(String.join(",", methodNames));
}
buf.append('(').append(testClass.getName()).append(')');
return buf.toString();
http://git-wip-us.apache.org/repos/asf/ant/blob/d1c59063/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
index e041e30..1a0de4b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
@@ -222,18 +222,7 @@ public class JUnitTest extends BaseTest implements Cloneable {
*/
String getMethodsString() {
if (methodsList == null && methodsSpecified) {
- if (methods.length == 0) {
- methodsList = "";
- } else if (methods.length == 1) {
- methodsList = methods[0];
- } else {
- StringBuilder buf = new StringBuilder(methods.length * 16);
- buf.append(methods[0]);
- for (int i = 1; i < methods.length; i++) {
- buf.append(',').append(methods[i]);
- }
- methodsList = buf.toString();
- }
+ methodsList = methods.length == 0 ? "" : String.join(",", methods);
}
return methodsList;
}
http://git-wip-us.apache.org/repos/asf/ant/blob/d1c59063/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index aa69cf7..901ff06 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -244,11 +244,7 @@ public class FTP extends Task implements FTPTaskConfig {
*/
@Override
public String getParent() {
- StringBuilder result = new StringBuilder();
- for (int i = 0; i < parts.length - 1; i++) {
- result.append(File.separatorChar).append(parts[i]);
- }
- return result.toString();
+ return File.separator + String.join(File.separator, parts);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/d1c59063/src/main/org/apache/tools/ant/types/DirSet.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/DirSet.java b/src/main/org/apache/tools/ant/types/DirSet.java
index d71ae33..855d5c3 100644
--- a/src/main/org/apache/tools/ant/types/DirSet.java
+++ b/src/main/org/apache/tools/ant/types/DirSet.java
@@ -20,7 +20,6 @@ package org.apache.tools.ant.types;
import java.util.Iterator;
-import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.types.resources.FileResourceIterator;
/**