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/26 20:08:59 UTC
ant git commit: More foreach loops (cherry-pick 061d29b)
Repository: ant
Updated Branches:
refs/heads/1.9.x baba2b85b -> 4c03d7113
More foreach loops (cherry-pick 061d29b)
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/4c03d711
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/4c03d711
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/4c03d711
Branch: refs/heads/1.9.x
Commit: 4c03d7113ce8b00272640d20f3422c9667db71ec
Parents: baba2b8
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sat May 26 22:08:45 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sat May 26 22:08:45 2018 +0200
----------------------------------------------------------------------
src/main/org/apache/tools/ant/Project.java | 4 +---
src/main/org/apache/tools/ant/taskdefs/CVSPass.java | 6 +++---
src/main/org/apache/tools/ant/taskdefs/Concat.java | 7 ++-----
src/main/org/apache/tools/ant/taskdefs/MacroInstance.java | 3 +--
src/main/org/apache/tools/ant/taskdefs/SQLExec.java | 6 ++----
.../org/apache/tools/ant/taskdefs/condition/IsSigned.java | 6 ++----
.../tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java | 7 ++-----
.../tools/ant/taskdefs/optional/jsp/JspNameMangler.java | 3 +--
src/main/org/apache/tools/ant/util/StringUtils.java | 3 +--
src/main/org/apache/tools/tar/TarOutputStream.java | 7 +++----
10 files changed, 18 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/4c03d711/src/main/org/apache/tools/ant/Project.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index b8636d9..49061c0 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -946,9 +946,7 @@ public class Project implements ResourceFactory {
*/
public void setSystemProperties() {
final Properties systemP = System.getProperties();
- final Enumeration<?> e = systemP.propertyNames();
- while (e.hasMoreElements()) {
- final String propertyName = (String) e.nextElement();
+ for (final String propertyName : systemP.stringPropertyNames()) {
final String value = systemP.getProperty(propertyName);
if (value != null) {
this.setPropertyInternal(propertyName, value);
http://git-wip-us.apache.org/repos/asf/ant/blob/4c03d711/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
index e39adef..1d3ad83 100644
--- a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
+++ b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
@@ -129,9 +129,9 @@ public class CVSPass extends Task {
}
private final String mangle(String password) {
- StringBuffer buf = new StringBuffer();
- for (int i = 0; i < password.length(); i++) {
- buf.append(shifts[password.charAt(i)]);
+ StringBuilder buf = new StringBuilder();
+ for (final char ch : password.toCharArray()) {
+ buf.append(shifts[ch]);
}
return buf.toString();
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4c03d711/src/main/org/apache/tools/ant/taskdefs/Concat.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java
index 93560ce..a095a4e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Concat.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java
@@ -185,12 +185,9 @@ public class Concat extends Task implements ResourceCollection {
value = "";
}
if (trimLeading) {
- char[] current = value.toCharArray();
- StringBuffer b = new StringBuffer(current.length);
+ StringBuilder b = new StringBuilder();
boolean startOfLine = true;
- int pos = 0;
- while (pos < current.length) {
- char ch = current[pos++];
+ for (final char ch : value.toCharArray()) {
if (startOfLine) {
if (ch == ' ' || ch == '\t') {
continue;
http://git-wip-us.apache.org/repos/asf/ant/blob/4c03d711/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
index 9ffa9b2..124f09e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
+++ b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
@@ -173,8 +173,7 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain
StringBuffer macroName = null;
int state = STATE_NORMAL;
- for (int i = 0; i < s.length(); ++i) {
- char ch = s.charAt(i);
+ for (final char ch : s.toCharArray()) {
switch (state) {
case STATE_NORMAL:
if (ch == '@') {
http://git-wip-us.apache.org/repos/asf/ant/blob/4c03d711/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
index e801ac0..3f56c47 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
@@ -937,11 +937,9 @@ public class SQLExec extends JDBCTask {
if (csvQuoteChar == null || s == null || (!forceCsvQuoteChar && s.indexOf(csvColumnSep) == -1 && s.indexOf(csvQuoteChar) == -1)) {
return s;
}
- StringBuffer sb = new StringBuffer(csvQuoteChar);
- int len = s.length();
+ StringBuilder sb = new StringBuilder(csvQuoteChar);
char q = csvQuoteChar.charAt(0);
- for (int i = 0; i < len; i++) {
- char c = s.charAt(i);
+ for (final char c : s.toCharArray()) {
if (c == q) {
sb.append(q);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/4c03d711/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
index 585fb3a..277a921 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
@@ -135,11 +135,9 @@ public class IsSigned extends DataType implements Condition {
}
private static String replaceInvalidChars(final String name) {
- StringBuffer sb = new StringBuffer();
- final int len = name.length();
+ StringBuilder sb = new StringBuilder();
boolean changes = false;
- for (int i = 0; i < len; i++) {
- final char ch = name.charAt(i);
+ for (final char ch : name.toCharArray()) {
if (ManifestTask.VALID_ATTRIBUTE_CHARS.indexOf(ch) < 0) {
sb.append("_");
changes = true;
http://git-wip-us.apache.org/repos/asf/ant/blob/4c03d711/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java
index 609938c..c71a6d5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java
@@ -37,17 +37,14 @@ public class Jasper41Mangler implements JspMangler {
public String mapJspToJavaName(File jspFile) {
String jspUri = jspFile.getAbsolutePath();
int start = jspUri.lastIndexOf(File.separatorChar) + 1;
- int end = jspUri.length();
- StringBuffer modifiedClassName;
- modifiedClassName = new StringBuffer(jspUri.length() - start);
+ StringBuilder modifiedClassName = new StringBuilder(jspUri.length() - start);
if (!Character.isJavaIdentifierStart(jspUri.charAt(start))
|| jspUri.charAt(start) == '_') {
// If the first char is not a start of Java identifier or is _
// prepend a '_'.
modifiedClassName.append('_');
}
- for (int i = start; i < end; i++) {
- char ch = jspUri.charAt(i);
+ for (final char ch : jspUri.substring(start).toCharArray()) {
if (Character.isJavaIdentifierPart(ch)) {
modifiedClassName.append(ch);
} else if (ch == '.') {
http://git-wip-us.apache.org/repos/asf/ant/blob/4c03d711/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
index 965f413..855376a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
@@ -92,8 +92,7 @@ public class JspNameMangler implements JspMangler {
modifiedClassName.append(mangleChar(firstChar));
}
// this is the rest
- for (int i = 1; i < className.length(); i++) {
- char subChar = className.charAt(i);
+ for (final char subChar : className.substring(1).toCharArray()) {
if (Character.isJavaIdentifierPart(subChar)) {
modifiedClassName.append(subChar);
} else {
http://git-wip-us.apache.org/repos/asf/ant/blob/4c03d711/src/main/org/apache/tools/ant/util/StringUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java
index 4bb3497..a387821 100644
--- a/src/main/org/apache/tools/ant/util/StringUtils.java
+++ b/src/main/org/apache/tools/ant/util/StringUtils.java
@@ -151,8 +151,7 @@ public final class StringUtils {
public static String resolveBackSlash(String input) {
StringBuffer b = new StringBuffer();
boolean backSlashSeen = false;
- for (int i = 0; i < input.length(); ++i) {
- char c = input.charAt(i);
+ for (final char c : input.toCharArray()) {
if (!backSlashSeen) {
if (c == '\\') {
backSlashSeen = true;
http://git-wip-us.apache.org/repos/asf/ant/blob/4c03d711/src/main/org/apache/tools/tar/TarOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/tar/TarOutputStream.java b/src/main/org/apache/tools/tar/TarOutputStream.java
index 217ed20..d055caa 100644
--- a/src/main/org/apache/tools/tar/TarOutputStream.java
+++ b/src/main/org/apache/tools/tar/TarOutputStream.java
@@ -521,10 +521,9 @@ public class TarOutputStream extends FilterOutputStream {
}
private String stripTo7Bits(String name) {
- final int length = name.length();
- StringBuilder result = new StringBuilder(length);
- for (int i = 0; i < length; i++) {
- char stripped = (char) (name.charAt(i) & 0x7F);
+ StringBuilder result = new StringBuilder(name.length());
+ for (final char ch : name.toCharArray()) {
+ char stripped = (char) (ch & 0x7F);
if (stripped != 0) { // would be read as Trailing null
result.append(stripped);
}