From 676c2c7cbc53cf43d91f5cb64da1cb84495b0e4f Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Tue, 1 Jan 2002 09:02:17 +0000 Subject: [PATCH] Cleaned up and made extend AbstractTask rather than Task git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270498 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/taskdefs/file/Mkdir.java | 35 ++++++++++--------- .../apache/tools/ant/taskdefs/file/Mkdir.java | 35 ++++++++++--------- 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Mkdir.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Mkdir.java index 15f80eda2..7214d42cc 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Mkdir.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Mkdir.java @@ -8,48 +8,51 @@ package org.apache.tools.ant.taskdefs.file; import java.io.File; +import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.Task; /** * Creates a given directory. * * @author duncan@x180.com */ - -public class Mkdir extends Task +public class Mkdir + extends AbstractTask { + private File m_dir; - private File dir; - - public void setDir( File dir ) + public void setDir( final File dir ) { - this.dir = dir; + m_dir = dir; } public void execute() throws TaskException { - if( dir == null ) + if( m_dir == null ) { - throw new TaskException( "dir attribute is required" ); + final String message = "dir attribute is required"; + throw new TaskException( message ); } - if( dir.isFile() ) + if( m_dir.isFile() ) { - throw new TaskException( "Unable to create directory as a file already exists with that name: " + dir.getAbsolutePath() ); + final String message = "Unable to create directory as a file " + + "already exists with that name: " + m_dir.getAbsolutePath(); + throw new TaskException( message ); } - if( !dir.exists() ) + if( !m_dir.exists() ) { - boolean result = dir.mkdirs(); + boolean result = m_dir.mkdirs(); if( result == false ) { - String msg = "Directory " + dir.getAbsolutePath() + " creation was not " + + final String message = "Directory " + m_dir.getAbsolutePath() + " creation was not " + "successful for an unknown reason"; - throw new TaskException( msg ); + throw new TaskException( message ); } - getLogger().info( "Created dir: " + dir.getAbsolutePath() ); + final String message = "Created dir: " + m_dir.getAbsolutePath(); + getLogger().info( message ); } } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Mkdir.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Mkdir.java index 15f80eda2..7214d42cc 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Mkdir.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Mkdir.java @@ -8,48 +8,51 @@ package org.apache.tools.ant.taskdefs.file; import java.io.File; +import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.Task; /** * Creates a given directory. * * @author duncan@x180.com */ - -public class Mkdir extends Task +public class Mkdir + extends AbstractTask { + private File m_dir; - private File dir; - - public void setDir( File dir ) + public void setDir( final File dir ) { - this.dir = dir; + m_dir = dir; } public void execute() throws TaskException { - if( dir == null ) + if( m_dir == null ) { - throw new TaskException( "dir attribute is required" ); + final String message = "dir attribute is required"; + throw new TaskException( message ); } - if( dir.isFile() ) + if( m_dir.isFile() ) { - throw new TaskException( "Unable to create directory as a file already exists with that name: " + dir.getAbsolutePath() ); + final String message = "Unable to create directory as a file " + + "already exists with that name: " + m_dir.getAbsolutePath(); + throw new TaskException( message ); } - if( !dir.exists() ) + if( !m_dir.exists() ) { - boolean result = dir.mkdirs(); + boolean result = m_dir.mkdirs(); if( result == false ) { - String msg = "Directory " + dir.getAbsolutePath() + " creation was not " + + final String message = "Directory " + m_dir.getAbsolutePath() + " creation was not " + "successful for an unknown reason"; - throw new TaskException( msg ); + throw new TaskException( message ); } - getLogger().info( "Created dir: " + dir.getAbsolutePath() ); + final String message = "Created dir: " + m_dir.getAbsolutePath(); + getLogger().info( message ); } } }