From 076d8fda914346e558aad69f77be59216c46425f Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Sun, 27 Jan 2002 00:25:29 +0000
Subject: [PATCH] Made loop counter a simple variable rather than a complex
 value

Fixing a audit violation


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270921 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tools/ant/taskdefs/file/Copy.java |  3 ++-
 .../apache/tools/ant/taskdefs/file/Delete.java   | 16 +++++++++-------
 .../org/apache/tools/ant/taskdefs/file/Copy.java |  3 ++-
 .../apache/tools/ant/taskdefs/file/Delete.java   | 16 +++++++++-------
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
index f86b61323..4f3628afb 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
@@ -227,7 +227,8 @@ public class Copy
         }
 
         // deal with the filesets
-        for( int i = 0; i < m_filesets.size(); i++ )
+        final int size = m_filesets.size();
+        for( int i = 0; i < size; i++ )
         {
             final FileSet fileSet = (FileSet)m_filesets.get( i );
             final DirectoryScanner scanner = ScannerUtil.getDirectoryScanner( fileSet );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java
index bfb6a83f9..657a912ae 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java
@@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs.file;
 import java.io.File;
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.ScannerUtil;
 
@@ -122,15 +122,17 @@ public class Delete
         }
 
         // delete the files in the 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.get( i );
+            final FileSet fileSet = (FileSet)filesets.get( i );
             try
             {
-                DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs );
-                String[] files = ds.getIncludedFiles();
-                String[] dirs = ds.getIncludedDirectories();
-                removeFiles( fs.getDir(), files, dirs );
+                final DirectoryScanner scanner =
+                    ScannerUtil.getDirectoryScanner( fileSet );
+                String[] files = scanner.getIncludedFiles();
+                String[] dirs = scanner.getIncludedDirectories();
+                removeFiles( fileSet.getDir(), files, dirs );
             }
             catch( TaskException be )
             {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
index f86b61323..4f3628afb 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
@@ -227,7 +227,8 @@ public class Copy
         }
 
         // deal with the filesets
-        for( int i = 0; i < m_filesets.size(); i++ )
+        final int size = m_filesets.size();
+        for( int i = 0; i < size; i++ )
         {
             final FileSet fileSet = (FileSet)m_filesets.get( i );
             final DirectoryScanner scanner = ScannerUtil.getDirectoryScanner( fileSet );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java
index bfb6a83f9..657a912ae 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java
@@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs.file;
 import java.io.File;
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.ScannerUtil;
 
@@ -122,15 +122,17 @@ public class Delete
         }
 
         // delete the files in the 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.get( i );
+            final FileSet fileSet = (FileSet)filesets.get( i );
             try
             {
-                DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs );
-                String[] files = ds.getIncludedFiles();
-                String[] dirs = ds.getIncludedDirectories();
-                removeFiles( fs.getDir(), files, dirs );
+                final DirectoryScanner scanner =
+                    ScannerUtil.getDirectoryScanner( fileSet );
+                String[] files = scanner.getIncludedFiles();
+                String[] dirs = scanner.getIncludedDirectories();
+                removeFiles( fileSet.getDir(), files, dirs );
             }
             catch( TaskException be )
             {