Author: jvanzyl
Date: Sun Nov 27 13:00:12 2005
New Revision: 349311
URL: http://svn.apache.org/viewcvs?rev=349311&view=rev
Log:
o table parsing is now working
Removed:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParseException.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceReaderSource.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSource.java
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/AbstractFatherBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/AnchorBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/Block.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/BoldBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/HorizontalRuleBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/HorizontalRuleBlockParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/ItalicBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/MonospaceBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlockParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/BulletedListBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListItemBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellHeaderBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableRowBlock.java
maven/doxia/trunk/doxia-core/src/test/site/confluence/page.confluence
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
Sun Nov 27 13:00:12 2005
@@ -24,6 +24,7 @@
import org.apache.maven.doxia.module.confluence.parser.ParagraphBlockParser;
import org.apache.maven.doxia.module.confluence.parser.VerbatimBlockParser;
import
org.apache.maven.doxia.module.confluence.parser.HorizontalRuleBlockParser;
+import org.apache.maven.doxia.module.confluence.parser.table.TableBlockParser;
import org.apache.maven.doxia.module.confluence.parser.list.ListBlockParser;
import org.apache.maven.doxia.parser.AbstractParser;
import org.apache.maven.doxia.parser.ParseException;
@@ -50,6 +51,7 @@
BlockParser horizontalRuleParser = new HorizontalRuleBlockParser();
BlockParser paragraphParser = new ParagraphBlockParser();
BlockParser listParser = new ListBlockParser();
+ BlockParser tableParser = new TableBlockParser();
parsers = new BlockParser[]
{
@@ -57,6 +59,7 @@
verbatimParser,
horizontalRuleParser,
listParser,
+ tableParser,
paragraphParser
};
}
@@ -109,7 +112,7 @@
return blocks;
}
- public final synchronized void parse( Reader reader, Sink sink )
+ public synchronized void parse( Reader reader, Sink sink )
throws ParseException
{
List blocks;
@@ -120,11 +123,11 @@
{
blocks = parse( source );
}
- catch ( final ParseException e )
+ catch ( ParseException e )
{
throw e;
}
- catch ( final Exception e )
+ catch ( Exception e )
{
throw new ParseException( e, source.getName(),
source.getLineNumber() );
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/AbstractFatherBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/AbstractFatherBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/AbstractFatherBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/AbstractFatherBlock.java
Sun Nov 27 13:00:12 2005
@@ -25,13 +25,13 @@
public abstract class AbstractFatherBlock
implements Block
{
- private final List blocks;
+ private List blocks;
public abstract void before( Sink sink );
public abstract void after( Sink sink );
- public AbstractFatherBlock( final List childBlocks )
+ public AbstractFatherBlock( List childBlocks )
{
if ( childBlocks == null )
{
@@ -41,7 +41,7 @@
this.blocks = childBlocks;
}
- public final void traverse( final Sink sink )
+ public void traverse( Sink sink )
{
before( sink );
@@ -55,7 +55,7 @@
after( sink );
}
- public final List getBlocks()
+ public List getBlocks()
{
return blocks;
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/AnchorBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/AnchorBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/AnchorBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/AnchorBlock.java
Sun Nov 27 13:00:12 2005
@@ -21,9 +21,9 @@
public class AnchorBlock
implements Block
{
- private final String name;
+ private String name;
- public AnchorBlock( final String name ) throws IllegalArgumentException
+ public AnchorBlock( String name ) throws IllegalArgumentException
{
if ( name == null )
{
@@ -32,7 +32,7 @@
this.name = name;
}
- public final void traverse( final Sink sink )
+ public void traverse( Sink sink )
{
sink.anchor( name );
sink.anchor_();
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/Block.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/Block.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/Block.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/Block.java
Sun Nov 27 13:00:12 2005
@@ -20,5 +20,5 @@
public interface Block
{
- void traverse( final Sink sink );
+ void traverse( Sink sink );
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/BoldBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/BoldBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/BoldBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/BoldBlock.java
Sun Nov 27 13:00:12 2005
@@ -28,12 +28,12 @@
super( childBlocks );
}
- public final void before( final Sink sink )
+ public void before( Sink sink )
{
sink.bold();
}
- public final void after( final Sink sink )
+ public void after( Sink sink )
{
sink.bold_();
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/HorizontalRuleBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/HorizontalRuleBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/HorizontalRuleBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/HorizontalRuleBlock.java
Sun Nov 27 13:00:12 2005
@@ -21,7 +21,7 @@
public class HorizontalRuleBlock
implements Block
{
- public final void traverse( final Sink sink )
+ public void traverse( Sink sink )
{
sink.horizontalRule();
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/HorizontalRuleBlockParser.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/HorizontalRuleBlockParser.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/HorizontalRuleBlockParser.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/HorizontalRuleBlockParser.java
Sun Nov 27 13:00:12 2005
@@ -25,12 +25,12 @@
public class HorizontalRuleBlockParser
implements BlockParser
{
- public final boolean accept( final String line )
+ public boolean accept( String line )
{
return line.startsWith( "----" );
}
- public final Block visit( final String line, final ByLineSource source )
+ public Block visit( String line, ByLineSource source )
throws ParseException
{
return new HorizontalRuleBlock();
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/ItalicBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/ItalicBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/ItalicBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/ItalicBlock.java
Sun Nov 27 13:00:12 2005
@@ -28,12 +28,12 @@
super( childBlocks );
}
- public final void before( final Sink sink )
+ public void before( Sink sink )
{
sink.italic();
}
- public final void after( final Sink sink )
+ public void after( Sink sink )
{
sink.italic_();
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java
Sun Nov 27 13:00:12 2005
@@ -22,11 +22,11 @@
public class LinkBlock
implements Block
{
- private final String reference;
+ private String reference;
- private final String text;
+ private String text;
- public LinkBlock( final String reference, final String text )
+ public LinkBlock( String reference, String text )
throws IllegalArgumentException
{
if ( reference == null || text == null )
@@ -37,7 +37,7 @@
this.text = text;
}
- public final void traverse( final Sink sink )
+ public void traverse( Sink sink )
{
sink.link( reference );
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/MonospaceBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/MonospaceBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/MonospaceBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/MonospaceBlock.java
Sun Nov 27 13:00:12 2005
@@ -27,12 +27,12 @@
super( childBlocks );
}
- public final void before( final Sink sink )
+ public void before( Sink sink )
{
sink.monospaced();
}
- public final void after( final Sink sink )
+ public void after( Sink sink )
{
sink.monospaced_();
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlockParser.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlockParser.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlockParser.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlockParser.java
Sun Nov 27 13:00:12 2005
@@ -8,12 +8,12 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id:$
+ * @version $Id$
*/
public class VerbatimBlockParser
implements BlockParser
{
- static final String LS = System.getProperty( "line.separator" );
+ static String LS = System.getProperty( "line.separator" );
public boolean accept( String line )
{
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/BulletedListBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/BulletedListBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/BulletedListBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/BulletedListBlock.java
Sun Nov 27 13:00:12 2005
@@ -21,12 +21,12 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id:$
+ * @version $Id$
*/
public class BulletedListBlock
extends ListBlock
{
- public BulletedListBlock( final List childBlocks )
+ public BulletedListBlock( List childBlocks )
{
super( childBlocks );
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlock.java
Sun Nov 27 13:00:12 2005
@@ -20,12 +20,12 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id:$
+ * @version $Id$
*/
public abstract class ListBlock
extends AbstractFatherBlock
{
- protected ListBlock( final List childBlocks )
+ protected ListBlock( List childBlocks )
{
super( childBlocks );
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
Sun Nov 27 13:00:12 2005
@@ -23,7 +23,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id:$
+ * @version $Id$
*/
public class ListBlockParser
implements BlockParser
@@ -42,10 +42,10 @@
return false;
}
- public final Block visit( final String line, final ByLineSource source )
+ public Block visit( String line, ByLineSource source )
throws ParseException
{
- final TreeListBuilder treeListBuilder = new TreeListBuilder();
+ TreeListBuilder treeListBuilder = new TreeListBuilder();
String l = line;
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListItemBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListItemBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListItemBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListItemBlock.java
Sun Nov 27 13:00:12 2005
@@ -24,15 +24,15 @@
public class ListItemBlock
extends AbstractFatherBlock
{
- private final ListBlock innerList;
+ private ListBlock innerList;
- public ListItemBlock( final List blocks )
+ public ListItemBlock( List blocks )
throws IllegalArgumentException
{
this( blocks, null );
}
- public ListItemBlock( final List blocks, final ListBlock innerList )
+ public ListItemBlock( List blocks, ListBlock innerList )
throws IllegalArgumentException
{
super( blocks );
@@ -40,12 +40,12 @@
this.innerList = innerList;
}
- public final void before( final Sink sink )
+ public void before( Sink sink )
{
sink.listItem();
}
- public final void after( final Sink sink )
+ public void after( Sink sink )
{
if ( innerList != null )
{
@@ -55,7 +55,7 @@
sink.listItem_();
}
- public final ListBlock getInnerList()
+ public ListBlock getInnerList()
{
return innerList;
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java
Sun Nov 27 13:00:12 2005
@@ -24,15 +24,13 @@
public class NumberedListBlock
extends ListBlock
{
- public NumberedListBlock( final List childBlocks )
+ public NumberedListBlock( List childBlocks )
{
super( childBlocks );
}
public void before( Sink sink )
{
- System.out.println(
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" );
-
sink.numberedList( Sink.NUMBERING_DECIMAL );
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java
Sun Nov 27 13:00:12 2005
@@ -24,7 +24,7 @@
public class TreeListBuilder
{
- private final TreeComponent root;
+ private TreeComponent root;
private TreeComponent current;
@@ -110,8 +110,6 @@
for ( Iterator i = tc.getChildren().iterator(); i.hasNext(); )
{
TreeComponent child = (TreeComponent) i.next();
-
- System.out.println( "child.getText() = " + child.getText() );
List text = new ArrayList();
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.java
Sun Nov 27 13:00:12 2005
@@ -30,12 +30,12 @@
super( childBlocks );
}
- public final void before( final Sink sink )
+ public void before( Sink sink )
{
sink.table();
}
- public final void after( final Sink sink )
+ public void after( Sink sink )
{
sink.table_();
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
Sun Nov 27 13:00:12 2005
@@ -25,7 +25,9 @@
import org.apache.maven.doxia.module.confluence.parser.BlockParser;
import org.apache.maven.doxia.module.confluence.parser.Block;
import org.apache.maven.doxia.module.confluence.parser.BoldBlock;
+import org.apache.maven.doxia.module.confluence.parser.TextBlock;
import org.apache.maven.doxia.parser.ParseException;
+import org.codehaus.plexus.util.StringUtils;
/**
@@ -37,12 +39,12 @@
public class TableBlockParser
implements BlockParser
{
- public final boolean accept( final String line )
+ public boolean accept( String line )
{
return line.startsWith( "|" );
}
- public final Block visit( final String line, final ByLineSource source )
+ public Block visit( String line, ByLineSource source )
throws ParseException
{
if ( !accept( line ) )
@@ -50,39 +52,48 @@
throw new IllegalAccessError( "call accept before this ;)" );
}
- final List rows = new ArrayList();
+ List rows = new ArrayList();
String l = line;
do
{
- /*
- final Matcher m = TABLE_PATTERN.matcher( l );
- if ( m.lookingAt() )
+ List cells = new ArrayList();
+
+ if ( l.startsWith( "||" ) )
{
- final List<Block> cells = new ArrayList<Block>();
+ String[] text = StringUtils.split( l, "||" );
+
- // for each cell...
- for ( int lh = l.indexOf( '|' ) + 1, rh; ( rh = l.indexOf(
'|', lh ) ) != -1; lh = rh + 1 )
+ for ( int i = 0; i < text.length; i++ )
{
- final Block [] bs = textParser.parse( l.substring( lh, rh
).trim() );
+ List textBlocks = new ArrayList();
+
+ textBlocks.add( new TextBlock( text[i] ) );
- if ( bs.length == 1 && bs[0] instanceof BoldBlock )
- {
- final Block []tmp = ( (BoldBlock) bs[0] ).getBlocks();
-
- cells.add( new TableCellHeaderBlock( tmp ) );
- }
- else
- {
- cells.add( new TableCellBlock( bs ) );
- }
+ List blocks = new ArrayList();
+
+ blocks.add( new BoldBlock( textBlocks ) );
+
+ cells.add( new TableCellHeaderBlock( blocks ) );
}
- rows.add( new TableRowBlock( cells.toArray( new Block[]{} ) )
);
+ }
+ else
+ {
+ String[] text = StringUtils.split( l, "|" );
+
+
+ for ( int i = 0; i < text.length; i++ )
+ {
+ List blocks = new ArrayList();
+
+ blocks.add( new TextBlock( text[i] ) );
+ cells.add( new TableCellBlock( blocks ) );
+ }
}
- */
+ rows.add( new TableRowBlock( cells ) );
}
while ( ( l = source.getNextLine() ) != null && accept( l ) );
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellBlock.java
Sun Nov 27 13:00:12 2005
@@ -29,12 +29,12 @@
super( childBlocks );
}
- public final void before( final Sink sink )
+ public void before( Sink sink )
{
sink.tableCell();
}
- public final void after( final Sink sink )
+ public void after( Sink sink )
{
sink.tableCell_();
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellHeaderBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellHeaderBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellHeaderBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableCellHeaderBlock.java
Sun Nov 27 13:00:12 2005
@@ -28,12 +28,12 @@
super( childBlocks );
}
- public final void before( final Sink sink )
+ public void before( Sink sink )
{
sink.tableHeaderCell();
}
- public final void after( final Sink sink )
+ public void after( Sink sink )
{
sink.tableHeaderCell_();
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableRowBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableRowBlock.java?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableRowBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableRowBlock.java
Sun Nov 27 13:00:12 2005
@@ -14,12 +14,12 @@
super( childBlocks );
}
- public final void before( final Sink sink )
+ public void before( Sink sink )
{
sink.tableRow();
}
- public final void after( final Sink sink )
+ public void after( Sink sink )
{
sink.tableRow_();
}
Modified: maven/doxia/trunk/doxia-core/src/test/site/confluence/page.confluence
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/test/site/confluence/page.confluence?rev=349311&r1=349310&r2=349311&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/test/site/confluence/page.confluence
(original)
+++ maven/doxia/trunk/doxia-core/src/test/site/confluence/page.confluence Sun
Nov 27 13:00:12 2005
@@ -22,6 +22,9 @@
# number two
# number three
+||one||two||three||
+|foo|bar|baz|
+
h1. I am h1
this is how you would code a mojo!
