ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Javadoc.java
Date Tue, 18 Feb 2003 15:25:15 GMT
bodewig     2003/02/18 07:25:14

  Modified:    src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
                        Javadoc.java
  Log:
  Merge fix for 10964 from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.96.2.11 +15 -5     ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.96.2.10
  retrieving revision 1.96.2.11
  diff -u -r1.96.2.10 -r1.96.2.11
  --- Javadoc.java	10 Feb 2003 14:24:44 -0000	1.96.2.10
  +++ Javadoc.java	18 Feb 2003 15:25:13 -0000	1.96.2.11
  @@ -1668,11 +1668,21 @@
                           File packageListFile = 
                               new File(packageListLocation, "package-list");
                           if (packageListFile.exists()) {
  -                            toExecute.createArgument().setValue("-linkoffline");
  -                            toExecute.createArgument().setValue(la.getHref());
  -                            toExecute.createArgument()
  -                                .setValue(packageListLocation
  -                                          .getAbsolutePath());
  +                            try {
  +                                String packageListURL =
  +                                    fileUtils.getFileURL(packageListLocation)
  +                                    .toExternalForm();
  +                                toExecute.createArgument()
  +                                    .setValue("-linkoffline");
  +                                toExecute.createArgument()
  +                                    .setValue(la.getHref());
  +                                toExecute.createArgument()
  +                                    .setValue(packageListURL);
  +                            } catch (MalformedURLException ex) {
  +                                log("Warning: Package list location was "
  +                                    + "invalid " + packageListLocation,
  +                                    Project.MSG_WARN);
  +                            }
                           } else {
                               log("Warning: No package list was found at " 
                                   + packageListLocation, Project.MSG_VERBOSE);
  
  
  

Mime
View raw message