Browse Source

Moved the javadoc == 1.1 or 1.2 check out of init().

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267884 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 25 years ago
parent
commit
b18b40b152
1 changed files with 5 additions and 6 deletions
  1. +5
    -6
      src/main/org/apache/tools/ant/taskdefs/Javadoc.java

+ 5
- 6
src/main/org/apache/tools/ant/taskdefs/Javadoc.java View File

@@ -160,7 +160,9 @@ public class Javadoc extends Task {
}

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) {
@@ -493,11 +495,6 @@ public class Javadoc extends Task {
}
}

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. !!");
@@ -510,6 +507,8 @@ public class Javadoc extends Task {

log("Generating Javadoc", Project.MSG_INFO);

cmd.setExecutable("javadoc");

// ------------------------------------------------ general javadoc arguments
if (classpath == null)
classpath = Path.systemClasspath;


Loading…
Cancel
Save