ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ImportTask.java
Date Mon, 10 Mar 2003 07:54:30 GMT
stevel      2003/03/09 23:54:29

  Modified:    src/main/org/apache/tools/ant/taskdefs ImportTask.java
  Log:
  a raid by the deprecation police.
  
  1. Why is log used at the project level, not the task level?
  2. documentation?
  
  Revision  Changes    Path
  1.8       +4 -4      ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
  
  Index: ImportTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ImportTask.java	10 Feb 2003 14:13:34 -0000	1.7
  +++ ImportTask.java	10 Mar 2003 07:54:29 -0000	1.8
  @@ -98,7 +98,7 @@
           }
   
           ProjectHelper helper=
  -                (ProjectHelper)project.getReference("ant.projectHelper");
  +                (ProjectHelper)getProject().getReference("ant.projectHelper");
           Vector importStack=helper.getImportStack();
           if( importStack.size() == 0) {
               // this happens if ant is used with a project
  @@ -117,7 +117,7 @@
           //System.out.println("Importing from " + currentSource);
           File buildFileParent=new File(buildFile.getParent());
   
  -        project.log("Importing file "+ file +" from "+
  +        getProject().log("Importing file "+ file +" from "+
                       buildFile.getAbsolutePath(), Project.MSG_VERBOSE);
   
           // Paths are relative to the build file they're imported from,
  @@ -133,7 +133,7 @@
           }
   
           if( importStack.contains(importedFile) ) {
  -            project.log("\nSkipped already imported file to avoid loop:\n   "+
  +            getProject().log("\nSkipped already imported file to avoid loop:\n   "+
                       importedFile + "\n",Project.MSG_WARN);
               return;
           }
  @@ -158,7 +158,7 @@
   //        context.helper.parse(project, importedFile,
   //                new ProjectHelper2.RootHandler(context));
   
  -        helper.parse( project, importedFile );
  +        helper.parse( getProject(), importedFile );
       }
   
       private static String getPath(File file) {
  
  
  

Mime
View raw message