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 lt...@apache.org on 2008/03/10 21:37:32 UTC
svn commit: r635683 - in /maven/doxia/doxia/trunk:
doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/
doxia-core/src/main/java/org/apache/maven/doxia/parser/
doxia-core/src/main/java/org/apache/maven/doxia/sink/
doxia-core/src/test/java/org...
Author: ltheussl
Date: Mon Mar 10 13:37:18 2008
New Revision: 635683
URL: http://svn.apache.org/viewvc?rev=635683&view=rev
Log:
Formatting, remove use of deprecated methods, unused imports, etc.
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/PipelineSink.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/ByLineReaderSourceTest.java
maven/doxia/doxia/trunk/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/PlexusLoggerWrapper.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Font.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BoldBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/HRuleBlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableCellBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlockParser.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/SectionTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TitleTest.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
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java Mon Mar 10 13:37:18 2008
@@ -98,7 +98,7 @@
try
{
- url = f.toURL();
+ url = f.toURI().toURL();
}
catch ( MalformedURLException e )
{
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java Mon Mar 10 13:37:18 2008
@@ -26,7 +26,6 @@
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
-import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -145,7 +144,7 @@
{
this.inFigure = true;
SinkEventAttributeSet atts = new SinkEventAttributeSet( attribs );
- atts.removeAttribute( SinkEventAttributes.CLASS );
+ atts.removeAttribute( SinkEventAttributeSet.CLASS );
sink.figure( atts );
}
}
@@ -163,7 +162,7 @@
{
verbatim();
- attribs.addAttribute( "boxed", "false");
+ attribs.addAttribute( SinkEventAttributeSet.BOXED, "false");
sink.verbatim( attribs );
}
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/PipelineSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/PipelineSink.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/PipelineSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/PipelineSink.java Mon Mar 10 13:37:18 2008
@@ -24,7 +24,6 @@
import java.lang.reflect.Proxy;
import java.util.List;
import java.util.Iterator;
-import java.util.ArrayList;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java Mon Mar 10 13:37:18 2008
@@ -21,7 +21,6 @@
import org.apache.maven.doxia.AbstractModuleTest;
import org.apache.maven.doxia.parser.Parser;
-import org.apache.maven.doxia.sink.Sink;
import java.io.CharArrayWriter;
import java.io.IOException;
Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/ByLineReaderSourceTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/ByLineReaderSourceTest.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/ByLineReaderSourceTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/util/ByLineReaderSourceTest.java Mon Mar 10 13:37:18 2008
@@ -22,7 +22,6 @@
import java.io.StringReader;
import org.apache.maven.doxia.parser.ParseException;
-import org.apache.maven.doxia.util.ByLineReaderSource;
import junit.framework.TestCase;
Modified: maven/doxia/doxia/trunk/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/PlexusLoggerWrapper.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/PlexusLoggerWrapper.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/PlexusLoggerWrapper.java (original)
+++ maven/doxia/doxia/trunk/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/PlexusLoggerWrapper.java Mon Mar 10 13:37:18 2008
@@ -19,8 +19,6 @@
* under the License.
*/
-import org.apache.maven.doxia.logging.Log;
-
import org.codehaus.plexus.logging.Logger;
/**
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java Mon Mar 10 13:37:18 2008
@@ -37,7 +37,6 @@
public class AptParserTest
extends AbstractParserTest
{
- private static final String EOL = System.getProperty( "line.separator" );
private AptParser parser;
@@ -140,6 +139,8 @@
/**
* Parses the test document test.apt and re-emits
* it into parser/test.apt.
+ * @throws java.io.IOException
+ * @throws org.apache.maven.doxia.parser.ParseException
*/
public void testTestDocument()
throws IOException, ParseException
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java Mon Mar 10 13:37:18 2008
@@ -63,11 +63,17 @@
throws Exception
{
if ( output != null )
+ {
output.close();
+ }
if ( reader != null )
+ {
reader.close();
+ }
if ( writer != null )
+ {
writer.close();
+ }
super.tearDown();
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java Mon Mar 10 13:37:18 2008
@@ -128,7 +128,6 @@
// same test with EOL
- String EOL = System.getProperty( "line.separator" );
text = "<para><command>word</command>" + EOL + "<emphasis>word</emphasis></para>";
sink.reset();
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java Mon Mar 10 13:37:18 2008
@@ -23,7 +23,6 @@
import java.util.Iterator;
-import org.apache.maven.doxia.module.fml.FmlParser;
import org.apache.maven.doxia.parser.AbstractParserTest;
import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.SinkEventElement;
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java Mon Mar 10 13:37:18 2008
@@ -21,7 +21,6 @@
import java.io.Writer;
-import org.apache.maven.doxia.module.latex.LatexSink;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.AbstractSinkTest;
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Font.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Font.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Font.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Font.java Mon Mar 10 13:37:18 2008
@@ -65,15 +65,15 @@
{
c = ' ';
}
- FontMetrics.CharMetrics metrics = this.metrics.charMetrics[c];
- width += metrics.wx;
- if ( metrics.ury > ascent )
+ FontMetrics.CharMetrics charMetrics = this.metrics.charMetrics[c];
+ width += charMetrics.wx;
+ if ( charMetrics.ury > ascent )
{
- ascent = metrics.ury;
+ ascent = charMetrics.ury;
}
- if ( metrics.lly < descent )
+ if ( charMetrics.lly < descent )
{
- descent = metrics.lly;
+ descent = charMetrics.lly;
}
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java Mon Mar 10 13:37:18 2008
@@ -587,15 +587,15 @@
private String getItemHeader()
{
- int numbering = ( (Integer) this.numbering.lastElement() ).intValue();
- int itemNumber = ( (Counter) this.itemNumber.lastElement() ).get();
+ int nmb = ( (Integer) this.numbering.lastElement() ).intValue();
+ int iNmb = ( (Counter) this.itemNumber.lastElement() ).get();
StringBuffer buf = new StringBuffer();
- switch ( numbering )
+ switch ( nmb )
{
case Sink.NUMBERING_DECIMAL:
default:
- buf.append( itemNumber );
+ buf.append( iNmb );
buf.append( ". " );
while ( buf.length() < 4 )
{
@@ -604,17 +604,17 @@
break;
case Sink.NUMBERING_LOWER_ALPHA:
- buf.append( AlphaNumerals.toString( itemNumber, true ) );
+ buf.append( AlphaNumerals.toString( iNmb, true ) );
buf.append( ") " );
break;
case Sink.NUMBERING_UPPER_ALPHA:
- buf.append( AlphaNumerals.toString( itemNumber, false ) );
+ buf.append( AlphaNumerals.toString( iNmb, false ) );
buf.append( ". " );
break;
case Sink.NUMBERING_LOWER_ROMAN:
- buf.append( RomanNumerals.toString( itemNumber, true ) );
+ buf.append( RomanNumerals.toString( iNmb, true ) );
buf.append( ") " );
while ( buf.length() < 6 )
{
@@ -623,7 +623,7 @@
break;
case Sink.NUMBERING_UPPER_ROMAN:
- buf.append( RomanNumerals.toString( itemNumber, false ) );
+ buf.append( RomanNumerals.toString( iNmb, false ) );
buf.append( ". " );
while ( buf.length() < 6 )
{
@@ -715,12 +715,12 @@
for ( int i = 0; i < table.rows.size(); ++i )
{
- Row row = (Row) table.rows.elementAt( i );
+ Row r = (Row) table.rows.elementAt( i );
writer.print( "\\trowd" );
writer.print( "\\trleft" + x0 );
writer.print( "\\trgaph" + CELL_HORIZONTAL_PAD );
- writer.println( "\\trrh" + row.height() );
+ writer.println( "\\trrh" + r.height() );
if ( table.grid )
{
@@ -748,27 +748,27 @@
for ( int j = 0; j < table.numColumns; ++j )
{
- if ( j >= row.cells.size() )
+ if ( j >= r.cells.size() )
{
break;
}
- Cell cell = (Cell) row.cells.elementAt( j );
+ Cell c = (Cell) r.cells.elementAt( j );
writer.print( "\\pard\\intbl" );
setJustification( table.justification[j] );
writer.println( "\\plain\\f0\\fs" + ( 2 * fontSize ) );
- for ( int k = 0; k < cell.lines.size(); ++k )
+ for ( int k = 0; k < c.lines.size(); ++k )
{
if ( k > 0 )
{
writer.println( "\\line" );
}
- Line line = (Line) cell.lines.elementAt( k );
+ Line l = (Line) c.lines.elementAt( k );
- for ( int n = 0; n < line.items.size(); ++n )
+ for ( int n = 0; n < l.items.size(); ++n )
{
- Item item = (Item) line.items.elementAt( n );
+ Item item = (Item) l.items.elementAt( n );
writer.print( "{" );
setStyle( item.style );
writer.println( escape( item.text ) );
@@ -1020,16 +1020,16 @@
bytesPerLine = 4 * ( ( 3 * srcWidth + 3 ) / 4 );
dib.bitmap = new byte[srcHeight * bytesPerLine];
- byte[] line = new byte[3 * srcWidth];
+ byte[] l = new byte[3 * srcWidth];
for ( int i = ( srcHeight - 1 ); i >= 0; --i )
{
- ppm.read( line, 0, line.length );
- for ( int j = 0, k = ( i * bytesPerLine ); j < line.length; j += 3 )
+ ppm.read( l, 0, l.length );
+ for ( int j = 0, k = ( i * bytesPerLine ); j < l.length; j += 3 )
{
// component order = BGR
- dib.bitmap[k++] = line[j + 2];
- dib.bitmap[k++] = line[j + 1];
- dib.bitmap[k++] = line[j];
+ dib.bitmap[k++] = l[j + 2];
+ dib.bitmap[k++] = l[j + 1];
+ dib.bitmap[k++] = l[j];
}
}
}
@@ -1045,15 +1045,15 @@
colors.addElement( Color.white );
colors.addElement( Color.black );
- byte[] line = new byte[3 * srcWidth];
+ byte[] l = new byte[3 * srcWidth];
for ( int i = ( srcHeight - 1 ); i >= 0; --i )
{
- ppm.read( line, 0, line.length );
- for ( int j = 0, k = ( i * bytesPerLine ); j < line.length; )
+ ppm.read( l, 0, l.length );
+ for ( int j = 0, k = ( i * bytesPerLine ); j < l.length; )
{
- int r = (int) line[j++] & 0xff;
- int g = (int) line[j++] & 0xff;
- int b = (int) line[j++] & 0xff;
+ int r = (int) l[j++] & 0xff;
+ int g = (int) l[j++] & 0xff;
+ int b = (int) l[j++] & 0xff;
Color color = new Color( r, g, b );
int index = colors.indexOf( color );
if ( index < 0 )
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BoldBlock.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/parser/BoldBlock.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BoldBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BoldBlock.java Mon Mar 10 13:37:18 2008
@@ -27,7 +27,7 @@
* @author Juan F. Codagnone
* @version $Id$
*/
-public class BoldBlock extends AbstractFatherBlock
+class BoldBlock extends AbstractFatherBlock
{
/**
* Creates the BoldBlock.
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextParser.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/parser/FormatedTextParser.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextParser.java Mon Mar 10 13:37:18 2008
@@ -1,5 +1,10 @@
package org.apache.maven.doxia.module.twiki.parser;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,7 +24,7 @@
* under the License.
*/
-import java.util.*;
+
/**
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.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/parser/GenericListBlockParser.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/GenericListBlockParser.java Mon Mar 10 13:37:18 2008
@@ -73,7 +73,9 @@
return ret;
}
- /** {@inheritDoc} */
+ /** {@inheritDoc}
+ * @throws org.apache.maven.doxia.parser.ParseException
+ */
public final Block visit( final String line, final ByLineSource source )
throws ParseException
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/HRuleBlockParser.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/parser/HRuleBlockParser.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/HRuleBlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/HRuleBlockParser.java Mon Mar 10 13:37:18 2008
@@ -59,7 +59,9 @@
return ret;
}
- /** {@inheritDoc} */
+ /** {@inheritDoc}
+ * @throws org.apache.maven.doxia.parser.ParseException
+ */
public final Block visit( final String line, final ByLineSource source )
throws ParseException
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.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/parser/ParagraphBlockParser.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlockParser.java Mon Mar 10 13:37:18 2008
@@ -79,7 +79,9 @@
&& !verbatimParser.accept( line );
}
- /** {@inheritDoc} */
+ /** {@inheritDoc}
+ * @throws org.apache.maven.doxia.parser.ParseException
+ */
public final Block visit( final String line, final ByLineSource source )
throws ParseException
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlockParser.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/parser/SectionBlockParser.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlockParser.java Mon Mar 10 13:37:18 2008
@@ -53,13 +53,17 @@
/** {@link VerbatimBlockParser} */
private VerbatimBlockParser verbatimBlockParser;
- /** {@inheritDoc} */
+ /** {@inheritDoc}
+ * @param s the String.
+ */
public final boolean accept( final String s )
{
return HEADER_DA.matcher( s ).lookingAt();
}
- /** {@inheritDoc} */
+ /** {@inheritDoc}
+ * @throws org.apache.maven.doxia.parser.ParseException
+ */
public final Block visit( final String line, final ByLineSource source )
throws ParseException
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlock.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/parser/TableBlock.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlock.java Mon Mar 10 13:37:18 2008
@@ -28,7 +28,7 @@
* @author Juan F. Codagnone
* @version $Id$
*/
-public class TableBlock extends AbstractFatherBlock
+class TableBlock extends AbstractFatherBlock
{
/**
* Creates the TableBlock.
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.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/parser/TableBlockParser.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableBlockParser.java Mon Mar 10 13:37:18 2008
@@ -51,7 +51,9 @@
return TABLE_PATTERN.matcher( line ).lookingAt();
}
- /** {@inheritDoc} */
+ /** {@inheritDoc}
+ * @throws org.apache.maven.doxia.parser.ParseException
+ */
public final Block visit( final String line, final ByLineSource source )
throws ParseException
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableCellBlock.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/parser/TableCellBlock.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableCellBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableCellBlock.java Mon Mar 10 13:37:18 2008
@@ -28,7 +28,7 @@
* @author Juan F. Codagnone
* @version $Id$
*/
-public class TableCellBlock extends AbstractFatherBlock
+class TableCellBlock extends AbstractFatherBlock
{
/**
* Creates the TableCellBlock.
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.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/parser/TextParser.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextParser.java Mon Mar 10 13:37:18 2008
@@ -165,7 +165,7 @@
}
else
{
- ret.add( new LinkBlock( url, url ) );
+ ret.add( new LinkBlock( url, new TextBlock( url ) ) );
}
ret.addAll( parse( line.substring(
urlMatcher.end(), line.length() ) ) );
@@ -213,7 +213,7 @@
else
{
ret.add( new LinkBlock( s.substring( 0, i ),
- s.substring( i ).trim() ) );
+ new TextBlock( s.substring( i ).trim() ) ) );
}
}
else
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlockParser.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/parser/VerbatimBlockParser.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlockParser.java Mon Mar 10 13:37:18 2008
@@ -50,7 +50,9 @@
return VERBATIM_START_PATTERN.matcher( line ).lookingAt();
}
- /** {@inheritDoc} */
+ /** {@inheritDoc}
+ * @throws org.apache.maven.doxia.parser.ParseException
+ */
public final Block visit( final String line, final ByLineSource source )
throws ParseException
{
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=635683&r1=635682&r2=635683&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 Mon Mar 10 13:37:18 2008
@@ -54,13 +54,13 @@
new WikiWordBlock( "bar", resolver ),
new WikiWordBlock( "foo", resolver ) );
- testEquals( new WikiWordBlock( "bar", "text", resolver ),
- new WikiWordBlock( "bar", "text", resolver ),
+ testEquals( new WikiWordBlock( "bar", new TextBlock( "text" ), resolver ),
+ new WikiWordBlock( "bar", new TextBlock( "text" ), resolver ),
new WikiWordBlock( "bar", resolver ) );
- testEquals( new WikiWordBlock( "bar", "text", resolver ),
- new WikiWordBlock( "bar", "text", resolver ),
- new WikiWordBlock( "text", "bar", resolver ) );
+ testEquals( new WikiWordBlock( "bar", new TextBlock( "text" ), resolver ),
+ new WikiWordBlock( "bar", new TextBlock( "text" ), resolver ),
+ new WikiWordBlock( "text", new TextBlock( "bar" ), resolver ) );
}
@@ -69,8 +69,9 @@
*/
public final void testLinkBlockEquals()
{
- testEquals( new LinkBlock( "foo", "bar" ), new LinkBlock( "foo", "bar" ),
- new LinkBlock( "bar", "foo" ) );
+ testEquals( new LinkBlock( "foo", new TextBlock( "bar" ) ),
+ new LinkBlock( "foo", new TextBlock( "bar" ) ),
+ new LinkBlock( "bar", new TextBlock( "foo" ) ) );
}
/**
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=635683&r1=635682&r2=635683&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 Mon Mar 10 13:37:18 2008
@@ -95,6 +95,7 @@
}
/**
+ * @throws java.lang.Exception
* @see SectionBlockParser
*/
public final void testSectionParser() throws Exception
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TitleTest.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/TitleTest.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TitleTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TitleTest.java Mon Mar 10 13:37:18 2008
@@ -18,7 +18,6 @@
*/
package org.apache.maven.doxia.module.twiki.parser;
-import java.io.Reader;
import java.io.StringReader;
import org.apache.maven.doxia.module.twiki.TWikiParser;
@@ -41,10 +40,9 @@
final ByLineSource source = new ByLineReaderSource(
new StringReader( "---++ Test\n hello world" ) );
- final TWikiParser twikiParser = new TWikiParser();
+ final TWikiParser parser = new TWikiParser();
- assertEquals("Test", twikiParser.getTitle( twikiParser.parse(source),
- source ) );
+ assertEquals( "Test", parser.getTitle( parser.parse(source), source ) );
}
public void testNoSectionTitle() throws Exception
@@ -53,10 +51,9 @@
new ByLineReaderSource(
new StringReader( "hello world" )), "testpage" );
- final TWikiParser twikiParser = new TWikiParser();
+ final TWikiParser parser = new TWikiParser();
- assertEquals("testpage", twikiParser.getTitle( twikiParser.parse(source),
- source ) );
+ assertEquals( "testpage", parser.getTitle( parser.parse(source), source ) );
}
public void testNoSectionTwikiExtensionTitle() throws Exception
@@ -65,10 +62,9 @@
new ByLineReaderSource(
new StringReader( "hello world" )), "testpage.twiki" );
- final TWikiParser twikiParser = new TWikiParser();
+ final TWikiParser parser = new TWikiParser();
- assertEquals("testpage", twikiParser.getTitle( twikiParser.parse(source),
- source ) );
+ assertEquals( "testpage", parser.getTitle( parser.parse(source), source ) );
}
}
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=635683&r1=635682&r2=635683&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 Mon Mar 10 13:37:18 2008
@@ -110,7 +110,9 @@
}
- /** test */
+ /** test
+ * @throws org.apache.maven.doxia.parser.ParseException
+ */
public void testVerbatimAfterSection() throws ParseException
{
final StringReader sw = new StringReader( "---++ fooo\n"
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=635683&r1=635682&r2=635683&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 Mon Mar 10 13:37:18 2008
@@ -124,14 +124,14 @@
{
Block [] blocks, expected;
- expected = new Block[]{new LinkBlock( "http://reference.com", "text" )};
+ expected = new Block[]{new LinkBlock( "http://reference.com", new TextBlock( "text" ) )};
blocks = (Block[]) textParser.parse( "[[http://reference.com][text]]" ).
toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
expected = new Block[]{
new TextBlock( "foo" ),
- new LinkBlock( "http://reference.com", "text" ),
+ new LinkBlock( "http://reference.com", new TextBlock( "text" ) ),
new TextBlock( "bar" ),
};
blocks = (Block[]) textParser.parse( "foo[[http://reference.com][text]]bar" ).
@@ -140,7 +140,7 @@
expected = new Block[]{
new TextBlock( " foo " ),
- new LinkBlock( "http://reference.com", "text" ),
+ new LinkBlock( "http://reference.com", new TextBlock( "text" ) ),
new TextBlock( " bar " ),
};
blocks = (Block[]) textParser.
@@ -149,9 +149,9 @@
expected = new Block[]{
new LinkBlock( "http://www.apache.org/licenses/LICENSE-2.0",
- "Apache License, version 2.0" ),
+ new TextBlock( "Apache License, version 2.0" ) ),
new TextBlock( ". You can download it " ),
- new WikiWordBlock( "DoxiaDownload", "here", resolver ),
+ new WikiWordBlock( "DoxiaDownload", new TextBlock( "here" ), resolver ),
};
blocks = (Block[]) textParser.
parse( "[[http://www.apache.org/licenses/LICENSE-2.0]"
@@ -168,14 +168,14 @@
{
Block [] blocks, expected;
- expected = new Block[]{new WikiWordBlock( "Reference", "text", resolver )};
+ expected = new Block[]{new WikiWordBlock( "Reference", new TextBlock( "text" ), resolver )};
blocks = (Block[]) textParser.parse( "[[reference][text]]" ).
toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
expected = new Block[]{
new TextBlock( "foo" ),
- new WikiWordBlock( "ReferenceLink", "text", resolver ),
+ new WikiWordBlock( "ReferenceLink", new TextBlock( "text" ), resolver ),
new TextBlock( "bar" ),
};
blocks = (Block[]) textParser.parse( "foo[[referenceLink][text]]bar" ).
@@ -184,7 +184,7 @@
expected = new Block[]{
new TextBlock( " foo " ),
- new WikiWordBlock( "ReferenceLink", "text", resolver ),
+ new WikiWordBlock( "ReferenceLink", new TextBlock( "text" ), resolver ),
new TextBlock( " bar " ),
};
blocks = (Block[]) textParser.
@@ -232,7 +232,7 @@
Block [] blocks, expected;
expected = new Block[]{
- new WikiWordBlock( "WikiSyntax", "wiki syntax", resolver ),
+ new WikiWordBlock( "WikiSyntax", new TextBlock( "wiki syntax" ), resolver ),
};
blocks = (Block[]) textParser.parse( "[[wiki syntax]]" ).toArray( TOARRAY );
assertTrue( Arrays.equals( expected, blocks ) );
@@ -245,7 +245,7 @@
expected = new Block[]{
new TextBlock( "foo" ),
- new WikiWordBlock( "WikiSyntax", "wiki syntax", resolver ),
+ new WikiWordBlock( "WikiSyntax", new TextBlock( "wiki syntax" ), resolver ),
new TextBlock( "bar" ),
};
blocks = (Block[]) textParser.parse( "foo[[wiki syntax]]bar" ).toArray( TOARRAY );
@@ -253,7 +253,7 @@
expected = new Block[]{
new TextBlock( "foo" ),
- new LinkBlock( "http://twiki.com", "http://twiki.com" ),
+ new LinkBlock( "http://twiki.com", new TextBlock( "http://twiki.com" ) ),
new TextBlock( "bar" ),
};
blocks = (Block[]) textParser.parse( "foo[[http://twiki.com]]bar" ).toArray( TOARRAY );
@@ -268,7 +268,7 @@
Block [] blocks, expected;
expected = new Block[]{
- new LinkBlock( "mailto:a@z.com", "Mail" ),
+ 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 ) );
@@ -314,7 +314,7 @@
expected = new Block[]{
new TextBlock( "Go to " ),
- new LinkBlock( "http://twiki.com", "http://twiki.com" ),
+ new LinkBlock( "http://twiki.com", new TextBlock( "http://twiki.com" ) ),
new TextBlock( " and ..." ),
};
blocks = (Block[]) textParser.parse( "Go to http://twiki.com and ..." ).toArray(
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlIdentityTest.java Mon Mar 10 13:37:18 2008
@@ -19,13 +19,9 @@
* under the License.
*/
-import java.io.File;
import java.io.Writer;
-import java.util.HashMap;
-
import org.apache.maven.doxia.module.AbstractIdentityTest;
-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java?rev=635683&r1=635682&r2=635683&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java Mon Mar 10 13:37:18 2008
@@ -19,13 +19,10 @@
* under the License.
*/
-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
import org.apache.maven.doxia.sink.AbstractSinkTest;
import org.apache.maven.doxia.sink.Sink;
-import java.io.File;
import java.io.Writer;
-import java.util.HashMap;
/**
* @author Jason van Zyl