From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2331 invoked by alias); 24 Sep 2005 08:18:09 -0000 Mailing-List: contact mauve-discuss-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: mauve-discuss-owner@sources.redhat.com Received: (qmail 1311 invoked by uid 22791); 24 Sep 2005 08:16:26 -0000 Received: from mla78-1-82-240-16-110.fbx.proxad.net (HELO pcfabien) (82.240.16.110) by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Sat, 24 Sep 2005 08:16:26 +0000 Received: from [127.0.0.1] by pcfabien (ArGoSoft Mail Server Freeware, Version 1.8 (1.8.7.5)); Tue, 20 Sep 2005 23:25:01 +0200 Message-ID: <43307E24.8060709@webmails.com> Date: Sat, 24 Sep 2005 08:18:00 -0000 From: Fabien DUMINY User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) MIME-Version: 1.0 To: David Gilbert CC: Michael Koch , mauve-discuss@sources.redhat.com Subject: Re: Can I commit a bug fix in CreateTags.java ? References: <432BFCD0.7030305@laposte.net> <20050917115254.GI19178@asterix.konqueror.de> <432C09CC.3070402@users.sourceforge.net> <432EC250.7070708@object-refinery.com> In-Reply-To: <432EC250.7070708@object-refinery.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit X-SW-Source: 2005-q3/txt/msg00062.txt.bz2 David Gilbert a écrit : > Fabien DUMINY wrote: > >> Michael Koch a écrit : >> >>> On Sat, Sep 17, 2005 at 01:24:00PM +0200, Fabien DUMINY wrote: >>> >>> >>>> Hi, >>>> I found and fixed a bug in CreateTags. The ';' wasn't removed from >>>> the package declaration and it was written in the testlet className. >>>> >>>> Can I commit the bug fix (when I will have the rights to do) ? >>>> I ask you that question because I read that such modification (in >>>> the core of Mauve, not in the testlets) should be discussed here. >>>> >>> >>> >>> >>> Please send a patch representing this change here. >>> >>> >>> Michael >>> >>> >> Here is the patch (joined file). >> >> Fabien. >> >> ------------------------------------------------------------------------ >> >> Index: CreateTags.java >> =================================================================== >> RCS file: /cvs/mauve/mauve/gnu/testlet/runner/CreateTags.java,v >> retrieving revision 1.1 >> diff -u -r1.1 CreateTags.java >> --- CreateTags.java 1 Jul 2005 18:33:43 -0000 1.1 >> +++ CreateTags.java 17 Sep 2005 12:14:22 -0000 >> @@ -130,7 +130,10 @@ >> tags = line; >> } >> else if(buf.indexOf("package ") == 0) >> - pckage = buf.substring(8, buf.length()-1); >> + { >> + int idx = buf.lastIndexOf(";"); >> + pckage = buf.substring(8, idx); >> + } >> buf = new StringBuffer(); >> maxLines--; >> } >> >> > I ran the CreateTags program (for the first time) and didn't see a > problem. Here's the first few lines of the output file: > > [JDK1.0] > gnu.testlet.java.io.LineNumberInputStream.Test > gnu.testlet.java.io.FilterInputStream.MarkReset > gnu.testlet.java.io.FilterInputStream.SimpleRead > gnu.testlet.java.io.BufferedInputStream.ProtectedVars > gnu.testlet.java.io.BufferedInputStream.MarkReset > gnu.testlet.java.io.BufferedInputStream.ZeroRead > gnu.testlet.java.io.BufferedInputStream.BigMark > gnu.testlet.java.io.BufferedInputStream.SimpleRead > > What do you get when you run it? What are you running it with? (I > tried both JamVM with Classpath CVS and Sun's JDK1.4.2_08 on GNU Linux). > > Regards, > > Dave > > I tried with Sun's jdk 1.5.0_03 and Classpath under eclipse 3.2M1/Windows XP. Without that patch I get something like that gnu.testlet.java.io.LineNumberInputStream;.Test gnu.testlet.java.io.FilterInputStream;.MarkReset ... So, for me, the ';' at the end of the package declaration is not removed. I think that it is due to the fact that under Windows end of line are on 2 characters CR LF ("\r\n") and Linux it is only 1 character. In fact, the patch give something more safe even on Linux because we can be sure that nobody will add blank characters after the ';' on the package declaration line. Ok, I must say that I forgot to add a trim() on the package name, in case of there were some blank(s) between it and the ';'. ... maybe the ';' can also be on the next line but I don't thnik that will occure.