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

[conor]

conor       00/07/14 08:02:36

  Modified:    src/main/org/apache/tools/ant/taskdefs Javadoc.java
  Log:
  Minor bug fixes in Javadoc.
  
  1. handle package statements that use tabs.
  2. Fix minor bug in comment parsing.
  
  The parsing bug was pointed out by Johan Granstrom <[EMAIL PROTECTED]> but
  I have not used his patch directly.
  
  Revision  Changes    Path
  1.17      +6 -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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Javadoc.java      2000/07/14 08:25:52     1.16
  +++ Javadoc.java      2000/07/14 15:02:33     1.17
  @@ -859,7 +859,8 @@
                       log("Could not evaluate package for " + file, 
Project.MSG_WARN);
                       return null;
                   }
  -                if (line.trim().startsWith("package ")) {
  +                if (line.trim().startsWith("package ") ||
  +                    line.trim().startsWith("package\t")) {
                       name = line.substring(8, line.indexOf(";")).trim();
                       break;
                   }
  @@ -931,6 +932,10 @@
                           c = in.read();
                           if (c == '*') {
                               c = in.read();
  +                            while (c == '*' && c != -1) {
  +                                c = in.read();
  +                            }
  +                            
                               if (c == '/') {
                                   c = read();
                                   break;