From 39a4da86733bb32057e0bacac1c73895717f6181 Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Sat, 30 Jun 2007 15:05:14 +0000
Subject: [PATCH] refactor

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@552156 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tools/ant/taskdefs/Move.java   | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Move.java b/src/main/org/apache/tools/ant/taskdefs/Move.java
index 888ebfdf0..bb950a103 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Move.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Move.java
@@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs;
 import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
+
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -324,20 +325,18 @@ public class Move extends Copy {
      */
     protected boolean renameFile(File sourceFile, File destFile, boolean filtering,
                                  boolean overwrite) throws IOException, BuildException {
-        boolean renamed = false;
-        if ((getFilterSets().size() + getFilterChains().size() == 0)
-                && !(filtering || destFile.isDirectory())) {
-            // ensure that parent dir of dest file exists!
-            File parent = destFile.getParentFile();
-            if (parent != null && !parent.exists()) {
-                parent.mkdirs();
-            }
-            if (destFile.isFile() && !getFileUtils().fileNameEquals(sourceFile, destFile)
-                    && !destFile.delete()) {
-                throw new BuildException("Unable to remove existing " + "file " + destFile);
-            }
-            renamed = sourceFile.renameTo(destFile);
+        if (destFile.isDirectory() || filtering || getFilterSets().size() > 0
+                || getFilterChains().size() > 0) {
+            return false;
+        }
+        // ensure that parent dir of dest file exists!
+        File parent = destFile.getParentFile();
+        if (parent != null && !parent.exists()) {
+            parent.mkdirs();
+        } else if (destFile.isFile() && !getFileUtils().fileNameEquals(sourceFile, destFile)
+                && !destFile.delete()) {
+            throw new BuildException("Unable to remove existing file " + destFile);
         }
-        return renamed;
+        return sourceFile.renameTo(destFile);
     }
 }