ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@locus.apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Javadoc.java
Date Fri, 04 Aug 2000 10:08:04 GMT
bodewig     00/08/04 03:08:04

  Modified:    src/main/org/apache/tools/ant/taskdefs Javadoc.java
  Log:
  Moved the javadoc == 1.1 or 1.2 check out of init().
  
  Revision  Changes    Path
  1.23      +5 -6      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Javadoc.java	2000/08/03 11:25:11	1.22
  +++ Javadoc.java	2000/08/04 10:08:03	1.23
  @@ -160,8 +160,10 @@
       }
   
       private Commandline cmd = new Commandline();
  -    private boolean javadoc1 = true;
  +    private static boolean javadoc1 = 
  +        (Project.getJavaVersion() == Project.JAVA_1_1);
   
  +
       private void addArgIf(boolean b, String arg) {
           if (b) {
               cmd.createArgument().setValue(arg);
  @@ -493,11 +495,6 @@
           }
       }
   
  -    public void init() {
  -        cmd.setExecutable("javadoc");
  -        javadoc1 = (Project.getJavaVersion() == Project.JAVA_1_1);
  -    }
  -
       public void execute() throws BuildException {
           if ("javadoc2".equals(taskType)) {
               log("!! javadoc2 is deprecated. Use javadoc instead. !!");
  @@ -509,6 +506,8 @@
           }
   
           log("Generating Javadoc", Project.MSG_INFO);
  +
  +        cmd.setExecutable("javadoc");
   
   // ------------------------------------------------ general javadoc arguments
           if (classpath == null)
  
  
  

Mime
View raw message