From 21a88b996ae1899e19a7062eeb3fe214cb2cbe4f Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Sun, 8 Jul 2001 06:21:45 +0000 Subject: [PATCH] If the package list cannot be found, the offline links are skipped - a message is printed at verbose level PR:` 1304 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269293 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/taskdefs/Javadoc.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index b5a6d4bbc..18d809bd8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -626,8 +626,8 @@ public class Javadoc extends Task { packagelistLoc = src; } - public String getPackagelistLoc() { - return packagelistLoc.getAbsolutePath(); + public File getPackagelistLoc() { + return packagelistLoc; } public void setOffline(boolean offline) { @@ -810,14 +810,21 @@ public class Javadoc extends Task { } if (la.isLinkOffline()) { - String packageListLocation = la.getPackagelistLoc(); + File packageListLocation = la.getPackagelistLoc(); if (packageListLocation == null) { throw new BuildException("The package list location for link " + la.getHref() + " must be provided because the link is offline"); } - toExecute.createArgument().setValue("-linkoffline"); - toExecute.createArgument().setValue(la.getHref()); - toExecute.createArgument().setValue(packageListLocation); + File packageList = new File(packageListLocation, "package-list"); + if (packageList.exists()) { + toExecute.createArgument().setValue("-linkoffline"); + toExecute.createArgument().setValue(la.getHref()); + toExecute.createArgument().setValue(packageListLocation.getAbsolutePath()); + } + else { + log("Warning: No package list was found at " + packageListLocation, + Project.MSG_VERBOSE); + } } else { toExecute.createArgument().setValue("-link");