| @@ -941,9 +941,7 @@ public class Project implements ResourceFactory { | |||||
| */ | */ | ||||
| public void setSystemProperties() { | public void setSystemProperties() { | ||||
| final Properties systemP = System.getProperties(); | 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); | final String value = systemP.getProperty(propertyName); | ||||
| if (value != null) { | if (value != null) { | ||||
| this.setPropertyInternal(propertyName, value); | this.setPropertyInternal(propertyName, value); | ||||
| @@ -131,8 +131,8 @@ public class CVSPass extends Task { | |||||
| private final String mangle(String password) { | private final String mangle(String password) { | ||||
| StringBuilder buf = new StringBuilder(); | 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(); | return buf.toString(); | ||||
| } | } | ||||
| @@ -185,12 +185,9 @@ public class Concat extends Task implements ResourceCollection { | |||||
| value = ""; | value = ""; | ||||
| } | } | ||||
| if (trimLeading) { | if (trimLeading) { | ||||
| char[] current = value.toCharArray(); | |||||
| StringBuilder b = new StringBuilder(current.length); | |||||
| StringBuilder b = new StringBuilder(); | |||||
| boolean startOfLine = true; | boolean startOfLine = true; | ||||
| int pos = 0; | |||||
| while (pos < current.length) { | |||||
| char ch = current[pos++]; | |||||
| for (final char ch : value.toCharArray()) { | |||||
| if (startOfLine) { | if (startOfLine) { | ||||
| if (ch == ' ' || ch == '\t') { | if (ch == ' ' || ch == '\t') { | ||||
| continue; | continue; | ||||
| @@ -174,8 +174,7 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain | |||||
| StringBuilder macroName = null; | StringBuilder macroName = null; | ||||
| int state = STATE_NORMAL; | 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) { | switch (state) { | ||||
| case STATE_NORMAL: | case STATE_NORMAL: | ||||
| if (ch == '@') { | if (ch == '@') { | ||||
| @@ -911,10 +911,8 @@ public class SQLExec extends JDBCTask { | |||||
| return s; | return s; | ||||
| } | } | ||||
| StringBuilder sb = new StringBuilder(csvQuoteChar); | StringBuilder sb = new StringBuilder(csvQuoteChar); | ||||
| int len = s.length(); | |||||
| char q = csvQuoteChar.charAt(0); | 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) { | if (c == q) { | ||||
| sb.append(q); | sb.append(q); | ||||
| } | } | ||||
| @@ -133,10 +133,8 @@ public class IsSigned extends DataType implements Condition { | |||||
| private static String replaceInvalidChars(final String name) { | private static String replaceInvalidChars(final String name) { | ||||
| StringBuilder sb = new StringBuilder(); | StringBuilder sb = new StringBuilder(); | ||||
| final int len = name.length(); | |||||
| boolean changes = false; | 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) { | if (ManifestTask.VALID_ATTRIBUTE_CHARS.indexOf(ch) < 0) { | ||||
| sb.append("_"); | sb.append("_"); | ||||
| changes = true; | changes = true; | ||||
| @@ -37,7 +37,6 @@ public class Jasper41Mangler implements JspMangler { | |||||
| public String mapJspToJavaName(File jspFile) { | public String mapJspToJavaName(File jspFile) { | ||||
| String jspUri = jspFile.getAbsolutePath(); | String jspUri = jspFile.getAbsolutePath(); | ||||
| int start = jspUri.lastIndexOf(File.separatorChar) + 1; | int start = jspUri.lastIndexOf(File.separatorChar) + 1; | ||||
| int end = jspUri.length(); | |||||
| StringBuilder modifiedClassName = new StringBuilder(jspUri.length() - start); | StringBuilder modifiedClassName = new StringBuilder(jspUri.length() - start); | ||||
| if (!Character.isJavaIdentifierStart(jspUri.charAt(start)) | if (!Character.isJavaIdentifierStart(jspUri.charAt(start)) | ||||
| || jspUri.charAt(start) == '_') { | || jspUri.charAt(start) == '_') { | ||||
| @@ -45,8 +44,7 @@ public class Jasper41Mangler implements JspMangler { | |||||
| // prepend a '_'. | // prepend a '_'. | ||||
| modifiedClassName.append('_'); | 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)) { | if (Character.isJavaIdentifierPart(ch)) { | ||||
| modifiedClassName.append(ch); | modifiedClassName.append(ch); | ||||
| } else if (ch == '.') { | } else if (ch == '.') { | ||||
| @@ -92,8 +92,7 @@ public class JspNameMangler implements JspMangler { | |||||
| modifiedClassName.append(mangleChar(firstChar)); | modifiedClassName.append(mangleChar(firstChar)); | ||||
| } | } | ||||
| // this is the rest | // 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)) { | if (Character.isJavaIdentifierPart(subChar)) { | ||||
| modifiedClassName.append(subChar); | modifiedClassName.append(subChar); | ||||
| } else { | } else { | ||||
| @@ -155,8 +155,7 @@ public final class StringUtils { | |||||
| public static String resolveBackSlash(String input) { | public static String resolveBackSlash(String input) { | ||||
| StringBuilder b = new StringBuilder(); | StringBuilder b = new StringBuilder(); | ||||
| boolean backSlashSeen = false; | 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 (!backSlashSeen) { | ||||
| if (c == '\\') { | if (c == '\\') { | ||||
| backSlashSeen = true; | backSlashSeen = true; | ||||
| @@ -521,10 +521,9 @@ public class TarOutputStream extends FilterOutputStream { | |||||
| } | } | ||||
| private String stripTo7Bits(String name) { | 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 | if (stripped != 0) { // would be read as Trailing null | ||||
| result.append(stripped); | result.append(stripped); | ||||
| } | } | ||||