bodewig     02/04/30 04:36:04

  Modified:    src/main/org/apache/tools/ant/taskdefs Javadoc.java
  Log:
  A sourcepath without package names is a no-op now (again).
  
  Revision  Changes    Path
  1.96      +4 -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.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- Javadoc.java      26 Apr 2002 16:06:52 -0000      1.95
  +++ Javadoc.java      30 Apr 2002 11:36:03 -0000      1.96
  @@ -1794,7 +1794,7 @@
           // taken from packagenames attribute and nested package
           // elements and excludes taken from excludepackages attribute
           // and nested excludepackage elements
  -        if (sourcePath != null) {
  +        if (sourcePath != null && packageNames.size() > 0) {
               PatternSet ps = new PatternSet();
               Enumeration enum = packageNames.elements();
               while (enum.hasMoreElements()) {
  @@ -1859,6 +1859,9 @@
               }
               if (containsPackages) {
                   sp.createPathElement().setLocation(baseDir);
  +            } else {
  +                log(baseDir + " doesn\'t contain any packages, dropping it.",
  +                    Project.MSG_VERBOSE); 
               }
           }
       }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to