From e8a1adf6c68a50c4d950a98761a5f1069ea635e4 Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Fri, 10 Oct 2008 18:22:02 +0000 Subject: [PATCH] small refactorings git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@703546 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/ant/taskdefs/ExecuteOn.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java index f932cfe1f..36fd67a31 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -548,8 +548,7 @@ public class ExecuteOn extends ExecTask { } } } - String[] targetFiles = new String[targets.size()]; - targets.copyInto(targetFiles); + String[] targetFiles = (String[]) targets.toArray(new String[targets.size()]); if (!addSourceFile) { srcFiles = new String[0]; @@ -617,16 +616,16 @@ public class ExecuteOn extends ExecTask { } // fill in source file names for (int i = 0; i < srcFiles.length; i++) { - if (!relative) { - result[srcIndex + i] = - (new File(baseDirs[i], srcFiles[i])).getAbsolutePath(); + String src; + if (relative) { + src = srcFiles[i]; } else { - result[srcIndex + i] = srcFiles[i]; + src = new File(baseDirs[i], srcFiles[i]).getAbsolutePath(); } if (forwardSlash && fileSeparator != '/') { - result[srcIndex + i] = - result[srcIndex + i].replace(fileSeparator, '/'); + src = src.replace(fileSeparator, '/'); } + result[srcIndex + i] = src; } return result; } @@ -752,4 +751,5 @@ public class ExecuteOn extends ExecTask { return new String[] {FILE, DIR, "both"}; } } + }