cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Javadoc.java

[conor]

conor       00/08/04 03:23:25

  Modified:    src/main/org/apache/tools/ant/taskdefs Javadoc.java
  Log:
  Add some eror checking to the syntax of the linkoffline attribute
  Fix the output of argument list under verbose logging (Thanks to Ken Wood)
  
  Revision  Changes    Path
  1.24      +10 -1     
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Javadoc.java      2000/08/04 10:08:03     1.23
  +++ Javadoc.java      2000/08/04 10:23:25     1.24
  @@ -365,8 +365,17 @@
           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 @@
            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);