You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@locus.apache.org on 2000/06/29 15:35:39 UTC

cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Expand.java Untar.java

bodewig     00/06/29 06:35:36

  Modified:    src/main/org/apache/tools/ant Task.java
               src/main/org/apache/tools/ant/taskdefs Expand.java
                        Untar.java
  Log:
  reverted unnecessary change to Task.setProject intorduced with the
  Touch patch. Expand and Untar use Project.createTask now.
  Submitted by:	Glenn McAllister <gl...@ca.ibm.com>
  
  Revision  Changes    Path
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/Task.java
  
  Index: Task.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Task.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Task.java	2000/06/29 10:23:35	1.6
  +++ Task.java	2000/06/29 13:35:26	1.7
  @@ -73,7 +73,7 @@
        *
        * @param project Project in whose scope this task belongs.
        */
  -    public void setProject(Project project) {
  +    void setProject(Project project) {
           this.project = project;
       }
   
  
  
  
  1.4       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java
  
  Index: Expand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Expand.java	2000/06/29 10:23:39	1.3
  +++ Expand.java	2000/06/29 13:35:31	1.4
  @@ -74,8 +74,7 @@
        */
       // XXX move it to util or tools
       public void execute() throws BuildException {
  -        Touch touch = new Touch();
  -        touch.setProject(project);
  +        Touch touch = (Touch) project.createTask("touch");
           touch.setTarget(target);
                       
   	try {
  
  
  
  1.4       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Untar.java
  
  Index: Untar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Untar.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Untar.java	2000/06/29 10:23:41	1.3
  +++ Untar.java	2000/06/29 13:35:33	1.4
  @@ -76,8 +76,7 @@
        */
       public void execute() throws BuildException {
   
  -        Touch touch = new Touch();
  -        touch.setProject(project);
  +        Touch touch = (Touch) project.createTask("touch");
           touch.setTarget(target);
                       
           try {