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 2009/04/09 20:19:58 UTC
svn commit: r763762 - in /maven/doxia/doxia/trunk:
doxia-core/src/main/java/org/apache/maven/doxia/index/
doxia-core/src/main/java/org/apache/maven/doxia/sink/
doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence...
Author: ltheussl
Date: Thu Apr 9 18:19:56 2009
New Revision: 763762
URL: http://svn.apache.org/viewvc?rev=763762&view=rev
Log:
Checkstyle fixes, no code changes
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/PipelineSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/AbstractFatherBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/AnchorBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BoldBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/TextBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListItemBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextHeader.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AnchorBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/LinkBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ListBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ListItemBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/NumeratedListBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlock.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/TextBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/UnorderedListBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/XHTMLBlock.java
maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexingSink.java Thu Apr 9 18:19:56 2009
@@ -208,6 +208,8 @@
case TYPE_DEFINED_TERM:
case TYPE_FIGURE:
case TYPE_TABLE:
+ default:
+ break;
}
type = 0;
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=763762&r1=763761&r2=763762&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 Thu Apr 9 18:19:56 2009
@@ -20,6 +20,7 @@
*/
import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
@@ -61,9 +62,12 @@
* {@inheritDoc}
*
* Invoke a Method on this PipelineSink.
+ *
+ * @throws IllegalAccessException if any.
+ * @throws InvocationTargetException if any.
*/
public Object invoke( Object proxy, Method method, Object[] args )
- throws Throwable
+ throws IllegalAccessException, InvocationTargetException
{
for ( Iterator it = pipeline.iterator(); it.hasNext(); )
{
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java Thu Apr 9 18:19:56 2009
@@ -108,7 +108,7 @@
* sink.tableRow();
* </pre>
* */
- boolean tableRows = false;
+ private boolean tableRows = false;
// ----------------------------------------------------------------------
// Constructor
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSink.java Thu Apr 9 18:19:56 2009
@@ -94,7 +94,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void anchor_()
{
@@ -103,7 +103,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void author()
{
@@ -118,7 +118,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void author_()
{
@@ -127,7 +127,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void body()
{
@@ -142,7 +142,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void body_()
{
@@ -163,7 +163,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void comment( String comment )
{
@@ -179,7 +179,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void date()
{
@@ -194,7 +194,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void date_()
{
@@ -215,7 +215,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definedTerm_()
{
@@ -224,7 +224,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definition()
{
@@ -233,7 +233,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definition( SinkEventAttributes attributes )
{
@@ -242,7 +242,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definition_()
{
@@ -251,7 +251,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definitionList()
{
@@ -260,7 +260,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definitionList( SinkEventAttributes attributes )
{
@@ -269,7 +269,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definitionList_()
{
@@ -278,7 +278,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definitionListItem()
{
@@ -287,7 +287,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definitionListItem( SinkEventAttributes attributes )
{
@@ -296,7 +296,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definitionListItem_()
{
@@ -305,7 +305,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void figure()
{
@@ -320,7 +320,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void figure_()
{
@@ -329,7 +329,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void figureCaption()
{
@@ -344,7 +344,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void figureCaption_()
{
@@ -396,7 +396,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void horizontalRule()
{
@@ -508,7 +508,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void nonBreakingSpace()
{
@@ -570,7 +570,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void pageBreak()
{
@@ -579,7 +579,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void paragraph()
{
@@ -601,7 +601,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void rawText( String text )
{
@@ -610,7 +610,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section( int level, SinkEventAttributes attributes )
{
@@ -619,7 +619,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section1()
{
@@ -628,7 +628,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section1_()
{
@@ -637,7 +637,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section2()
{
@@ -646,7 +646,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section2_()
{
@@ -655,7 +655,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section3()
{
@@ -664,7 +664,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section3_()
{
@@ -673,7 +673,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section4()
{
@@ -682,7 +682,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section4_()
{
@@ -691,7 +691,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section5()
{
@@ -700,7 +700,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section5_()
{
@@ -709,7 +709,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section_( int level )
{
@@ -718,7 +718,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void sectionTitle()
{
@@ -796,7 +796,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void sectionTitle_()
{
@@ -833,7 +833,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void tableCaption()
{
@@ -848,7 +848,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void tableCaption_()
{
@@ -930,7 +930,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void tableRows( int[] justification, boolean grid )
{
@@ -939,7 +939,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void tableRows_()
{
@@ -975,7 +975,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void title()
{
@@ -990,7 +990,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void title_()
{
@@ -999,7 +999,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void unknown( String name, Object[] requiredParams, SinkEventAttributes attributes )
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/AbstractFatherBlock.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/AbstractFatherBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/AbstractFatherBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/AbstractFatherBlock.java Thu Apr 9 18:19:56 2009
@@ -37,21 +37,21 @@
/**
* <p>before</p>
*
- * @param sink
+ * @param sink the Sink to receive events.
*/
public abstract void before( Sink sink );
/**
* <p>after</p>
*
- * @param sink
+ * @param sink the Sink to receive events.
*/
public abstract void after( Sink sink );
/**
* <p>Constructor for AbstractFatherBlock.</p>
*
- * @param childBlocks
+ * @param childBlocks the child blocks.
*/
public AbstractFatherBlock( List childBlocks )
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/AnchorBlock.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/AnchorBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/AnchorBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/AnchorBlock.java Thu Apr 9 18:19:56 2009
@@ -29,7 +29,7 @@
{
private String name;
- AnchorBlock( String name ) throws IllegalArgumentException
+ AnchorBlock( String name )
{
if ( name == null )
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BlockParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BlockParser.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BlockParser.java Thu Apr 9 18:19:56 2009
@@ -20,7 +20,6 @@
*/
import org.apache.maven.doxia.util.ByLineSource;
-import org.apache.maven.doxia.module.confluence.parser.Block;
import org.apache.maven.doxia.parser.ParseException;
/**
@@ -33,18 +32,18 @@
/**
* <p>accept</p>
*
- * @param line
- * @param source
- * @return boolean
+ * @param line the line.
+ * @param source the source.
+ * @return boolean true if valid.
*/
boolean accept( String line, ByLineSource source );
/**
* <p>visit</p>
*
- * @param line
- * @param source
- * @return boolean
+ * @param line the line.
+ * @param source the source.
+ * @return boolean true if valid.
* @throws org.apache.maven.doxia.parser.ParseException if any
*/
Block visit( String line, ByLineSource source ) throws ParseException;
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BoldBlock.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BoldBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BoldBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/BoldBlock.java Thu Apr 9 18:19:56 2009
@@ -34,7 +34,7 @@
/**
* <p>Constructor for BoldBlock.</p>
*
- * @param childBlocks
+ * @param childBlocks the child blocks.
*/
public BoldBlock( List childBlocks )
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java Thu Apr 9 18:19:56 2009
@@ -52,7 +52,7 @@
/**
* <p>Constructor for ChildBlocksBuilder.</p>
*
- * @param input
+ * @param input the input.
*/
public ChildBlocksBuilder( String input )
{
@@ -229,9 +229,9 @@
private List getChildren( StringBuffer buffer, List currentBlocks )
{
- String text = buffer.toString().trim();
+ String txt = buffer.toString().trim();
- if ( currentBlocks.isEmpty() && StringUtils.isEmpty( text ) )
+ if ( currentBlocks.isEmpty() && StringUtils.isEmpty( txt ) )
{
return new ArrayList();
}
@@ -243,12 +243,12 @@
list.addAll( currentBlocks );
}
- if ( StringUtils.isEmpty( text ) )
+ if ( StringUtils.isEmpty( txt ) )
{
return list;
}
- list.add( new TextBlock( text ) );
+ list.add( new TextBlock( txt ) );
return list;
}
@@ -258,18 +258,18 @@
return input.length() > i + 1 ? input.charAt( i + 1 ) : '\0';
}
- private StringBuffer addTextBlockIfNecessary( List blocks, List specialBlocks, StringBuffer text )
+ private StringBuffer addTextBlockIfNecessary( List blcks, List specialBlocks, StringBuffer txt )
{
- if ( text.length() == 0 )
+ if ( txt.length() == 0 )
{
- return text;
+ return txt;
}
- TextBlock textBlock = new TextBlock( text.toString() );
+ TextBlock textBlock = new TextBlock( txt.toString() );
if ( !insideBold && !insideItalic && !insideMonospaced )
{
- blocks.add( textBlock );
+ blcks.add( textBlock );
}
else
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java Thu Apr 9 18:19:56 2009
@@ -32,7 +32,6 @@
private String text;
LinkBlock( String reference, String text )
- throws IllegalArgumentException
{
if ( reference == null || text == null )
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/TextBlock.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/TextBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/TextBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/TextBlock.java Thu Apr 9 18:19:56 2009
@@ -35,7 +35,7 @@
/**
* <p>Constructor for TextBlock.</p>
*
- * @param text
+ * @param text the text.
*/
public TextBlock( String text )
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListItemBlock.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListItemBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListItemBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListItemBlock.java Thu Apr 9 18:19:56 2009
@@ -33,13 +33,11 @@
private ListBlock innerList;
ListItemBlock( List blocks )
- throws IllegalArgumentException
{
this( blocks, null );
}
ListItemBlock( List blocks, ListBlock innerList )
- throws IllegalArgumentException
{
super( blocks );
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java Thu Apr 9 18:19:56 2009
@@ -28,7 +28,7 @@
*
* @version $Id$
*/
-public class NumberedListBlock
+class NumberedListBlock
extends ListBlock
{
/**
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/TreeListBuilder.java Thu Apr 9 18:19:56 2009
@@ -37,7 +37,6 @@
private TreeComponent current;
TreeListBuilder()
- throws IllegalArgumentException
{
root = new TreeComponent( null, "root", 0 );
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlock.java Thu Apr 9 18:19:56 2009
@@ -49,7 +49,7 @@
sink.table_();
}
- private final int[] getJustification()
+ private int[] getJustification()
{
final AbstractFatherBlock b = ( (AbstractFatherBlock) getBlocks().get( 0 ) );
int[] justification = new int[b.getBlocks().size()];
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java Thu Apr 9 18:19:56 2009
@@ -51,22 +51,6 @@
extends AbstractXmlSink
implements DocbookMarkup
{
- /** DocBook V4.4 SGML public id: "-//OASIS//DTD DocBook V4.4//EN"
- * @deprecated since 1.1, use {@link DocbookMarkup#DEFAULT_SGML_PUBLIC_ID} instead of. */
- public static final String DEFAULT_SGML_PUBLIC_ID = DocbookMarkup.DEFAULT_SGML_PUBLIC_ID;
-
- /** DocBook XML V4.4 XML public id: "-//OASIS//DTD DocBook XML V4.4//EN"
- * @deprecated since 1.1, use {@link DocbookMarkup#DEFAULT_XML_PUBLIC_ID} instead of. */
- public static final String DEFAULT_XML_PUBLIC_ID = DocbookMarkup.DEFAULT_XML_PUBLIC_ID;
-
- /** DocBook XML V4.4 XML system id: "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
- * @deprecated since 1.1, use {@link DocbookMarkup#DEFAULT_XML_SYSTEM_ID} instead of. */
- public static final String DEFAULT_XML_SYSTEM_ID = DocbookMarkup.DEFAULT_XML_SYSTEM_ID;
-
- /** DocBook XML V4.4 SGML system id: "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
- * @deprecated since 1.1, use {@link DocbookMarkup#DEFAULT_SGML_SYSTEM_ID} instead of. */
- public static final String DEFAULT_SGML_SYSTEM_ID = DocbookMarkup.DEFAULT_SGML_SYSTEM_ID;
-
/** The output writer. */
private PrintWriter out;
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java Thu Apr 9 18:19:56 2009
@@ -67,6 +67,13 @@
/** A default Black color definition */
public static final int DEFAULT_FONT_COLOR_BLUE = Color.BLACK.getBlue();
+ private static final int SECTION_FONT_SIZE_0 = 24;
+ private static final int SECTION_FONT_SIZE_1 = 22;
+ private static final int SECTION_FONT_SIZE_2 = 20;
+ private static final int SECTION_FONT_SIZE_3 = 18;
+ private static final int SECTION_FONT_SIZE_4 = 16;
+ private static final int SECTION_FONT_SIZE_DEFAULT = 14;
+
private boolean monoSpaced = false;
private float currentSize = 12;
@@ -283,7 +290,7 @@
}
/**
- * Get a section font depending the section number.
+ * Get a section font size depending the section number.
* <dl>
* <dt>0</dt>
* <dd>Chapter: font size = 24</dd>
@@ -300,40 +307,40 @@
* </dl>
*
* @param sectionNumber a section number
- * @return a font
+ * @return a font size.
*/
public static int getSectionFontSize( int sectionNumber )
{
switch ( sectionNumber )
{
case 0:
- return 24;
+ return SECTION_FONT_SIZE_0;
case 1:
- return 22;
+ return SECTION_FONT_SIZE_1;
case 2:
- return 20;
+ return SECTION_FONT_SIZE_2;
case 3:
- return 18;
+ return SECTION_FONT_SIZE_3;
case 4:
- return 16;
+ return SECTION_FONT_SIZE_4;
case 5:
default:
- return 14;
+ return SECTION_FONT_SIZE_DEFAULT;
}
}
/**
* Convenience method to get a defined MonoSpaced font depending the wanted style and size.
*
- * @param style
- * @param size
- * @param color
- * @return a font
+ * @param style the font style.
+ * @param size the font size.
+ * @param color the font color.
+ * @return a font the font.
*/
public static Font getMonoSpacedFont( int style, float size, Color color )
{
@@ -350,10 +357,10 @@
/**
* Convenience method to get a defined font depending the wanted style and size.
*
- * @param style
- * @param size
- * @param color
- * @return a font
+ * @param style the font style.
+ * @param size the font size.
+ * @param color the font color.
+ * @return a font the font.
*/
public static Font getFont( int style, float size, Color color )
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextHeader.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextHeader.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextHeader.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextHeader.java Thu Apr 9 18:19:56 2009
@@ -19,6 +19,9 @@
* under the License.
*/
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
import java.util.Date;
/**
@@ -46,7 +49,7 @@
/**
* Add a title to the Document
*
- * @param title1
+ * @param title1 the title.
*/
public final void setTitle( String title1 )
{
@@ -71,7 +74,7 @@
/**
* Add a new author
*
- * @param author
+ * @param author the author.
*/
public void addAuthor( String author )
{
@@ -111,9 +114,9 @@
{
try
{
- this.date = new Date( date1 );
+ this.date = new SimpleDateFormat().parse( date1 );
}
- catch ( IllegalArgumentException e )
+ catch ( ParseException e )
{
this.date = new Date();
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java Thu Apr 9 18:19:56 2009
@@ -106,7 +106,7 @@
/**
* <p>Constructor for ITextSink.</p>
*
- * @param writer
+ * @param writer the writer.
*/
protected ITextSink( Writer writer )
{
@@ -116,8 +116,8 @@
/**
* <p>Constructor for ITextSink.</p>
*
- * @param writer
- * @param encoding
+ * @param writer the writer.
+ * @param encoding the encoding.
* @since 1.1
*/
protected ITextSink( Writer writer, String encoding )
@@ -131,7 +131,7 @@
/**
* <p>Constructor for ITextSink.</p>
*
- * @param xmlWriter
+ * @param xmlWriter a pretty-printing xml writer.
*/
protected ITextSink( PrettyPrintXMLWriter xmlWriter )
{
@@ -157,7 +157,7 @@
/**
* Set a new class loader
*
- * @param cl
+ * @param cl the class loader.
*/
public void setClassLoader( ClassLoader cl )
{
@@ -278,7 +278,9 @@
writeAddAttribute( ElementTags.RED, ITextFont.DEFAULT_FONT_COLOR_RED );
writeAddAttribute( ElementTags.ALIGN, ElementTags.ALIGN_CENTER );
-// startChunk( ITextFont.DEFAULT_FONT_NAME, ITextFont.getSectionFontSize( 0 ), ITextFont.BOLD, ITextFont.DEFAULT_FONT_COLOR_BLUE, ITextFont.DEFAULT_FONT_COLOR_GREEN, ITextFont.DEFAULT_FONT_COLOR_RED, "top" );
+// startChunk( ITextFont.DEFAULT_FONT_NAME, ITextFont.getSectionFontSize( 0 ),
+// ITextFont.BOLD, ITextFont.DEFAULT_FONT_COLOR_BLUE, ITextFont.DEFAULT_FONT_COLOR_GREEN,
+// ITextFont.DEFAULT_FONT_COLOR_RED, "top" );
writeStartElement( ElementTags.CHUNK );
writeAddAttribute( ElementTags.FONT, ITextFont.DEFAULT_FONT_NAME );
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java Thu Apr 9 18:19:56 2009
@@ -107,7 +107,6 @@
*
* @param is the <CODE>InputStream</CODE> from which the XML is read.
* @param os the <CODE>OutputStream</CODE> to which the result as Pdf is written.
- * @throws RuntimeException if any
* @see com.lowagie.text.xml.XmlToPdf
*/
public static void writePdf( InputStream is, OutputStream os )
@@ -130,7 +129,6 @@
*
* @param is the <CODE>InputStream</CODE> from which the XML is read.
* @param os the <CODE>OutputStream</CODE> to which the result as RTF is written.
- * @throws RuntimeException if any
* @see com.lowagie.text.xml.XmlToRtf
*/
public static void writeRtf( InputStream is, OutputStream os )
@@ -152,7 +150,6 @@
*
* @param is the <CODE>InputStream</CODE> from which the XML is read.
* @param os the <CODE>OutputStream</CODE> to which the result as Html is written.
- * @throws RuntimeException if any
* @see com.lowagie.text.xml.XmlToHtml
*/
public static void writeHtml( InputStream is, OutputStream os )
@@ -167,4 +164,9 @@
throw new RuntimeException( "DocumentException : " + e.getMessage() );
}
}
+
+ private ITextUtil()
+ {
+ // private
+ }
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java Thu Apr 9 18:19:56 2009
@@ -677,6 +677,8 @@
case Sink.JUSTIFY_RIGHT:
justif.append( 'r' );
break;
+ default:
+ break;
}
}
if ( grid )
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.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/TWikiSink.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java Thu Apr 9 18:19:56 2009
@@ -96,7 +96,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void anchor_()
{
@@ -105,7 +105,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void author()
{
@@ -120,7 +120,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void author_()
{
@@ -129,7 +129,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void body()
{
@@ -144,7 +144,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void body_()
{
@@ -171,7 +171,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void comment( String comment )
{
@@ -187,7 +187,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void date()
{
@@ -202,7 +202,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void date_()
{
@@ -211,7 +211,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definedTerm()
{
@@ -226,7 +226,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definedTerm_()
{
@@ -253,7 +253,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definitionList()
{
@@ -268,7 +268,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definitionList_()
{
@@ -289,7 +289,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void definitionListItem_()
{
@@ -310,7 +310,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void figure_()
{
@@ -319,7 +319,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void figureCaption()
{
@@ -334,7 +334,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void figureCaption_()
{
@@ -425,7 +425,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void lineBreak()
{
@@ -531,7 +531,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void nonBreakingSpace()
{
@@ -602,7 +602,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void pageBreak()
{
@@ -611,7 +611,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void paragraph()
{
@@ -633,7 +633,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void rawText( String text )
{
@@ -642,7 +642,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section( int level, SinkEventAttributes attributes )
{
@@ -651,7 +651,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section1()
{
@@ -660,7 +660,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section1_()
{
@@ -669,7 +669,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section2()
{
@@ -678,7 +678,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section2_()
{
@@ -687,7 +687,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section3()
{
@@ -696,7 +696,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section3_()
{
@@ -705,7 +705,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section4()
{
@@ -714,7 +714,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section4_()
{
@@ -723,7 +723,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section5()
{
@@ -732,7 +732,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section5_()
{
@@ -741,7 +741,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void section_( int level )
{
@@ -750,7 +750,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void sectionTitle()
{
@@ -828,7 +828,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void sectionTitle_()
{
@@ -844,7 +844,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void table()
{
@@ -859,7 +859,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void table_()
{
@@ -868,7 +868,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void tableCaption()
{
@@ -883,7 +883,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void tableCaption_()
{
@@ -958,7 +958,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void tableRows( int[] justification, boolean grid )
{
@@ -967,7 +967,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void tableRows_()
{
@@ -1034,7 +1034,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void title()
{
@@ -1049,7 +1049,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void title_()
{
@@ -1058,7 +1058,7 @@
/**
* Not used.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void unknown( String name, Object[] requiredParams, SinkEventAttributes attributes )
{
@@ -1159,7 +1159,8 @@
* <tag attName="attValue">
* </pre>
* <br/>
- * <b>Note</b>: Copy from {@link AbstractXmlSink#writeStartTag(javax.swing.text.html.HTML.Tag, javax.swing.text.MutableAttributeSet)}
+ * <b>Note</b>: Copy from {@link AbstractXmlSink#writeStartTag(javax.swing.text.html.HTML.Tag,
+ * javax.swing.text.MutableAttributeSet)}
*
* @param t a non null tag
* @param att a set of attributes
@@ -1176,7 +1177,8 @@
* <tag attName="attValue">
* </pre>
* <br/>
- * <b>Note</b>: Copy from {@link AbstractXmlSink#writeStartTag(javax.swing.text.html.HTML.Tag, javax.swing.text.MutableAttributeSet, boolean)}
+ * <b>Note</b>: Copy from {@link AbstractXmlSink#writeStartTag(javax.swing.text.html.HTML.Tag,
+ * javax.swing.text.MutableAttributeSet, boolean)}
*
* @param t a non null tag
* @param att a set of attributes
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AnchorBlock.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/AnchorBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AnchorBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AnchorBlock.java Thu Apr 9 18:19:56 2009
@@ -38,11 +38,9 @@
/**
* Creates the AnchorBlock.
*
- * @param name name of the anchor
- * @throws IllegalArgumentException if the arguments are <code>null</code>
+ * @param name name of the anchor, not null.
*/
AnchorBlock( final String name )
- throws IllegalArgumentException
{
if ( name == null )
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/LinkBlock.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/LinkBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/LinkBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/LinkBlock.java Thu Apr 9 18:19:56 2009
@@ -55,12 +55,10 @@
/**
* Creates the LinkBlock.
*
- * @param reference reference anchor
- * @param content block with the displayed content
- * @throws IllegalArgumentException if any argument is <code>null</code>
+ * @param reference reference anchor, not null.
+ * @param content block with the displayed content, not null.
*/
LinkBlock( final String reference, final Block content )
- throws IllegalArgumentException
{
if ( reference == null || content == null )
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ListBlock.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/ListBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ListBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ListBlock.java Thu Apr 9 18:19:56 2009
@@ -36,11 +36,9 @@
/**
* Creates the ListBlock.
*
- * @param blocks list of list items
- * @throws IllegalArgumentException if listItemBlocks is <code>null</code>
+ * @param blocks list of list items, not null.
*/
ListBlock( final ListItemBlock[] blocks )
- throws IllegalArgumentException
{
super( blocks );
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ListItemBlock.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/ListItemBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ListItemBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ListItemBlock.java Thu Apr 9 18:19:56 2009
@@ -36,7 +36,6 @@
* @see #ListItemBlock(Block[], ListBlock)
*/
ListItemBlock( final Block[] blocks )
- throws IllegalArgumentException
{
this( blocks, null );
}
@@ -44,12 +43,10 @@
/**
* Creates the ListItemBlock.
*
- * @param blocks text
+ * @param blocks text block, not null.
* @param innerList child list
- * @throws IllegalArgumentException if textBlocks is null
*/
ListItemBlock( final Block[] blocks, final ListBlock innerList )
- throws IllegalArgumentException
{
super( blocks );
this.innerList = innerList;
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/NumeratedListBlock.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/NumeratedListBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/NumeratedListBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/NumeratedListBlock.java Thu Apr 9 18:19:56 2009
@@ -44,11 +44,9 @@
* Creates the UnorderedListBlock.
*
* @param type order item type. one of Sink#NUMBERING_....
- * @param blocks list of list items
- * @throws IllegalArgumentException if listItemBlocks is <code>null</code>
+ * @param blocks list of list items, not null.
*/
NumeratedListBlock( final int type, final ListItemBlock[] blocks )
- throws IllegalArgumentException
{
super( blocks );
this.type = type;
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlock.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/ParagraphBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ParagraphBlock.java Thu Apr 9 18:19:56 2009
@@ -29,7 +29,6 @@
extends AbstractFatherBlock
{
ParagraphBlock( final Block[] blocks )
- throws IllegalArgumentException
{
super( blocks );
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlock.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/SectionBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/SectionBlock.java Thu Apr 9 18:19:56 2009
@@ -47,10 +47,8 @@
* @param title the section title.
* @param level the section level: 0 < level < 6
* @param blocks child blocks
- * @throws java.lang.IllegalArgumentException if the parameters are not in the domain
*/
public SectionBlock( final String title, final int level, final Block[] blocks )
- throws IllegalArgumentException
{
super( blocks );
final int maxLevel = 5;
@@ -109,10 +107,8 @@
*
* @param sink the Sink
* @param name the name of the method to call
- * @throws IllegalArgumentException on error
*/
private void invokeVoidVoid( final Sink sink, final String name )
- throws IllegalArgumentException
{
try
{
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=763762&r1=763761&r2=763762&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 Thu Apr 9 18:19:56 2009
@@ -56,9 +56,9 @@
/**
* {@inheritDoc}
*/
- public final boolean accept( final String s )
+ public final boolean accept( final String line )
{
- return HEADER_DA.matcher( s ).lookingAt();
+ return HEADER_DA.matcher( line ).lookingAt();
}
/**
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextBlock.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/TextBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TextBlock.java Thu Apr 9 18:19:56 2009
@@ -42,7 +42,6 @@
* @throws IllegalArgumentException if parameters are not in the domain
*/
TextBlock( final String text )
- throws IllegalArgumentException
{
if ( text == null )
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/UnorderedListBlock.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/UnorderedListBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/UnorderedListBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/UnorderedListBlock.java Thu Apr 9 18:19:56 2009
@@ -42,7 +42,6 @@
* @throws IllegalArgumentException if listItemBlocks is <code>null</code>
*/
UnorderedListBlock( final ListItemBlock[] blocks )
- throws IllegalArgumentException
{
super( blocks );
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/XHTMLBlock.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/XHTMLBlock.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/XHTMLBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/XHTMLBlock.java Thu Apr 9 18:19:56 2009
@@ -39,7 +39,6 @@
* @throws IllegalArgumentException if the arguments are <code>null</code>
*/
XHTMLBlock( final String tag )
- throws IllegalArgumentException
{
if ( tag == null )
{
Modified: maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java?rev=763762&r1=763761&r2=763762&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java (original)
+++ maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java Thu Apr 9 18:19:56 2009
@@ -252,7 +252,8 @@
* Starts the date element.
* <br/>
* The date is recommended (but it is not a requirement) to be align to the
- * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26780">ISO-8601</a> standard, i.e.:
+ * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=26780">ISO-8601</a>
+ * standard, i.e.:
* <pre>
* YYYY-MM-DD
* </pre>