ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs Chmod.java ExecTask.java ExecuteOn.java
Date Sun, 16 Dec 2001 04:37:00 GMT
donaldp     01/12/15 20:37:00

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant Project.java
                        Task.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
                        Chmod.java ExecTask.java ExecuteOn.java
  Log:
  A tasks type is equivelent to it's name - no need to distuinguish between the two.
  
  Revision  Changes    Path
  1.6       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Project.java	2001/12/16 04:31:58	1.5
  +++ Project.java	2001/12/16 04:37:00	1.6
  @@ -840,7 +840,7 @@
                   task = taskA;
               }
               task.setProject( this );
  -            task.setTaskType( taskType );
  +            //task.setTaskType( taskType );
   
               String msg = "   +Task: " + taskType;
               log( msg, MSG_DEBUG );
  
  
  
  1.8       +0 -11     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java
  
  Index: Task.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Task.java	2001/12/16 04:34:14	1.7
  +++ Task.java	2001/12/16 04:37:00	1.8
  @@ -14,7 +14,6 @@
       implements org.apache.myrmidon.api.Task
   {
       protected String description;
  -    protected String taskType;
   
       /**
        * Sets a description of the current action. It will be usefull in
  @@ -120,16 +119,6 @@
       protected void handleOutput( String line )
       {
           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;
       }
   }
   
  
  
  
  1.6       +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java
  
  Index: Chmod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Chmod.java	2001/12/16 02:05:41	1.5
  +++ Chmod.java	2001/12/16 04:37:00	1.6
  @@ -74,7 +74,7 @@
       public void setExecutable( String e )
           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 )
  @@ -108,7 +108,7 @@
       public void setSkipEmptyFilesets( boolean skip )
           throws TaskException
       {
  -        throw new TaskException( taskType + " doesn\'t support the skipemptyfileset attribute"
);
  +        throw new TaskException( getName() + " doesn\'t support the skipemptyfileset attribute"
);
       }
   
       /**
  
  
  
  1.6       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
  
  Index: ExecTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ExecTask.java	2001/12/16 01:31:38	1.5
  +++ ExecTask.java	2001/12/16 04:37:00	1.6
  @@ -246,7 +246,7 @@
           {
               if( failOnError )
               {
  -                throw new TaskException( taskType + " returned: " + err );
  +                throw new TaskException( getName() + " returned: " + err );
               }
               else
               {
  
  
  
  1.8       +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
  
  Index: ExecuteOn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ExecuteOn.java	2001/12/16 04:12:39	1.7
  +++ ExecuteOn.java	2001/12/16 04:37:00	1.8
  @@ -135,7 +135,7 @@
       {
           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();
           return srcFilePos;
  @@ -152,7 +152,7 @@
       {
           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();
           srcIsFirst = ( srcFilePos != null );
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message