From b38c25e33cdf346596c2d9e32b030eb124adf852 Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Fri, 7 Jan 2005 17:36:17 +0000 Subject: [PATCH] No need to finish building up the set for uniqueness before the handler can be invoked. Removes an import, some LOC, and has a better chance of preserving order between eg pathconvert and length. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277318 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Length.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Length.java b/src/main/org/apache/tools/ant/taskdefs/Length.java index 59b86d319..896cbaecc 100755 --- a/src/main/org/apache/tools/ant/taskdefs/Length.java +++ b/src/main/org/apache/tools/ant/taskdefs/Length.java @@ -23,7 +23,6 @@ import java.io.OutputStream; import java.io.ByteArrayOutputStream; import java.util.Vector; import java.util.HashSet; -import java.util.Iterator; import org.apache.tools.ant.Task; import org.apache.tools.ant.Project; @@ -44,8 +43,6 @@ public class Length extends Task { private static final String EACH = "each"; private static final String STRING = "string"; - private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); - private String property; private String string; private Boolean trim; @@ -157,12 +154,13 @@ public class Length extends Task { File basedir = fs.getDir(getProject()); String[] f = ds.getIncludedFiles(); for (int j = 0; j < f.length; j++) { - included.add(FILE_UTILS.resolveFile(basedir, f[j])); + File file = FileUtils.getFileUtils().resolveFile(basedir, f[j]); + if (!(included.contains(file))) { + included.add(file); + h.handle(file); + } } } - for (Iterator iter = included.iterator(); iter.hasNext();) { - h.handle((File)(iter.next())); - } included.clear(); included = null; h.complete();