Browse Source

Make the packagelistloc attribute of javadoc's link child a File so it

will be resolved properly.

Reported by:	abethegn@canal-plus.fr


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269212 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 24 years ago
parent
commit
6d4c233dcb
2 changed files with 8 additions and 4 deletions
  1. +4
    -0
      WHATSNEW
  2. +4
    -4
      src/main/org/apache/tools/ant/taskdefs/Javadoc.java

+ 4
- 0
WHATSNEW View File

@@ -375,3 +375,7 @@ cases.
* Corrupt Zip- and Jar-files ar now deleted if the task fails.

* many more fixes we've forgotten to document here ...

* The packagelistloc attribute of <javadoc>'s <link> child will be
resolved as a file (i.e. it is either absolute or relative to
basedir).

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

@@ -546,7 +546,7 @@ public class Javadoc extends Task {
if (!tok.hasMoreTokens()) {
throw new BuildException(linkOfflineError);
}
le.setPackagelistLoc(tok.nextToken());
le.setPackagelistLoc(project.resolveFile(tok.nextToken()));
}
}
public void setGroup(String src) {
@@ -607,7 +607,7 @@ public class Javadoc extends Task {
public class LinkArgument {
private String href;
private boolean offline = false;
private String packagelistLoc;
private File packagelistLoc;
public LinkArgument() {
}
@@ -620,12 +620,12 @@ public class Javadoc extends Task {
return href;
}
public void setPackagelistLoc(String src) {
public void setPackagelistLoc(File src) {
packagelistLoc = src;
}
public String getPackagelistLoc() {
return packagelistLoc;
return packagelistLoc.getAbsolutePath();
}
public void setOffline(boolean offline) {


Loading…
Cancel
Save