Browse Source

Use foreach loops

master
Gintas Grigelionis 7 years ago
parent
commit
061d29b6fe
10 changed files with 14 additions and 29 deletions
  1. +1
    -3
      src/main/org/apache/tools/ant/Project.java
  2. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/CVSPass.java
  3. +2
    -5
      src/main/org/apache/tools/ant/taskdefs/Concat.java
  4. +1
    -2
      src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
  5. +1
    -3
      src/main/org/apache/tools/ant/taskdefs/SQLExec.java
  6. +1
    -3
      src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
  7. +1
    -3
      src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java
  8. +1
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
  9. +1
    -2
      src/main/org/apache/tools/ant/util/StringUtils.java
  10. +3
    -4
      src/main/org/apache/tools/tar/TarOutputStream.java

+ 1
- 3
src/main/org/apache/tools/ant/Project.java View File

@@ -941,9 +941,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);


+ 2
- 2
src/main/org/apache/tools/ant/taskdefs/CVSPass.java View File

@@ -131,8 +131,8 @@ public class CVSPass extends Task {

private final String mangle(String password) {
StringBuilder buf = new StringBuilder();
for (int i = 0; i < password.length(); i++) {
buf.append(shifts[password.charAt(i)]);
for (final char ch : password.toCharArray()) {
buf.append(shifts[ch]);
}
return buf.toString();
}


+ 2
- 5
src/main/org/apache/tools/ant/taskdefs/Concat.java View File

@@ -185,12 +185,9 @@ public class Concat extends Task implements ResourceCollection {
value = "";
}
if (trimLeading) {
char[] current = value.toCharArray();
StringBuilder b = new StringBuilder(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;


+ 1
- 2
src/main/org/apache/tools/ant/taskdefs/MacroInstance.java View File

@@ -174,8 +174,7 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain
StringBuilder 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 == '@') {


+ 1
- 3
src/main/org/apache/tools/ant/taskdefs/SQLExec.java View File

@@ -911,10 +911,8 @@ public class SQLExec extends JDBCTask {
return s;
}
StringBuilder sb = new StringBuilder(csvQuoteChar);
int len = s.length();
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);
}


+ 1
- 3
src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java View File

@@ -133,10 +133,8 @@ public class IsSigned extends DataType implements Condition {

private static String replaceInvalidChars(final String name) {
StringBuilder sb = new StringBuilder();
final int len = name.length();
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;


+ 1
- 3
src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java View File

@@ -37,7 +37,6 @@ 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();
StringBuilder modifiedClassName = new StringBuilder(jspUri.length() - start);
if (!Character.isJavaIdentifierStart(jspUri.charAt(start))
|| jspUri.charAt(start) == '_') {
@@ -45,8 +44,7 @@ public class Jasper41Mangler implements JspMangler {
// 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 == '.') {


+ 1
- 2
src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java View File

@@ -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 {


+ 1
- 2
src/main/org/apache/tools/ant/util/StringUtils.java View File

@@ -155,8 +155,7 @@ public final class StringUtils {
public static String resolveBackSlash(String input) {
StringBuilder b = new StringBuilder();
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;


+ 3
- 4
src/main/org/apache/tools/tar/TarOutputStream.java View File

@@ -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);
}


Loading…
Cancel
Save