Browse Source

Add some eror checking to the syntax of the linkoffline attribute

Fix the output of argument list under verbose logging (Thanks to Ken Wood)


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267885 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 25 years ago
parent
commit
0dd985bc2a
1 changed files with 10 additions and 1 deletions
  1. +10
    -1
      src/main/org/apache/tools/ant/taskdefs/Javadoc.java

+ 10
- 1
src/main/org/apache/tools/ant/taskdefs/Javadoc.java View File

@@ -365,8 +365,17 @@ public class Javadoc extends Task {
if (!javadoc1) {
LinkArgument le = createLink();
le.setOffline(true);
String linkOfflineError = "The linkoffline attribute must include a URL and " +
"a package-list file location separated by a space";
if (src.trim().length() == 0) {
throw new BuildException(linkOfflineError);
}
StringTokenizer tok = new StringTokenizer(src, " ", false);
le.setHref(tok.nextToken());

if (!tok.hasMoreTokens()) {
throw new BuildException(linkOfflineError);
}
le.setPackagelistLoc(tok.nextToken());
}
}
@@ -661,7 +670,7 @@ public class Javadoc extends Task {
if (packageList != null) {
cmd.createArgument().setValue("@" + packageList);
}
log("Javadoc args: " + cmd.getArguments(), Project.MSG_VERBOSE);
log("Javadoc args: " + cmd, Project.MSG_VERBOSE);

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



Loading…
Cancel
Save