From 2f6f27f4272a9d4c69cebcb5b23e2f8ceee35a52 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 2 Feb 2005 07:59:37 +0000
Subject: [PATCH] Make Jikes happy

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277567 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tools/ant/taskdefs/Execute.java     |  2 +-
 .../org/apache/tools/ant/types/PropertySet.java    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java
index b13e32f31..40c3f0d3a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Execute.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java
@@ -1162,7 +1162,7 @@ public class Execute {
                     catch (InterruptedException e) {
                         //ignore
                     }
-                    FILE_UTILS.delete(f);
+                    FileUtils.delete(f);
                 }
             }.start();
         }
diff --git a/src/main/org/apache/tools/ant/types/PropertySet.java b/src/main/org/apache/tools/ant/types/PropertySet.java
index e34493a78..a4710c017 100644
--- a/src/main/org/apache/tools/ant/types/PropertySet.java
+++ b/src/main/org/apache/tools/ant/types/PropertySet.java
@@ -166,11 +166,11 @@ public class PropertySet extends DataType {
      * @param to output pattern.
      */
     public void setMapper(String type, String from, String to) {
-        Mapper mapper = createMapper();
+        Mapper m = createMapper();
         Mapper.MapperType mapperType = new Mapper.MapperType();
         mapperType.setValue(type);
-        mapper.setFrom(from);
-        mapper.setTo(to);
+        m.setFrom(from);
+        m.setTo(to);
     }
 
     /**
@@ -302,19 +302,19 @@ public class PropertySet extends DataType {
         } else {
             names = cachedNames;
         }
-        FileNameMapper mapper = null;
+        FileNameMapper m = null;
         Mapper myMapper = getMapper();
         if (myMapper != null) {
-            mapper = myMapper.getImplementation();
+            m = myMapper.getImplementation();
         }
         Properties properties = new Properties();
         //iterate through the names, get the matching values
         for (Iterator iter = names.iterator(); iter.hasNext();) {
             String name = (String) iter.next();
             String value = (String) props.get(name);
-            if (mapper != null) {
+            if (m != null) {
                 //map the names
-                String[] newname = mapper.mapFileName(name);
+                String[] newname = m.mapFileName(name);
                 if (newname != null) {
                     name = newname[0];
                 }