Browse Source

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
master
Peter Donald 23 years ago
parent
commit
676c2c7cbc
2 changed files with 38 additions and 32 deletions
  1. +19
    -16
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Mkdir.java
  2. +19
    -16
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Mkdir.java

+ 19
- 16
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Mkdir.java View File

@@ -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 );
}
}
}

+ 19
- 16
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Mkdir.java View File

@@ -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 );
}
}
}

Loading…
Cancel
Save