From doxia-commits-return-747-apmail-maven-doxia-commits-archive=maven.apache.org@maven.apache.org Wed Feb 13 15:05:06 2008 Return-Path: Delivered-To: apmail-maven-doxia-commits-archive@www.apache.org Received: (qmail 87899 invoked from network); 13 Feb 2008 15:05:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Feb 2008 15:05:05 -0000 Received: (qmail 492 invoked by uid 500); 13 Feb 2008 15:04:59 -0000 Delivered-To: apmail-maven-doxia-commits-archive@maven.apache.org Received: (qmail 468 invoked by uid 500); 13 Feb 2008 15:04:59 -0000 Mailing-List: contact doxia-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: doxia-dev@maven.apache.org Delivered-To: mailing list doxia-commits@maven.apache.org Received: (qmail 457 invoked by uid 99); 13 Feb 2008 15:04:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Feb 2008 07:04:59 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Feb 2008 15:04:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D80501A9832; Wed, 13 Feb 2008 07:04:44 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r627448 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java Date: Wed, 13 Feb 2008 15:04:44 -0000 To: doxia-commits@maven.apache.org From: ltheussl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080213150444.D80501A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ltheussl Date: Wed Feb 13 07:04:38 2008 New Revision: 627448 URL: http://svn.apache.org/viewvc?rev=627448&view=rev Log: [DOXIA-215] trailing space after table row was emitted as table cell Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java?rev=627448&r1=627447&r2=627448&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java Wed Feb 13 07:04:38 2008 @@ -53,12 +53,14 @@ throw new IllegalAccessError( "call accept before this ;)" ); } - List rows = new ArrayList(); + List rows = new ArrayList(); String l = line; do { + l = l.substring( 0, l.lastIndexOf( "|" ) ); + List cells = new ArrayList(); if ( l.startsWith( "||" ) ) @@ -96,7 +98,7 @@ rows.add( new TableRowBlock( cells ) ); } - + while ( ( l = source.getNextLine() ) != null && accept( l, source ) ); assert rows.size() >= 1;