From 5f20b99140fb4ec958a6d540b9df7b3c08312b40 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Thu, 3 Feb 2011 21:00:00 +0000 Subject: [PATCH] microoptimizations. PR 50716 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1066963 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/IntrospectionHelper.java | 9 ++++++--- src/main/org/apache/tools/ant/Main.java | 11 ++++++---- src/main/org/apache/tools/ant/Target.java | 3 ++- .../org/apache/tools/ant/UnknownElement.java | 7 ++++--- .../tools/ant/taskdefs/AbstractCvsTask.java | 3 ++- .../org/apache/tools/ant/taskdefs/Copy.java | 3 ++- .../org/apache/tools/ant/taskdefs/Delete.java | 3 ++- .../apache/tools/ant/taskdefs/ExecuteOn.java | 3 ++- .../org/apache/tools/ant/taskdefs/Expand.java | 3 ++- .../org/apache/tools/ant/taskdefs/Java.java | 3 ++- .../apache/tools/ant/taskdefs/Javadoc.java | 3 ++- .../apache/tools/ant/taskdefs/MacroDef.java | 11 ++++++---- .../apache/tools/ant/taskdefs/Replace.java | 15 +++++++++----- .../org/apache/tools/ant/taskdefs/SubAnt.java | 3 ++- .../org/apache/tools/ant/taskdefs/Touch.java | 3 ++- .../org/apache/tools/ant/taskdefs/Zip.java | 9 ++++++--- .../ant/taskdefs/cvslib/ChangeLogTask.java | 3 ++- .../tools/ant/taskdefs/email/MimeMailer.java | 5 +++-- .../tools/ant/taskdefs/optional/Cab.java | 5 +++-- .../ant/taskdefs/optional/EchoProperties.java | 3 ++- .../tools/ant/taskdefs/optional/NetRexxC.java | 3 ++- .../ant/taskdefs/optional/TraXLiaison.java | 6 ++++-- .../taskdefs/optional/XMLValidateTask.java | 9 ++++++--- .../taskdefs/optional/depend/ClassFile.java | 3 ++- .../depend/constantpool/ConstantPool.java | 20 ++++++++++++------- .../ant/taskdefs/optional/i18n/Translate.java | 3 ++- .../ant/taskdefs/optional/image/Image.java | 6 ++++-- .../ant/taskdefs/optional/jsp/WLJspc.java | 3 ++- .../optional/junit/FailureRecorder.java | 3 ++- .../optional/junit/JUnitTestRunner.java | 18 +++++++++++------ .../tools/ant/taskdefs/optional/net/FTP.java | 11 ++++++---- .../optional/net/FTPTaskMirrorImpl.java | 11 ++++++---- .../ant/taskdefs/optional/perforce/P4Add.java | 3 ++- .../taskdefs/optional/perforce/P4Fstat.java | 6 ++++-- .../taskdefs/optional/perforce/P4Submit.java | 3 ++- .../optional/ssh/ScpFromMessageBySftp.java | 3 ++- .../ant/taskdefs/optional/unix/Symlink.java | 6 ++++-- .../apache/tools/ant/types/Commandline.java | 3 ++- .../apache/tools/ant/types/Description.java | 6 ++++-- .../org/apache/tools/ant/types/FilterSet.java | 3 ++- .../tools/ant/types/optional/image/Arc.java | 3 ++- .../tools/ant/types/optional/image/Draw.java | 3 ++- .../ant/types/optional/image/Ellipse.java | 3 ++- .../ant/types/optional/image/Rectangle.java | 3 ++- .../ant/types/optional/image/Rotate.java | 6 ++++-- .../tools/ant/types/optional/image/Scale.java | 6 ++++-- .../org/apache/tools/ant/util/FileUtils.java | 3 ++- .../apache/tools/ant/util/IdentityStack.java | 3 ++- .../ant/util/LayoutPreservingProperties.java | 3 ++- .../org/apache/tools/mail/MailMessage.java | 3 ++- 50 files changed, 179 insertions(+), 94 deletions(-) diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java index 9cb89c9a0..dd0e123af 100644 --- a/src/main/org/apache/tools/ant/IntrospectionHelper.java +++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java @@ -1585,7 +1585,8 @@ public final class IntrospectionHelper { */ private void insertAddTypeMethod(Method method) { Class argClass = method.getParameterTypes()[0]; - for (int c = 0; c < addTypeMethods.size(); ++c) { + final int size = addTypeMethods.size(); + for (int c = 0; c < size; ++c) { Method current = (Method) addTypeMethods.get(c); if (current.getParameterTypes()[0].equals(argClass)) { if (method.getName().equals("addConfigured")) { @@ -1616,7 +1617,8 @@ public final class IntrospectionHelper { Class matchedClass = null; Method matchedMethod = null; - for (int i = 0; i < methods.size(); ++i) { + final int size = methods.size(); + for (int i = 0; i < size; ++i) { Method method = (Method) methods.get(i); Class methodClass = method.getParameterTypes()[0]; if (methodClass.isAssignableFrom(paramClass)) { @@ -1663,7 +1665,8 @@ public final class IntrospectionHelper { return null; } synchronized (definitions) { - for (int i = 0; i < definitions.size(); ++i) { + final int size = definitions.size(); + for (int i = 0; i < size; ++i) { AntTypeDefinition d = (AntTypeDefinition) definitions.get(i); Class exposedClass = d.getExposedClass(helper.getProject()); if (exposedClass == null) { diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java index 80f44c61f..c03e69526 100644 --- a/src/main/org/apache/tools/ant/Main.java +++ b/src/main/org/apache/tools/ant/Main.java @@ -859,7 +859,8 @@ public class Main implements AntMain { // Add the default listener project.addBuildListener(createLogger()); - for (int i = 0; i < listeners.size(); i++) { + final int count = listeners.size(); + for (int i = 0; i < count; i++) { String className = (String) listeners.elementAt(i); BuildListener listener = (BuildListener) ClasspathUtils.newInstance(className, @@ -1152,8 +1153,9 @@ public class Main implements AntMain { * @return the correct place in the list for the given name */ private static int findTargetPosition(Vector names, String name) { - int res = names.size(); - for (int i = 0; i < names.size() && res == names.size(); i++) { + final int size = names.size(); + int res = size; + for (int i = 0; i < size && res == size; i++) { if (name.compareTo((String) names.elementAt(i)) < 0) { res = i; } @@ -1197,7 +1199,8 @@ public class Main implements AntMain { } StringBuffer msg = new StringBuffer(); msg.append(heading + lSep + lSep); - for (int i = 0; i < names.size(); i++) { + final int size = names.size(); + for (int i = 0; i < size; i++) { msg.append(" "); msg.append(names.elementAt(i)); if (descriptions != null) { diff --git a/src/main/org/apache/tools/ant/Target.java b/src/main/org/apache/tools/ant/Target.java index 7fb1abf7d..38ca7ad8f 100644 --- a/src/main/org/apache/tools/ant/Target.java +++ b/src/main/org/apache/tools/ant/Target.java @@ -383,7 +383,8 @@ public class Target implements TaskContainer { try { // use index-based approach to avoid ConcurrentModificationExceptions; // also account for growing target children - for (int i = 0; i < children.size(); i++) { + final int size = children.size(); + for (int i = 0; i < size; i++) { Object o = children.get(i); if (o instanceof Task) { Task task = (Task) o; diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java index 5eb781105..bd525368c 100644 --- a/src/main/org/apache/tools/ant/UnknownElement.java +++ b/src/main/org/apache/tools/ant/UnknownElement.java @@ -622,16 +622,17 @@ public class UnknownElement extends Task { return false; } // Are the sub elements the same ? - if (children == null || children.size() == 0) { + final int childrenSize = children == null ? 0 : children.size(); + if (childrenSize == 0) { return other.children == null || other.children.size() == 0; } if (other.children == null) { return false; } - if (children.size() != other.children.size()) { + if (childrenSize != other.children.size()) { return false; } - for (int i = 0; i < children.size(); ++i) { + for (int i = 0; i < childrenSize; ++i) { UnknownElement child = (UnknownElement) children.get(i); if (!child.similar(other.children.get(i))) { return false; diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java index 518a03560..dd4025dd8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java @@ -404,7 +404,8 @@ public abstract class AbstractCvsTask extends Task { } try { - for (int i = 0; i < vecCommandlines.size(); i++) { + final int size = vecCommandlines.size(); + for (int i = 0; i < size; i++) { this.runCommand((Commandline) vecCommandlines.elementAt(i)); } } finally { diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java index cbb4728b8..d55bf2386 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copy.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java @@ -464,7 +464,8 @@ public class Copy extends Task { HashMap dirsByBasedir = new HashMap(); HashSet baseDirs = new HashSet(); ArrayList nonFileResources = new ArrayList(); - for (int i = 0; i < rcs.size(); i++) { + final int size = rcs.size(); + for (int i = 0; i < size; i++) { ResourceCollection rc = (ResourceCollection) rcs.elementAt(i); // Step (1) - beware of the ZipFileSet diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java index dbb690c68..0f881fdf2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Delete.java +++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java @@ -593,7 +593,8 @@ public class Delete extends MatchingTask { filesets.add(implicit); } - for (int i = 0, size = filesets.size(); i < size; i++) { + final int size = filesets.size(); + for (int i = 0; i < size; i++) { FileSet fs = (FileSet) filesets.get(i); if (fs.getProject() == null) { log("Deleting fileset with no project specified;" diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java index b8f0c24f9..ca4f2c67f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -352,7 +352,8 @@ public class ExecuteOn extends ExecTask { try { Vector fileNames = new Vector(); Vector baseDirs = new Vector(); - for (int i = 0; i < filesets.size(); i++) { + final int size = filesets.size(); + for (int i = 0; i < size; i++) { String currentType = type; AbstractFileSet fs = (AbstractFileSet) filesets.elementAt(i); if (fs instanceof DirSet) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java index 741ad9df7..696cbbf08 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java @@ -258,7 +258,8 @@ public class Expand extends Task { boolean included = false; Set includePatterns = new HashSet(); Set excludePatterns = new HashSet(); - for (int v = 0, size = patternsets.size(); v < size; v++) { + final int size = patternsets.size(); + for (int v = 0; v < size; v++) { PatternSet p = (PatternSet) patternsets.elementAt(v); String[] incls = p.getIncludePatterns(getProject()); if (incls == null || incls.length == 0) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java index 19f4e32a6..e1553e8b0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Java.java +++ b/src/main/org/apache/tools/ant/taskdefs/Java.java @@ -899,7 +899,8 @@ public class Java extends Task { protected void run(String classname, Vector args) throws BuildException { CommandlineJava cmdj = new CommandlineJava(); cmdj.setClassname(classname); - for (int i = 0; i < args.size(); i++) { + final int size = args.size(); + for (int i = 0; i < size; i++) { cmdj.createArgument().setValue((String) args.elementAt(i)); } run(cmdj); diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index 0d1f526cb..8115c7bd9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -1509,7 +1509,8 @@ public class Javadoc extends Task { */ public String getPackages() { StringBuffer p = new StringBuffer(); - for (int i = 0; i < packages.size(); i++) { + final int size = packages.size(); + for (int i = 0; i < size; i++) { if (i > 0) { p.append(":"); } diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java index 6054f2072..55bdca654 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java +++ b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java @@ -161,10 +161,11 @@ public class MacroDef extends AntlibDefinition { * @return true if they are similar, false otherwise */ public boolean similar(NestedSequential other) { - if (nested.size() != other.nested.size()) { + final int size = nested.size(); + if (size != other.nested.size()) { return false; } - for (int i = 0; i < nested.size(); ++i) { + for (int i = 0; i < size; ++i) { UnknownElement me = (UnknownElement) nested.get(i); UnknownElement o = (UnknownElement) other.nested.get(i); if (!me.similar(o)) { @@ -185,7 +186,8 @@ public class MacroDef extends AntlibDefinition { ret.setNamespace(""); ret.setQName("sequential"); new RuntimeConfigurable(ret, "sequential"); - for (int i = 0; i < nestedSequential.getNested().size(); ++i) { + final int size = nestedSequential.getNested().size(); + for (int i = 0; i < size; ++i) { UnknownElement e = (UnknownElement) nestedSequential.getNested().get(i); ret.addChild(e); @@ -259,7 +261,8 @@ public class MacroDef extends AntlibDefinition { "the name \"" + attribute.getName() + "\" has already been used by the text element"); } - for (int i = 0; i < attributes.size(); ++i) { + final int size = attributes.size(); + for (int i = 0; i < size; ++i) { Attribute att = (Attribute) attributes.get(i); if (att.getName().equals(attribute.getName())) { throw new BuildException( diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java index fac1b4018..40d764300 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java @@ -607,7 +607,8 @@ public class Replace extends MatchingTask { */ public void validateReplacefilters() throws BuildException { - for (int i = 0; i < replacefilters.size(); i++) { + final int size = replacefilters.size(); + for (int i = 0; i < size; i++) { Replacefilter element = (Replacefilter) replacefilters.get(i); element.validate(); @@ -727,7 +728,8 @@ public class Replace extends MatchingTask { * Flushes all filters. */ private void flushFilterChain() { - for (int i = 0; i < replacefilters.size(); i++) { + final int size = replacefilters.size(); + for (int i = 0; i < size; i++) { Replacefilter filter = (Replacefilter) replacefilters.get(i); filter.flush(); } @@ -738,7 +740,8 @@ public class Replace extends MatchingTask { * @return true if the filter chain produced new output. */ private boolean processFilterChain() { - for (int i = 0; i < replacefilters.size(); i++) { + final int size = replacefilters.size(); + for (int i = 0; i < size; i++) { Replacefilter filter = (Replacefilter) replacefilters.get(i); if (!filter.process()) { return false; @@ -755,7 +758,8 @@ public class Replace extends MatchingTask { */ private StringBuffer buildFilterChain(StringBuffer inputBuffer) { StringBuffer buf = inputBuffer; - for (int i = 0; i < replacefilters.size(); i++) { + final int size = replacefilters.size(); + for (int i = 0; i < size; i++) { Replacefilter filter = (Replacefilter) replacefilters.get(i); filter.setInputBuffer(buf); buf = filter.getOutputBuffer(); @@ -768,7 +772,8 @@ public class Replace extends MatchingTask { * @param filename String. */ private void logFilterChain(String filename) { - for (int i = 0; i < replacefilters.size(); i++) { + final int size = replacefilters.size(); + for (int i = 0; i < size; i++) { Replacefilter filter = (Replacefilter) replacefilters.get(i); log("Replacing in " + filename + ": " + filter.getToken() + " --> " + filter.getReplaceValue(), Project.MSG_VERBOSE); diff --git a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java index 56ebedab0..b8c5b1660 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java +++ b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java @@ -293,7 +293,8 @@ public class SubAnt extends Task { ant = createAntTask(directory); String antfilename = file.getAbsolutePath(); ant.setAntfile(antfilename); - for (int i = 0; i < targets.size(); i++) { + final int size = targets.size(); + for (int i = 0; i < size; i++) { TargetElement targetElement = (TargetElement) targets.get(i); ant.addConfiguredTarget(targetElement); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Touch.java b/src/main/org/apache/tools/ant/taskdefs/Touch.java index a4f344ef8..36cc3365f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Touch.java +++ b/src/main/org/apache/tools/ant/taskdefs/Touch.java @@ -309,7 +309,8 @@ public class Touch extends Task { // deal with filesets in a special way since the task // originally also used the directories and Union won't return // them. - for (int i = 0; i < filesets.size(); i++) { + final int size = filesets.size(); + for (int i = 0; i < size; i++) { FileSet fs = (FileSet) filesets.elementAt(i); DirectoryScanner ds = fs.getDirectoryScanner(getProject()); File fromDir = fs.getDir(getProject()); diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index 69e2df6c2..53b809eea 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -602,7 +602,8 @@ public class Zip extends MatchingTask { fs.setDir(baseDir); vfss.addElement(fs); } - for (int i = 0; i < resources.size(); i++) { + final int size = resources.size(); + for (int i = 0; i < size; i++) { ResourceCollection rc = (ResourceCollection) resources.elementAt(i); vfss.addElement(rc); } @@ -672,7 +673,8 @@ public class Zip extends MatchingTask { oldFiles.setSrc(renamedFile); oldFiles.setDefaultexcludes(false); - for (int i = 0; i < addedFiles.size(); i++) { + final int addSize = addedFiles.size(); + for (int i = 0; i < addSize; i++) { PatternSet.NameEntry ne = oldFiles.createExclude(); ne.setName((String) addedFiles.elementAt(i)); } @@ -823,7 +825,8 @@ public class Zip extends MatchingTask { /** Process groupfilesets */ private void processGroupFilesets() { // Add the files found in groupfileset to fileset - for (int i = 0; i < groupfilesets.size(); i++) { + final int size = groupfilesets.size(); + for (int i = 0; i < size; i++) { logWhenWriting("Processing groupfileset ", Project.MSG_VERBOSE); FileSet fs = (FileSet) groupfilesets.elementAt(i); diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java index 83cd03081..a5495df6d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java @@ -241,7 +241,8 @@ public class ChangeLogTask extends AbstractCvsTask { loadUserlist(userList); - for (int i = 0, size = cvsUsers.size(); i < size; i++) { + final int size = cvsUsers.size(); + for (int i = 0; i < size; i++) { final CvsUser user = (CvsUser) cvsUsers.get(i); user.validate(); userList.put(user.getUserID(), user.getDisplayname()); diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java index 965d898c5..85a022e4a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java @@ -289,9 +289,10 @@ public class MimeMailer extends Mailer { private static InternetAddress[] internetAddresses(Vector list) throws AddressException, UnsupportedEncodingException { - InternetAddress[] addrs = new InternetAddress[list.size()]; + final int size = list.size(); + InternetAddress[] addrs = new InternetAddress[size]; - for (int i = 0; i < list.size(); ++i) { + for (int i = 0; i < size; ++i) { EmailAddress addr = (EmailAddress) list.elementAt(i); String name = addr.getName(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java index a0b540616..beb25b9e9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -155,7 +155,8 @@ public class Cab extends MatchingTask { */ protected boolean isUpToDate(Vector files) { boolean upToDate = true; - for (int i = 0; i < files.size() && upToDate; i++) { + final int size = files.size(); + for (int i = 0; i < size && upToDate; i++) { String file = files.elementAt(i).toString(); if (FILE_UTILS.resolveFile(baseDir, file).lastModified() > cabFile.lastModified()) { @@ -183,7 +184,7 @@ public class Cab extends MatchingTask { try { writer = new BufferedWriter(new FileWriter(listFile)); - int size = files.size(); + final int size = files.size(); for (int i = 0; i < size; i++) { writer.write('\"' + files.elementAt(i).toString() + '\"'); writer.newLine(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java index dd21aa80b..27e3b9299 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java @@ -407,7 +407,8 @@ public class EchoProperties extends Task { return result; } }; - for (int i = 0; i < keyList.size(); i++) { + final int size = keyList.size(); + for (int i = 0; i < size; i++) { String name = keyList.get(i).toString(); String value = allProps.get(name).toString(); props.setProperty(name, value); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java index ab7209469..5bd74870c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java @@ -846,7 +846,8 @@ public class NetRexxC extends MatchingTask { String eol = System.getProperty("line.separator"); StringBuffer niceSourceList = new StringBuffer("Files to be compiled:" + eol); - for (int i = 0; i < compileList.size(); i++) { + final int size = compileList.size(); + for (int i = 0; i < size; i++) { niceSourceList.append(" "); niceSourceList.append(compileList.elementAt(i).toString()); niceSourceList.append(eol); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java index 48f3ecd2e..9cacd71df 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java @@ -323,7 +323,8 @@ public class TraXLiaison implements XSLTLiaison3, ErrorListener, XSLTLoggerAware if (uriResolver != null) { transformer.setURIResolver(uriResolver); } - for (int i = 0; i < outputProperties.size(); i++) { + final int size = outputProperties.size(); + for (int i = 0; i < size; i++) { final String[] pair = (String[]) outputProperties.elementAt(i); transformer.setOutputProperty(pair[0], pair[1]); } @@ -419,7 +420,8 @@ public class TraXLiaison implements XSLTLiaison3, ErrorListener, XSLTLoggerAware tfactory.setErrorListener(this); // specific attributes for the transformer - for (int i = 0; i < attributes.size(); i++) { + final int size = attributes.size(); + for (int i = 0; i < size; i++) { final Object[] pair = (Object[]) attributes.elementAt(i); tfactory.setAttribute((String) pair[0], pair[1]); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java index f9ef0632d..24798f4a5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java @@ -310,7 +310,8 @@ public class XMLValidateTask extends Task { } } - for (int i = 0; i < filesets.size(); i++) { + final int size = filesets.size(); + for (int i = 0; i < size; i++) { FileSet fs = (FileSet) filesets.elementAt(i); DirectoryScanner ds = fs.getDirectoryScanner(getProject()); @@ -355,13 +356,15 @@ public class XMLValidateTask extends Task { setFeature(XmlConstants.FEATURE_VALIDATION, true); } // set the feature from the attribute list - for (int i = 0; i < attributeList.size(); i++) { + final int attSize = attributeList.size(); + for (int i = 0; i < attSize; i++) { Attribute feature = (Attribute) attributeList.elementAt(i); setFeature(feature.getName(), feature.getValue()); } // Sets properties - for (int i = 0; i < propertyList.size(); i++) { + final int propSize = propertyList.size(); + for (int i = 0; i < propSize; i++) { final Property prop = (Property) propertyList.elementAt(i); setProperty(prop.getName(), prop.getValue()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java index 1f0c2d8f8..1435d63da 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java @@ -90,7 +90,8 @@ public class ClassFile { Vector classRefs = new Vector(); - for (int i = 0; i < constantPool.size(); ++i) { + final int size = constantPool.size(); + for (int i = 0; i < size; ++i) { ConstantPoolEntry entry = constantPool.getEntry(i); if (entry != null diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java index 2ce24db23..70168a098 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java @@ -165,7 +165,8 @@ public class ConstantPool { public int getClassEntry(String className) { int index = -1; - for (int i = 0; i < entries.size() && index == -1; ++i) { + final int size = entries.size(); + for (int i = 0; i < size && index == -1; ++i) { Object element = entries.elementAt(i); if (element instanceof ClassCPInfo) { @@ -191,7 +192,8 @@ public class ConstantPool { public int getConstantEntry(Object constantValue) { int index = -1; - for (int i = 0; i < entries.size() && index == -1; ++i) { + final int size = entries.size(); + for (int i = 0; i < size && index == -1; ++i) { Object element = entries.elementAt(i); if (element instanceof ConstantCPInfo) { @@ -221,7 +223,8 @@ public class ConstantPool { String methodType) { int index = -1; - for (int i = 0; i < entries.size() && index == -1; ++i) { + final int size = entries.size(); + for (int i = 0; i < size && index == -1; ++i) { Object element = entries.elementAt(i); if (element instanceof MethodRefCPInfo) { @@ -255,7 +258,8 @@ public class ConstantPool { String interfaceMethodType) { int index = -1; - for (int i = 0; i < entries.size() && index == -1; ++i) { + final int size = entries.size(); + for (int i = 0; i < size && index == -1; ++i) { Object element = entries.elementAt(i); if (element instanceof InterfaceMethodRefCPInfo) { @@ -291,7 +295,8 @@ public class ConstantPool { String fieldType) { int index = -1; - for (int i = 0; i < entries.size() && index == -1; ++i) { + final int size = entries.size(); + for (int i = 0; i < size && index == -1; ++i) { Object element = entries.elementAt(i); if (element instanceof FieldRefCPInfo) { @@ -320,7 +325,8 @@ public class ConstantPool { public int getNameAndTypeEntry(String name, String type) { int index = -1; - for (int i = 0; i < entries.size() && index == -1; ++i) { + final int size = entries.size(); + for (int i = 0; i < size && index == -1; ++i) { Object element = entries.elementAt(i); if (element instanceof NameAndTypeCPInfo) { @@ -344,7 +350,7 @@ public class ConstantPool { */ public String toString() { StringBuffer sb = new StringBuffer("\n"); - int size = entries.size(); + final int size = entries.size(); for (int i = 0; i < size; ++i) { sb.append("[" + i + "] = " + getEntry(i) + "\n"); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java index cf6fa5f1c..34f7a37a9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java @@ -495,7 +495,8 @@ public class Translate extends MatchingTask { */ private void translate() throws BuildException { int filesProcessed = 0; - for (int i = 0; i < filesets.size(); i++) { + final int size = filesets.size(); + for (int i = 0; i < size; i++) { FileSet fs = (FileSet) filesets.elementAt(i); DirectoryScanner ds = fs.getDirectoryScanner(getProject()); String[] srcFiles = ds.getIncludedFiles(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java index 4b05c5b11..1b05751da 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java @@ -290,7 +290,8 @@ public class Image extends MatchingTask { try { input = new FileSeekableStream(file); image = JAI.create("stream", input); - for (int i = 0; i < instructions.size(); i++) { + final int size = instructions.size(); + for (int i = 0; i < size; i++) { Object instr = instructions.elementAt(i); if (instr instanceof TransformOperation) { image = ((TransformOperation) instr) @@ -374,7 +375,8 @@ public class Image extends MatchingTask { writeCount += processDir(srcDir, files, dest, mapper); } // deal with the filesets - for (int i = 0; i < filesets.size(); i++) { + final int size = filesets.size(); + for (int i = 0; i < size; i++) { final FileSet fs = (FileSet) filesets.elementAt(i); final DirectoryScanner ds = fs.getDirectoryScanner(getProject()); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java index d4b65880b..e0faf8ca3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java @@ -167,7 +167,8 @@ public class WLJspc extends MatchingTask { this.scanDir(files); log("Compiling " + filesToDo.size() + " JSP files"); - for (int i = 0; i < filesToDo.size(); i++) { + final int size = filesToDo.size(); + for (int i = 0; i < size; i++) { //XXX // All this to get package according to weblogic standards // Can be written better... this is too hacky! 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 f51499e90..02fcac282 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 @@ -151,7 +151,8 @@ public class FailureRecorder extends ProjectComponent implements JUnitResultForm // check if already registered boolean alreadyRegistered = false; Vector allListeners = project.getBuildListeners(); - for (int i = 0; i < allListeners.size(); i++) { + final int size = allListeners.size(); + for (int i = 0; i < size; i++) { Object listener = allListeners.get(i); if (listener instanceof FailureRecorder) { alreadyRegistered = true; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index efb49a15e..86f80dc4e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java @@ -352,7 +352,8 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR public void run() { res = new TestResult(); res.addListener(wrapListener(this)); - for (int i = 0; i < formatters.size(); i++) { + final int size = formatters.size(); + for (int i = 0; i < size; i++) { res.addListener(wrapListener((TestListener) formatters.elementAt(i))); } @@ -506,7 +507,8 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR fireStartTestSuite(); startTestSuiteSuccess = true; if (exception != null) { // had an exception constructing suite - for (int i = 0; i < formatters.size(); i++) { + final int formatterSize = formatters.size(); + for (int i = 0; i < formatterSize; i++) { ((TestListener) formatters.elementAt(i)) .addError(null, exception); } @@ -705,7 +707,8 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR } private void sendOutAndErr(String out, String err) { - for (int i = 0; i < formatters.size(); i++) { + final int size = formatters.size(); + for (int i = 0; i < size; i++) { JUnitResultFormatter formatter = ((JUnitResultFormatter) formatters.elementAt(i)); @@ -715,14 +718,16 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR } private void fireStartTestSuite() { - for (int i = 0; i < formatters.size(); i++) { + final int size = formatters.size(); + for (int i = 0; i < size; i++) { ((JUnitResultFormatter) formatters.elementAt(i)) .startTestSuite(junitTest); } } private void fireEndTestSuite() { - for (int i = 0; i < formatters.size(); i++) { + final int size = formatters.size(); + for (int i = 0; i < size; i++) { ((JUnitResultFormatter) formatters.elementAt(i)) .endTestSuite(junitTest); } @@ -946,7 +951,8 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR registerTestCase(JUnitVersionHelper.getTestCaseName(arg0)); } }); - for (int i = 0; i < fromCmdLine.size(); i++) { + final int size = fromCmdLine.size(); + for (int i = 0; i < size; i++) { FormatterElement fe = (FormatterElement) fromCmdLine.elementAt(i); if (multipleTests && fe.getUseFile()) { File destFile = 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 405bfa539..2f1b44dda 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 @@ -820,7 +820,8 @@ public class FTP extends Task implements FTPTaskConfig { throw new BuildException("could not change working dir to " + parent.curpwd); } - for (int fcount = 0; fcount < pathElements.size() - 1; fcount++) { + final int size = pathElements.size(); + for (int fcount = 0; fcount < size - 1; fcount++) { String currentPathElement = (String) pathElements.elementAt(fcount); try { boolean result = this.client.changeWorkingDirectory(currentPathElement); @@ -843,7 +844,7 @@ public class FTP extends Task implements FTPTaskConfig { } } - String lastpathelement = (String) pathElements.elementAt(pathElements.size() - 1); + String lastpathelement = (String) pathElements.elementAt(size - 1); FTPFile [] theFiles = listFiles(this.curpwd); this.ftpFile = getFile(theFiles, lastpathelement); } @@ -946,7 +947,8 @@ public class FTP extends Task implements FTPTaskConfig { Vector pathElements = SelectorUtils.tokenizePath(getAbsolutePath(), remoteFileSep); Vector pathElements2 = SelectorUtils.tokenizePath(currentPath, remoteFileSep); String relPath = currentRelativePath; - for (int pcount = pathElements2.size(); pcount < pathElements.size(); pcount++) { + final int size = pathElements.size(); + for (int pcount = pathElements2.size(); pcount < size; pcount++) { String currentElement = (String) pathElements.elementAt(pcount); FTPFile[] theFiles = listFiles(currentPath); FTPFile theFile = null; @@ -1838,7 +1840,8 @@ public class FTP extends Task implements FTPTaskConfig { throw new BuildException("at least one fileset must be specified."); } else { // get files from filesets - for (int i = 0; i < filesets.size(); i++) { + final int size = filesets.size(); + for (int i = 0; i < size; i++) { FileSet fs = (FileSet) filesets.elementAt(i); if (fs != null) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java index 802c24290..3c250d26a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java @@ -722,7 +722,8 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror { throw new BuildException("could not change working dir to " + parent.curpwd); } - for (int fcount = 0; fcount < pathElements.size() - 1; fcount++) { + final int size = pathElements.size(); + for (int fcount = 0; fcount < size - 1; fcount++) { String currentPathElement = (String) pathElements.elementAt(fcount); try { boolean result = this.client.changeWorkingDirectory(currentPathElement); @@ -745,7 +746,7 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror { } } - String lastpathelement = (String) pathElements.elementAt(pathElements.size() - 1); + String lastpathelement = (String) pathElements.elementAt(size - 1); FTPFile [] theFiles = listFiles(this.curpwd); this.ftpFile = getFile(theFiles, lastpathelement); } @@ -850,7 +851,8 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror { Vector pathElements2 = SelectorUtils.tokenizePath(currentPath, task.getSeparator()); String relPath = currentRelativePath; - for (int pcount = pathElements2.size(); pcount < pathElements.size(); pcount++) { + final int size = pathElements.size(); + for (int pcount = pathElements2.size(); pcount < size; pcount++) { String currentElement = (String) pathElements.elementAt(pcount); FTPFile[] theFiles = listFiles(currentPath); FTPFile theFile = null; @@ -1227,7 +1229,8 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror { throw new BuildException("at least one fileset must be specified."); } else { // get files from filesets - for (int i = 0; i < task.getFilesets().size(); i++) { + final int size = task.getFilesets().size(); + for (int i = 0; i < size; i++) { FileSet fs = (FileSet) task.getFilesets().elementAt(i); if (fs != null) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java index 3b2de82d6..24a458c9e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java @@ -112,7 +112,8 @@ public class P4Add extends P4Base { StringBuffer filelist = new StringBuffer(); - for (int i = 0; i < filesets.size(); i++) { + final int size = filesets.size(); + for (int i = 0; i < size; i++) { FileSet fs = (FileSet) filesets.elementAt(i); DirectoryScanner ds = fs.getDirectoryScanner(getProject()); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java index e7fd0580f..7ef4d48d1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java @@ -129,7 +129,8 @@ public class P4Fstat extends P4Base { filelist = new StringBuffer(); - for (int i = 0; i < filesets.size(); i++) { + final int size = filesets.size(); + for (int i = 0; i < size; i++) { FileSet fs = (FileSet) filesets.elementAt(i); DirectoryScanner ds = fs.getDirectoryScanner(getProject()); @@ -181,7 +182,8 @@ public class P4Fstat extends P4Base { private void printRes(ArrayList ar, String header) { log(header, Project.MSG_INFO); - for (int i = 0; i < ar.size(); i++) { + final int size = ar.size(); + for (int i = 0; i < size; i++) { log((String) ar.get(i), Project.MSG_INFO); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java index 763883c50..9409b19be 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java @@ -119,7 +119,8 @@ public class P4Submit extends P4Base { Vector myarray = new Vector(); util.split(myarray, line); boolean found = false; - for (int counter = 0; counter < myarray.size(); counter++) { + final int size = myarray.size(); + for (int counter = 0; counter < size; counter++) { if (found) { String chnum = (String) myarray.elementAt(counter + 1); int changenumber = Integer.parseInt(chnum); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java index c30696c76..cd733d13d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java @@ -144,7 +144,8 @@ public class ScpFromMessageBySftp extends ScpFromMessage { localFile.mkdirs(); } java.util.Vector files = channel.ls(remoteFile); - for (int i = 0; i < files.size(); i++) { + final int size = files.size(); + for (int i = 0; i < size; i++) { ChannelSftp.LsEntry le = (ChannelSftp.LsEntry) files.elementAt(i); String name = le.getFilename(); if (le.getAttrs().isDir()) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java index 181cfbd5d..3b6fcd3b1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java @@ -509,7 +509,8 @@ public class Symlink extends DispatchTask { */ private HashSet findLinks(Vector v) { HashSet result = new HashSet(); - for (int i = 0; i < v.size(); i++) { + final int size = v.size(); + for (int i = 0; i < size; i++) { FileSet fs = (FileSet) v.get(i); DirectoryScanner ds = fs.getDirectoryScanner(getProject()); String[][] fnd = new String[][] @@ -547,7 +548,8 @@ public class Symlink extends DispatchTask { private Properties loadLinks(Vector v) { Properties finalList = new Properties(); // loop through the supplied file sets: - for (int i = 0; i < v.size(); i++) { + final int size = v.size(); + for (int i = 0; i < size; i++) { FileSet fs = (FileSet) v.elementAt(i); DirectoryScanner ds = new DirectoryScanner(); fs.setupDirectoryScanner(ds, getProject()); diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java index 0a800ae30..ad68f1c57 100644 --- a/src/main/org/apache/tools/ant/types/Commandline.java +++ b/src/main/org/apache/tools/ant/types/Commandline.java @@ -386,7 +386,8 @@ public class Commandline implements Cloneable { * @since Ant 1.6 */ public void addArgumentsToList(ListIterator list) { - for (int i = 0; i < arguments.size(); i++) { + final int size = arguments.size(); + for (int i = 0; i < size; i++) { Argument arg = (Argument) arguments.elementAt(i); String[] s = arg.getParts(); if (s != null) { diff --git a/src/main/org/apache/tools/ant/types/Description.java b/src/main/org/apache/tools/ant/types/Description.java index cb0004ff8..6f8fb4891 100644 --- a/src/main/org/apache/tools/ant/types/Description.java +++ b/src/main/org/apache/tools/ant/types/Description.java @@ -78,7 +78,8 @@ public class Description extends DataType { return null; } StringBuffer description = new StringBuffer(); - for (int i = 0; i < targets.size(); i++) { + final int size = targets.size(); + for (int i = 0; i < size; i++) { Target t = (Target) targets.elementAt(i); concatDescriptions(project, t, description); } @@ -94,7 +95,8 @@ public class Description extends DataType { if (tasks == null) { return; } - for (int i = 0; i < tasks.size(); i++) { + final int size = tasks.size(); + for (int i = 0; i < size; i++) { Task task = (Task) tasks.elementAt(i); if (!(task instanceof UnknownElement)) { continue; diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java index f4886584a..a0786a4a7 100644 --- a/src/main/org/apache/tools/ant/types/FilterSet.java +++ b/src/main/org/apache/tools/ant/types/FilterSet.java @@ -223,7 +223,8 @@ public class FilterSet extends DataType implements Cloneable { //silly hack to avoid stack overflow... if (!readingFiles) { readingFiles = true; - for (int i = 0, sz = filtersFiles.size(); i < sz; i++) { + final int size = filtersFiles.size(); + for (int i = 0, sz = size; i < sz; i++) { readFiltersFromFile((File) filtersFiles.get(i)); } filtersFiles.clear(); diff --git a/src/main/org/apache/tools/ant/types/optional/image/Arc.java b/src/main/org/apache/tools/ant/types/optional/image/Arc.java index 4ed375189..fcbb325aa 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Arc.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Arc.java @@ -104,7 +104,8 @@ public class Arc extends BasicShape implements DrawOperation { } - for (int i = 0; i < instructions.size(); i++) { + final int size = instructions.size(); + for (int i = 0; i < size; i++) { ImageOperation instr = ((ImageOperation) instructions.elementAt(i)); if (instr instanceof DrawOperation) { PlanarImage img = ((DrawOperation) instr).executeDrawOperation(); diff --git a/src/main/org/apache/tools/ant/types/optional/image/Draw.java b/src/main/org/apache/tools/ant/types/optional/image/Draw.java index b46ae41dd..ab7533bc4 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Draw.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Draw.java @@ -78,7 +78,8 @@ public class Draw extends TransformOperation { BufferedImage bi = image.getAsBufferedImage(); Graphics2D graphics = (Graphics2D) bi.getGraphics(); - for (int i = 0; i < instructions.size(); i++) { + final int size = instructions.size(); + for (int i = 0; i < size; i++) { ImageOperation instr = ((ImageOperation) instructions.elementAt(i)); if (instr instanceof DrawOperation) { PlanarImage op = ((DrawOperation) instr).executeDrawOperation(); diff --git a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java index f4701e1f3..9fc5e29f9 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java @@ -68,7 +68,8 @@ public class Ellipse extends BasicShape implements DrawOperation { } - for (int i = 0; i < instructions.size(); i++) { + final int size = instructions.size(); + for (int i = 0; i < size; i++) { ImageOperation instr = ((ImageOperation) instructions.elementAt(i)); if (instr instanceof DrawOperation) { PlanarImage img = ((DrawOperation) instr).executeDrawOperation(); diff --git a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java index f3204e760..aa03be6b3 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java @@ -99,7 +99,8 @@ public class Rectangle extends BasicShape implements DrawOperation { } - for (int i = 0; i < instructions.size(); i++) { + final int size = instructions.size(); + for (int i = 0; i < size; i++) { ImageOperation instr = ((ImageOperation) instructions.elementAt(i)); if (instr instanceof DrawOperation) { PlanarImage img = ((DrawOperation) instr).executeDrawOperation(); diff --git a/src/main/org/apache/tools/ant/types/optional/image/Rotate.java b/src/main/org/apache/tools/ant/types/optional/image/Rotate.java index e20ded1af..f925ec759 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Rotate.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Rotate.java @@ -70,7 +70,8 @@ public class Rotate extends TransformOperation implements DrawOperation { public PlanarImage executeTransformOperation(PlanarImage image) { BufferedImage bi = null; Graphics2D graphics = null; - for (int i = 0; i < instructions.size(); i++) { + final int size = instructions.size(); + for (int i = 0; i < size; i++) { ImageOperation instr = ((ImageOperation) instructions.elementAt(i)); if (instr instanceof DrawOperation) { // If this TransformOperation has DrawOperation children @@ -102,7 +103,8 @@ public class Rotate extends TransformOperation implements DrawOperation { * @return the image. */ public PlanarImage executeDrawOperation() { - for (int i = 0; i < instructions.size(); i++) { + final int size = instructions.size(); + for (int i = 0; i < size; i++) { ImageOperation instr = ((ImageOperation) instructions.elementAt(i)); if (instr instanceof DrawOperation) { // If this TransformOperation has DrawOperation children diff --git a/src/main/org/apache/tools/ant/types/optional/image/Scale.java b/src/main/org/apache/tools/ant/types/optional/image/Scale.java index 0b279e2cd..ea588970d 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Scale.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Scale.java @@ -146,7 +146,8 @@ public class Scale extends TransformOperation implements DrawOperation { /** {@inheritDoc}. */ public PlanarImage executeTransformOperation(PlanarImage image) { BufferedImage bi = null; - for (int i = 0; i < instructions.size(); i++) { + final int size = instructions.size(); + for (int i = 0; i < size; i++) { ImageOperation instr = ((ImageOperation) instructions.elementAt(i)); if (instr instanceof DrawOperation) { return performScale(image); @@ -163,7 +164,8 @@ public class Scale extends TransformOperation implements DrawOperation { /** {@inheritDoc}. */ public PlanarImage executeDrawOperation() { - for (int i = 0; i < instructions.size(); i++) { + final int size = instructions.size(); + for (int i = 0; i < size; i++) { ImageOperation instr = ((ImageOperation) instructions.elementAt(i)); if (instr instanceof DrawOperation) { PlanarImage image = null; diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java index 9472a5bf9..a65875d46 100644 --- a/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/src/main/org/apache/tools/ant/util/FileUtils.java @@ -753,7 +753,8 @@ public class FileUtils { } } StringBuffer sb = new StringBuffer(); - for (int i = 0; i < s.size(); i++) { + final int size = s.size(); + for (int i = 0; i < size; i++) { if (i > 1) { // not before the filesystem root and not after it, since root // already contains one diff --git a/src/main/org/apache/tools/ant/util/IdentityStack.java b/src/main/org/apache/tools/ant/util/IdentityStack.java index 2f95cf586..4fe7829aa 100644 --- a/src/main/org/apache/tools/ant/util/IdentityStack.java +++ b/src/main/org/apache/tools/ant/util/IdentityStack.java @@ -77,7 +77,8 @@ public class IdentityStack extends Stack { * @see java.util.Vector#indexOf(Object, int) */ public synchronized int indexOf(Object o, int pos) { - for (int i = pos; i < size(); i++) { + final int size = size(); + for (int i = pos; i < size; i++) { if (get(i) == o) { return i; } diff --git a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java index ecab3407a..b85a03c87 100644 --- a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java +++ b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java @@ -207,7 +207,8 @@ public class LayoutPreservingProperties extends Properties { (LayoutPreservingProperties) super.clone(); dolly.keyedPairLines = (HashMap) this.keyedPairLines.clone(); dolly.logicalLines = (ArrayList) this.logicalLines.clone(); - for (int j = 0; j < dolly.logicalLines.size(); j++) { + final int size = dolly.logicalLines.size(); + for (int j = 0; j < size; j++) { LogicalLine line = (LogicalLine) dolly.logicalLines.get(j); if (line instanceof Pair) { Pair p = (Pair) line; diff --git a/src/main/org/apache/tools/mail/MailMessage.java b/src/main/org/apache/tools/mail/MailMessage.java index ea64f36b0..882ca4779 100644 --- a/src/main/org/apache/tools/mail/MailMessage.java +++ b/src/main/org/apache/tools/mail/MailMessage.java @@ -328,7 +328,8 @@ public class MailMessage { // "Header fields are NOT required to occur in any particular order, // except that the message body MUST occur AFTER the headers" // (the same section specifies a reccommended order, which we ignore) - for (int i = 0; i < headersKeys.size(); i++) { + final int size = headersKeys.size(); + for (int i = 0; i < size; i++) { String name = (String) headersKeys.elementAt(i); String value = (String) headersValues.elementAt(i); out.println(name + ": " + value);