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

[conor]

conor       00/07/04 02:25:57

  Modified:    src/main/org/apache/tools/ant/taskdefs Javadoc.java
  Log:
  Add support for docletpath.
  
  I have changed the patch as submitted to treat the docletpath as a classpath 
rather
  than a file.
  
  Submitted by: Ernst de Haan <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.11      +6 -2      
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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Javadoc.java      2000/06/29 15:45:41     1.10
  +++ Javadoc.java      2000/07/04 09:25:56     1.11
  @@ -94,7 +94,7 @@
       private boolean author = true;
       private boolean version = true;
       private String doclet = null;
  -    private File docletpath = null;
  +    private String docletpath = null;
       private boolean old = false;
       private String classpath = null;
       private String bootclasspath = null;
  @@ -165,7 +165,7 @@
           doclet = src;
       }
       public void setDocletPath(String src) {
  -        docletpath = project.resolveFile(src);
  +        docletpath = project.translatePath(src);
       }
       public void setOld(String src) {
           old = Project.toBoolean(src);
  @@ -417,6 +417,10 @@
               if (doclet != null) {
                   argList.addElement("-doclet");
                   argList.addElement(doclet);
  +            }
  +            if (docletpath != null) {
  +                argList.addElement("-docletpath");
  +                argList.addElement(docletpath);
               }
               if (bootclasspath != null) {
                   argList.addElement("-bootclasspath");