Return-Path: Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 5578 invoked from network); 15 Jul 2000 19:22:05 -0000 Received: from mgw2.linkline.com (192.216.128.10) by locus.apache.org with SMTP; 15 Jul 2000 19:22:05 -0000 Received: from linkline.com (mail.linkline.com [192.216.128.2]) by mgw2.linkline.com (Postfix) with ESMTP id F022C66B3D for ; Sat, 15 Jul 2000 12:23:51 -0700 (PDT) Received: from linkline.com [64.30.194.215] by linkline.com with ESMTP (SMTPD32-6.00) id A9DB5BF02A8; Sat, 15 Jul 2000 12:22:03 -0700 Message-ID: <3970BCCB.B8743B3C@linkline.com> Date: Sat, 15 Jul 2000 12:34:35 -0700 From: gt bradley X-Mailer: Mozilla 4.73 [en] (WinNT; U) X-Accept-Language: en MIME-Version: 1.0 To: ant-dev@jakarta.apache.org Subject: Re: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Javadoc.java References: <20000714150237.33477.qmail@locus.apache.org> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Hmm. if this patch is supposed to expand the definition of white-space to be more inclusive of non-spaces, should it also handle the case of a new-line? just a thought GT conor@locus.apache.org wrote: > 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 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; > > >