git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270184 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -840,7 +840,7 @@ public class Project | |||||
| task = taskA; | task = taskA; | ||||
| } | } | ||||
| task.setProject( this ); | task.setProject( this ); | ||||
| task.setTaskType( taskType ); | |||||
| //task.setTaskType( taskType ); | |||||
| String msg = " +Task: " + taskType; | String msg = " +Task: " + taskType; | ||||
| log( msg, MSG_DEBUG ); | log( msg, MSG_DEBUG ); | ||||
| @@ -14,7 +14,6 @@ public abstract class Task | |||||
| implements org.apache.myrmidon.api.Task | implements org.apache.myrmidon.api.Task | ||||
| { | { | ||||
| protected String description; | protected String description; | ||||
| protected String taskType; | |||||
| /** | /** | ||||
| * Sets a description of the current action. It will be usefull in | * Sets a description of the current action. It will be usefull in | ||||
| @@ -121,15 +120,5 @@ public abstract class Task | |||||
| { | { | ||||
| log( line, Project.MSG_INFO ); | log( line, Project.MSG_INFO ); | ||||
| } | } | ||||
| /** | |||||
| * Set the name with which the task has been invoked. | |||||
| * | |||||
| * @param type the name the task has been invoked as. | |||||
| */ | |||||
| void setTaskType( String type ) | |||||
| { | |||||
| this.taskType = type; | |||||
| } | |||||
| } | } | ||||
| @@ -74,7 +74,7 @@ public class Chmod extends ExecuteOn | |||||
| public void setExecutable( String e ) | public void setExecutable( String e ) | ||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| throw new TaskException( taskType + " doesn\'t support the executable attribute" ); | |||||
| throw new TaskException( getName() + " doesn\'t support the executable attribute" ); | |||||
| } | } | ||||
| public void setFile( File src ) | public void setFile( File src ) | ||||
| @@ -108,7 +108,7 @@ public class Chmod extends ExecuteOn | |||||
| public void setSkipEmptyFilesets( boolean skip ) | public void setSkipEmptyFilesets( boolean skip ) | ||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| throw new TaskException( taskType + " doesn\'t support the skipemptyfileset attribute" ); | |||||
| throw new TaskException( getName() + " doesn\'t support the skipemptyfileset attribute" ); | |||||
| } | } | ||||
| /** | /** | ||||
| @@ -246,7 +246,7 @@ public class ExecTask extends Task | |||||
| { | { | ||||
| if( failOnError ) | if( failOnError ) | ||||
| { | { | ||||
| throw new TaskException( taskType + " returned: " + err ); | |||||
| throw new TaskException( getName() + " returned: " + err ); | |||||
| } | } | ||||
| else | else | ||||
| { | { | ||||
| @@ -135,7 +135,7 @@ public class ExecuteOn extends ExecTask | |||||
| { | { | ||||
| if( srcFilePos != null ) | if( srcFilePos != null ) | ||||
| { | { | ||||
| throw new TaskException( taskType + " doesn\'t support multiple srcfile elements." ); | |||||
| throw new TaskException( getName() + " doesn\'t support multiple srcfile elements." ); | |||||
| } | } | ||||
| srcFilePos = cmdl.createMarker(); | srcFilePos = cmdl.createMarker(); | ||||
| return srcFilePos; | return srcFilePos; | ||||
| @@ -152,7 +152,7 @@ public class ExecuteOn extends ExecTask | |||||
| { | { | ||||
| if( targetFilePos != null ) | if( targetFilePos != null ) | ||||
| { | { | ||||
| throw new TaskException( taskType + " doesn\'t support multiple targetfile elements." ); | |||||
| throw new TaskException( getName() + " doesn\'t support multiple targetfile elements." ); | |||||
| } | } | ||||
| targetFilePos = cmdl.createMarker(); | targetFilePos = cmdl.createMarker(); | ||||
| srcIsFirst = ( srcFilePos != null ); | srcIsFirst = ( srcFilePos != null ); | ||||
| @@ -840,7 +840,7 @@ public class Project | |||||
| task = taskA; | task = taskA; | ||||
| } | } | ||||
| task.setProject( this ); | task.setProject( this ); | ||||
| task.setTaskType( taskType ); | |||||
| //task.setTaskType( taskType ); | |||||
| String msg = " +Task: " + taskType; | String msg = " +Task: " + taskType; | ||||
| log( msg, MSG_DEBUG ); | log( msg, MSG_DEBUG ); | ||||
| @@ -14,7 +14,6 @@ public abstract class Task | |||||
| implements org.apache.myrmidon.api.Task | implements org.apache.myrmidon.api.Task | ||||
| { | { | ||||
| protected String description; | protected String description; | ||||
| protected String taskType; | |||||
| /** | /** | ||||
| * Sets a description of the current action. It will be usefull in | * Sets a description of the current action. It will be usefull in | ||||
| @@ -121,15 +120,5 @@ public abstract class Task | |||||
| { | { | ||||
| log( line, Project.MSG_INFO ); | log( line, Project.MSG_INFO ); | ||||
| } | } | ||||
| /** | |||||
| * Set the name with which the task has been invoked. | |||||
| * | |||||
| * @param type the name the task has been invoked as. | |||||
| */ | |||||
| void setTaskType( String type ) | |||||
| { | |||||
| this.taskType = type; | |||||
| } | |||||
| } | } | ||||
| @@ -74,7 +74,7 @@ public class Chmod extends ExecuteOn | |||||
| public void setExecutable( String e ) | public void setExecutable( String e ) | ||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| throw new TaskException( taskType + " doesn\'t support the executable attribute" ); | |||||
| throw new TaskException( getName() + " doesn\'t support the executable attribute" ); | |||||
| } | } | ||||
| public void setFile( File src ) | public void setFile( File src ) | ||||
| @@ -108,7 +108,7 @@ public class Chmod extends ExecuteOn | |||||
| public void setSkipEmptyFilesets( boolean skip ) | public void setSkipEmptyFilesets( boolean skip ) | ||||
| throws TaskException | throws TaskException | ||||
| { | { | ||||
| throw new TaskException( taskType + " doesn\'t support the skipemptyfileset attribute" ); | |||||
| throw new TaskException( getName() + " doesn\'t support the skipemptyfileset attribute" ); | |||||
| } | } | ||||
| /** | /** | ||||
| @@ -246,7 +246,7 @@ public class ExecTask extends Task | |||||
| { | { | ||||
| if( failOnError ) | if( failOnError ) | ||||
| { | { | ||||
| throw new TaskException( taskType + " returned: " + err ); | |||||
| throw new TaskException( getName() + " returned: " + err ); | |||||
| } | } | ||||
| else | else | ||||
| { | { | ||||
| @@ -135,7 +135,7 @@ public class ExecuteOn extends ExecTask | |||||
| { | { | ||||
| if( srcFilePos != null ) | if( srcFilePos != null ) | ||||
| { | { | ||||
| throw new TaskException( taskType + " doesn\'t support multiple srcfile elements." ); | |||||
| throw new TaskException( getName() + " doesn\'t support multiple srcfile elements." ); | |||||
| } | } | ||||
| srcFilePos = cmdl.createMarker(); | srcFilePos = cmdl.createMarker(); | ||||
| return srcFilePos; | return srcFilePos; | ||||
| @@ -152,7 +152,7 @@ public class ExecuteOn extends ExecTask | |||||
| { | { | ||||
| if( targetFilePos != null ) | if( targetFilePos != null ) | ||||
| { | { | ||||
| throw new TaskException( taskType + " doesn\'t support multiple targetfile elements." ); | |||||
| throw new TaskException( getName() + " doesn\'t support multiple targetfile elements." ); | |||||
| } | } | ||||
| targetFilePos = cmdl.createMarker(); | targetFilePos = cmdl.createMarker(); | ||||
| srcIsFirst = ( srcFilePos != null ); | srcIsFirst = ( srcFilePos != null ); | ||||