You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by vs...@apache.org on 2008/12/21 15:12:41 UTC
svn commit: r728444 - in
/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src:
main/java/org/apache/maven/doxia/module/twiki/
test/java/org/apache/maven/doxia/module/twiki/parser/
Author: vsiveton
Date: Sun Dec 21 06:12:41 2008
New Revision: 728444
URL: http://svn.apache.org/viewvc?rev=728444&view=rev
Log:
o code convention
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/BlockTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ParagraphTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/SectionTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TableTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/VerbatimTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/WordsTest.java
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java?rev=728444&r1=728443&r2=728444&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java Sun Dec 21 06:12:41 2008
@@ -105,7 +105,7 @@
formatTextParser.setTextParser( textParser );
tableParser.setTextParser( formatTextParser );
- parsers = new BlockParser[] { sectionParser, hrulerParser, verbatimParser, paraParser, };
+ parsers = new BlockParser[] { sectionParser, hrulerParser, verbatimParser, paraParser };
}
/**
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/BlockTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/BlockTest.java?rev=728444&r1=728443&r2=728444&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/BlockTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/BlockTest.java Sun Dec 21 06:12:41 2008
@@ -103,13 +103,13 @@
new ItalicBlock(
new Block[] { new MonospaceBlock(
new Block[] { new TextBlock(
- "has" ) } ) } ), },
+ "has" ) } ) } ) },
new Block[] {
new TextBlock( "mary " ),
new BoldBlock(
new Block[] { new MonospaceBlock(
new Block[] { new TextBlock(
- "has" ) } ) } ), } ) );
+ "has" ) } ) } ) } ) );
}
/**
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextTest.java?rev=728444&r1=728443&r2=728444&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextTest.java Sun Dec 21 06:12:41 2008
@@ -47,18 +47,18 @@
text = "foo *bold* bar";
blocks = formatTextParser.parse( text );
assertTrue( Arrays.equals( new Block[] { new TextBlock( "foo " ),
- new BoldBlock( new Block[] { new TextBlock( "bold" ) } ), new TextBlock( " bar" ), }, blocks ) );
+ new BoldBlock( new Block[] { new TextBlock( "bold" ) } ), new TextBlock( " bar" ) }, blocks ) );
text = "\t*bold* bar";
blocks = formatTextParser.parse( text );
assertTrue( Arrays.equals( new Block[] { new TextBlock( "\t" ),
- new BoldBlock( new Block[] { new TextBlock( "bold" ) } ), new TextBlock( " bar" ), }, blocks ) );
+ new BoldBlock( new Block[] { new TextBlock( "bold" ) } ), new TextBlock( " bar" ) }, blocks ) );
text = "*nice* foo *bold* bar";
blocks = formatTextParser.parse( text );
assertTrue( Arrays.equals( new Block[] { new BoldBlock( new Block[] { new TextBlock( "nice" ) } ),
new TextBlock( " foo " ), new BoldBlock( new Block[] { new TextBlock( "bold" ) } ),
- new TextBlock( " bar" ), }, blocks ) );
+ new TextBlock( " bar" ) }, blocks ) );
}
/**
@@ -77,13 +77,13 @@
text = "foo _italic_ bar";
blocks = formatTextParser.parse( text );
assertTrue( Arrays.equals( new Block[] { new TextBlock( "foo " ),
- new ItalicBlock( new Block[] { new TextBlock( "italic" ) } ), new TextBlock( " bar" ), }, blocks ) );
+ new ItalicBlock( new Block[] { new TextBlock( "italic" ) } ), new TextBlock( " bar" ) }, blocks ) );
text = "_nice_ foo _italic_ bar";
blocks = formatTextParser.parse( text );
assertTrue( Arrays.equals( new Block[] { new ItalicBlock( new Block[] { new TextBlock( "nice" ) } ),
new TextBlock( " foo " ), new ItalicBlock( new Block[] { new TextBlock( "italic" ) } ),
- new TextBlock( " bar" ), }, blocks ) );
+ new TextBlock( " bar" ) }, blocks ) );
}
/**
@@ -100,7 +100,7 @@
new MonospaceBlock( new Block[] { new TextBlock( "has" ) } ), new TextBlock( " a " ),
new MonospaceBlock( new Block[] { new TextBlock( "little" ) } ),
new TextBlock( " lamb He followed her (" ),
- new MonospaceBlock( new Block[] { new TextBlock( "to school one day" ) } ), new TextBlock( ")" ), },
+ new MonospaceBlock( new Block[] { new TextBlock( "to school one day" ) } ), new TextBlock( ")" ) },
blocks ) );
}
@@ -119,7 +119,7 @@
new BoldBlock( new Block[] { new MonospaceBlock( new Block[] { new TextBlock( "has" ) } ) } ),
new TextBlock( " a " ),
new BoldBlock( new Block[] { new MonospaceBlock( new Block[] { new TextBlock( "little" ) } ) } ),
- new TextBlock( " lamb" ), };
+ new TextBlock( " lamb" ) };
assertTrue( Arrays.equals( expected, blocks ) );
}
@@ -138,7 +138,7 @@
new BoldBlock( new Block[] { new ItalicBlock( new Block[] { new TextBlock( "has" ) } ) } ),
new TextBlock( " a " ),
new BoldBlock( new Block[] { new ItalicBlock( new Block[] { new TextBlock( "little" ) } ) } ),
- new TextBlock( " lamb" ), }, blocks ) );
+ new TextBlock( " lamb" ) }, blocks ) );
}
/**
@@ -157,7 +157,7 @@
new Block[] { new TextBlock( "All " ), new BoldBlock( new Block[] { new TextBlock( "work and" ) } ),
new TextBlock( " " ), new MonospaceBlock( new Block[] { new TextBlock( "no play" ) } ),
new TextBlock( " " ), new ItalicBlock( new Block[] { new TextBlock( "makes" ) } ),
- new TextBlock( " Juan a dull " ), new BoldBlock( new Block[] { new TextBlock( "boy" ) } ), };
+ new TextBlock( " Juan a dull " ), new BoldBlock( new Block[] { new TextBlock( "boy" ) } ) };
assertTrue( Arrays.equals( expected, blocks ) );
}
@@ -182,8 +182,8 @@
new TextBlock( "work and " ),
new MonospaceBlock( new Block[] { new TextBlock( "no play " ),
new ItalicBlock( new Block[] { new TextBlock( "makes" ) } ),
- new TextBlock( " Juan" ), } ), new TextBlock( " a dull" ), } ),
- new TextBlock( " boy" ), };
+ new TextBlock( " Juan" ) } ), new TextBlock( " a dull" ) } ),
+ new TextBlock( " boy" ) };
assertTrue( Arrays.equals( expected, blocks ) );
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java?rev=728444&r1=728443&r2=728444&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java Sun Dec 21 06:12:41 2008
@@ -94,7 +94,7 @@
new NumeratedListBlock( Sink.NUMBERING_DECIMAL, new ListItemBlock[] {
new ListItemBlock( new Block[] { new TextBlock( "item1" ) } ),
new ListItemBlock( new Block[] { new TextBlock( "item2" ) } ),
- new ListItemBlock( new Block[] { new TextBlock( "item3" ) } ), } );
+ new ListItemBlock( new Block[] { new TextBlock( "item3" ) } ) } );
blocks = listParser.visit( source.getNextLine(), source );
assertEquals( expected, blocks );
}
@@ -116,12 +116,12 @@
new ListItemBlock( new Block[] { new TextBlock( "item1" ) },
new UnorderedListBlock( new ListItemBlock[] {
new ListItemBlock( new Block[] { new TextBlock( "item1.1" ) } ),
- new ListItemBlock( new Block[] { new TextBlock( "item1.2" ) } ), } ) ),
+ new ListItemBlock( new Block[] { new TextBlock( "item1.2" ) } ) } ) ),
new ListItemBlock( new Block[] { new TextBlock( "item2" ) },
new NumeratedListBlock( Sink.NUMBERING_LOWER_ROMAN, new ListItemBlock[] {
new ListItemBlock( new Block[] { new TextBlock( "item2.1" ) } ),
- new ListItemBlock( new Block[] { new TextBlock( "item2.2" ) } ), } ) ),
- new ListItemBlock( new Block[] { new TextBlock( "item3" ) } ), } );
+ new ListItemBlock( new Block[] { new TextBlock( "item2.2" ) } ) } ) ),
+ new ListItemBlock( new Block[] { new TextBlock( "item3" ) } ) } );
blocks = listParser.visit( source.getNextLine(), source );
assertEquals( expected, blocks );
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ParagraphTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ParagraphTest.java?rev=728444&r1=728443&r2=728444&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ParagraphTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ParagraphTest.java Sun Dec 21 06:12:41 2008
@@ -162,7 +162,7 @@
source = new ByLineReaderSource( new StringReader( "" + "Some text\n" + "-----------\n" + "More text" ) );
expected =
new Block[] { new ParagraphBlock( new Block[] { new TextBlock( "Some text" ) } ),
- new HorizontalRuleBlock(), new ParagraphBlock( new Block[] { new TextBlock( "More text" ) } ), };
+ new HorizontalRuleBlock(), new ParagraphBlock( new Block[] { new TextBlock( "More text" ) } ) };
blocks = (Block[]) twikiParser.parse( source ).toArray( new Block[] {} );
assertTrue( Arrays.equals( expected, blocks ) );
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/SectionTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/SectionTest.java?rev=728444&r1=728443&r2=728444&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/SectionTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/SectionTest.java Sun Dec 21 06:12:41 2008
@@ -128,7 +128,7 @@
final SectionBlock expected =
new SectionBlock( "Title3", 3, new Block[] { new ParagraphBlock( new Block[] {
new TextBlock( "This is " ), new BoldBlock( new Block[] { new TextBlock( "a" ) } ),
- new TextBlock( " parragraph of a section. Some text." ), } ) } );
+ new TextBlock( " parragraph of a section. Some text." ) } ) } );
assertEquals( expected, block );
}
@@ -169,7 +169,7 @@
expected =
new Block[] { new SectionBlock( "Title", 1, new Block[] {
new ParagraphBlock( new Block[] { new TextBlock( "Some text" ) } ), new HorizontalRuleBlock(),
- new ParagraphBlock( new Block[] { new TextBlock( "More text" ) } ), } ), };
+ new ParagraphBlock( new Block[] { new TextBlock( "More text" ) } ) } ) };
blocks = (Block[]) twikiParser.parse( source ).toArray( new Block[] {} );
assertTrue( Arrays.equals( expected, blocks ) );
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TableTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TableTest.java?rev=728444&r1=728443&r2=728444&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TableTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TableTest.java Sun Dec 21 06:12:41 2008
@@ -58,9 +58,9 @@
expected =
new TableBlock( new Block[] {
new TableRowBlock( new Block[] { new TableCellBlock( new Block[] { new TextBlock( "cell1" ) } ),
- new TableCellBlock( new Block[] { new TextBlock( "cell2" ) } ), } ),
+ new TableCellBlock( new Block[] { new TextBlock( "cell2" ) } ) } ),
new TableRowBlock( new Block[] { new TableCellBlock( new Block[] { new TextBlock( "cell3" ) } ),
- new TableCellBlock( new Block[] { new TextBlock( "cell4" ) } ), } ), } );
+ new TableCellBlock( new Block[] { new TextBlock( "cell4" ) } ) } ) } );
block = tableParser.visit( source.getNextLine(), source );
assertEquals( block, expected );
@@ -80,7 +80,7 @@
expected =
new TableBlock( new Block[] { new TableRowBlock( new Block[] {
new TableCellHeaderBlock( new Block[] { new TextBlock( "cell1" ) } ),
- new TableCellHeaderBlock( new Block[] { new TextBlock( "cell2" ) } ), } ), } );
+ new TableCellHeaderBlock( new Block[] { new TextBlock( "cell2" ) } ) } ) } );
block = tableParser.visit( source.getNextLine(), source );
assertEquals( block, expected );
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/VerbatimTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/VerbatimTest.java?rev=728444&r1=728443&r2=728444&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/VerbatimTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/VerbatimTest.java Sun Dec 21 06:12:41 2008
@@ -65,7 +65,7 @@
expected =
new VerbatimBlock( new Block[] { new TextBlock( " hello, \n" ),
new TextBlock( " this is a verbatim text \n" ), new TextBlock( " which i would like to test \n" ),
- new TextBlock( " Thanks \n" ), } );
+ new TextBlock( " Thanks \n" ) } );
block = getVerbatimParser().visit( source.getNextLine(), source );
assertEquals( block, expected );
@@ -85,10 +85,10 @@
Block[] expected;
expected =
new Block[] {
- new ParagraphBlock( new Block[] { new TextBlock( "hello this is a paragraph" ), } ),
+ new ParagraphBlock( new Block[] { new TextBlock( "hello this is a paragraph" ) } ),
new VerbatimBlock( new Block[] { new TextBlock( " hello, \n" ),
new TextBlock( " this is a verbatim text \n" ),
- new TextBlock( " which i would like to test \n" ), new TextBlock( " Thanks \n" ), } ) };
+ new TextBlock( " which i would like to test \n" ), new TextBlock( " Thanks \n" ) } ) };
List block = twikiParser.parse( source );
assertTrue( Arrays.equals( block.toArray(), expected ) );
@@ -108,7 +108,7 @@
Block[] expected;
expected =
new Block[] { new SectionBlock( "foo", 2, new Block[] { new VerbatimBlock( new Block[] {
- new TextBlock( " hello, \n" ), new TextBlock( " Thanks \n" ), } ) } ), };
+ new TextBlock( " hello, \n" ), new TextBlock( " Thanks \n" ) } ) } ) };
List block = twikiParser.parse( source );
assertTrue( Arrays.equals( block.toArray(), expected ) );
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/WordsTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/WordsTest.java?rev=728444&r1=728443&r2=728444&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/WordsTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/WordsTest.java Sun Dec 21 06:12:41 2008
@@ -127,13 +127,13 @@
expected =
new Block[] { new TextBlock( "foo" ),
- new LinkBlock( "http://reference.com", new TextBlock( "text" ) ), new TextBlock( "bar" ), };
+ new LinkBlock( "http://reference.com", new TextBlock( "text" ) ), new TextBlock( "bar" ) };
blocks = (Block[]) textParser.parse( "foo[[http://reference.com][text]]bar" ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
expected =
new Block[] { new TextBlock( " foo " ),
- new LinkBlock( "http://reference.com", new TextBlock( "text" ) ), new TextBlock( " bar " ), };
+ new LinkBlock( "http://reference.com", new TextBlock( "text" ) ), new TextBlock( " bar " ) };
blocks = (Block[]) textParser.parse( " foo [[http://reference.com][text]] bar " ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
@@ -142,7 +142,7 @@
new LinkBlock( "http://www.apache.org/licenses/LICENSE-2.0",
new TextBlock( "Apache License, version 2.0" ) ),
new TextBlock( ". You can download it " ),
- new WikiWordBlock( "DoxiaDownload", new TextBlock( "here" ), resolver ), };
+ new WikiWordBlock( "DoxiaDownload", new TextBlock( "here" ), resolver ) };
blocks =
(Block[]) textParser.parse(
"[[http://www.apache.org/licenses/LICENSE-2.0]"
@@ -165,13 +165,13 @@
expected =
new Block[] { new TextBlock( "foo" ),
- new WikiWordBlock( "ReferenceLink", new TextBlock( "text" ), resolver ), new TextBlock( "bar" ), };
+ new WikiWordBlock( "ReferenceLink", new TextBlock( "text" ), resolver ), new TextBlock( "bar" ) };
blocks = (Block[]) textParser.parse( "foo[[referenceLink][text]]bar" ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
expected =
new Block[] { new TextBlock( " foo " ),
- new WikiWordBlock( "ReferenceLink", new TextBlock( "text" ), resolver ), new TextBlock( " bar " ), };
+ new WikiWordBlock( "ReferenceLink", new TextBlock( "text" ), resolver ), new TextBlock( " bar " ) };
blocks = (Block[]) textParser.parse( " foo [[reference link][text]] bar " ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
}
@@ -195,7 +195,7 @@
{
Block[] blocks, expected;
- expected = new Block[] { new TextBlock( " " ), new TextBlock( "WikiWord" ), new TextBlock( " " ), };
+ expected = new Block[] { new TextBlock( " " ), new TextBlock( "WikiWord" ), new TextBlock( " " ) };
blocks = (Block[]) textParser.parse( " !WikiWord " ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
@@ -211,24 +211,24 @@
{
Block[] blocks, expected;
- expected = new Block[] { new WikiWordBlock( "WikiSyntax", new TextBlock( "wiki syntax" ), resolver ), };
+ expected = new Block[] { new WikiWordBlock( "WikiSyntax", new TextBlock( "wiki syntax" ), resolver ) };
blocks = (Block[]) textParser.parse( "[[wiki syntax]]" ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
- expected = new Block[] { new TextBlock( "[[wiki syntax]]" ), };
+ expected = new Block[] { new TextBlock( "[[wiki syntax]]" ) };
blocks = (Block[]) textParser.parse( "![[wiki syntax]]" ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
expected =
new Block[] { new TextBlock( "foo" ),
new WikiWordBlock( "WikiSyntax", new TextBlock( "wiki syntax" ), resolver ),
- new TextBlock( "bar" ), };
+ new TextBlock( "bar" ) };
blocks = (Block[]) textParser.parse( "foo[[wiki syntax]]bar" ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
expected =
new Block[] { new TextBlock( "foo" ),
- new LinkBlock( "http://twiki.com", new TextBlock( "http://twiki.com" ) ), new TextBlock( "bar" ), };
+ new LinkBlock( "http://twiki.com", new TextBlock( "http://twiki.com" ) ), new TextBlock( "bar" ) };
blocks = (Block[]) textParser.parse( "foo[[http://twiki.com]]bar" ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
}
@@ -240,7 +240,7 @@
{
Block[] blocks, expected;
- expected = new Block[] { new LinkBlock( "mailto:a@z.com", new TextBlock( "Mail" ) ), };
+ expected = new Block[] { new LinkBlock( "mailto:a@z.com", new TextBlock( "Mail" ) ) };
blocks = (Block[]) textParser.parse( "[[mailto:a@z.com Mail]]" ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
}
@@ -252,17 +252,17 @@
{
Block[] blocks, expected;
- expected = new Block[] { new TextBlock( "mary has #anchor a little lamb" ), };
+ expected = new Block[] { new TextBlock( "mary has #anchor a little lamb" ) };
blocks = (Block[]) textParser.parse( "mary has #anchor a little lamb" ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
expected =
new Block[] { new TextBlock( "mary has " ), new AnchorBlock( "AnchorName" ),
- new TextBlock( " a little lamb" ), };
+ new TextBlock( " a little lamb" ) };
blocks = (Block[]) textParser.parse( "mary has #AnchorName a little lamb" ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
- expected = new Block[] { new TextBlock( "mary has #AnchorName1233 a little lamb" ), };
+ expected = new Block[] { new TextBlock( "mary has #AnchorName1233 a little lamb" ) };
blocks = (Block[]) textParser.parse( "mary has #AnchorName1233 a little lamb" ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
}
@@ -277,7 +277,7 @@
expected =
new Block[] { new TextBlock( "Go to " ),
new LinkBlock( "http://twiki.com", new TextBlock( "http://twiki.com" ) ),
- new TextBlock( " and ..." ), };
+ new TextBlock( " and ..." ) };
blocks = (Block[]) textParser.parse( "Go to http://twiki.com and ..." ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
}
@@ -288,7 +288,7 @@
Block[] blocks, expected;
expected =
- new Block[] { new LinkBlock( "http://twiki.org", new ImageBlock( "http://twiki.org/logo.png" ) ), };
+ new Block[] { new LinkBlock( "http://twiki.org", new ImageBlock( "http://twiki.org/logo.png" ) ) };
blocks = (Block[]) textParser.parse( "[[http://twiki.org][http://twiki.org/logo.png]]" ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
}
@@ -300,7 +300,7 @@
expected =
new Block[] { new TextBlock( "Go to " ), new ImageBlock( "http://twiki.com/image.png" ),
- new TextBlock( " thisisnotanimage.png and ..." ), };
+ new TextBlock( " thisisnotanimage.png and ..." ) };
blocks =
(Block[]) textParser.parse( "Go to http://twiki.com/image.png " + "thisisnotanimage.png and ..." )
.toArray( TOARRAY );
@@ -316,7 +316,7 @@
expected =
new Block[] { new TextBlock( "My summer house: " ), new ImageBlock( "images/summerhouse.png" ),
- new TextBlock( " isn't it great?!" ), };
+ new TextBlock( " isn't it great?!" ) };
blocks =
(Block[]) textParser
.parse(