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 hb...@apache.org on 2008/11/01 00:57:04 UTC
svn commit: r709605 - in /maven/doxia/doxia/trunk/doxia-modules:
doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/
doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/
doxia-module-confluence/src/main/j...
Author: hboutemy
Date: Fri Oct 31 16:57:03 2008
New Revision: 709605
URL: http://svn.apache.org/viewvc?rev=709605&view=rev
Log:
fixed errors reported by Checkstyle
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptUtils.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/DefinitionListBlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.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/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-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.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/FormatedTextParser.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/WikiWordBlock.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/XHTMLWikiWordLinkResolver.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java?rev=709605&r1=709604&r2=709605&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java Fri Oct 31 16:57:03 2008
@@ -413,7 +413,7 @@
case LEFT_CURLY_BRACKET: /*}*/
if ( !anchor && !link )
{
- if ( i + 1 < end && text.charAt( i + 1 ) == LEFT_CURLY_BRACKET /*}*/)
+ if ( i + 1 < end && text.charAt( i + 1 ) == LEFT_CURLY_BRACKET /*}*/ )
{
++i;
link = true;
@@ -421,7 +421,7 @@
String linkAnchor = null;
- if ( i + 1 < end && text.charAt( i + 1 ) == LEFT_CURLY_BRACKET /*}*/)
+ if ( i + 1 < end && text.charAt( i + 1 ) == LEFT_CURLY_BRACKET /*}*/ )
{
++i;
StringBuffer buf = new StringBuffer();
@@ -2105,8 +2105,7 @@
/**
* Constructor.
*
- * @param indent indent.
- * @param firstLine the comment line.
+ * @param line the comment line.
* @throws AptParseException AptParseException
*/
public Comment( String line )
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptUtils.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptUtils.java?rev=709605&r1=709604&r2=709605&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptUtils.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptUtils.java Fri Oct 31 16:57:03 2008
@@ -28,7 +28,8 @@
* @since 1.0-beta-1
* @version $Id$
*/
-public class AptUtils {
+public class AptUtils
+{
/**
* Replace all characters in a text.
@@ -173,7 +174,8 @@
{
buffer.append( '_' );
}
- else if ( ( Character.isLetterOrDigit( c ) ) || ( c == '-' ) || ( c == '_' ) || ( c == ':' ) || ( c == '.' ) )
+ else if ( ( Character.isLetterOrDigit( c ) ) || ( c == '-' ) || ( c == '_' ) || ( c == ':' )
+ || ( c == '.' ) )
{
buffer.append( c );
}
@@ -182,7 +184,8 @@
return buffer.toString();
}
- private AptUtils() {
+ private AptUtils()
+ {
// utility class
}
}
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=709605&r1=709604&r2=709605&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 Fri Oct 31 16:57:03 2008
@@ -75,7 +75,7 @@
if ( insideBold )
{
insideBold = false;
- specialBlocks = getList( new BoldBlock( getChildren(text, specialBlocks) ), specialBlocks );
+ specialBlocks = getList( new BoldBlock( getChildren( text, specialBlocks ) ), specialBlocks );
text = new StringBuffer();
}
else
@@ -151,7 +151,8 @@
{
i++;
insideMonospaced = false;
- specialBlocks = getList( new MonospaceBlock( getChildren( text, specialBlocks ) ), specialBlocks );
+ specialBlocks = getList( new MonospaceBlock( getChildren( text, specialBlocks ) ),
+ specialBlocks );
text = new StringBuffer();
}
else
@@ -244,7 +245,7 @@
return list;
}
- list.add( new TextBlock(text) );
+ list.add( new TextBlock( text ) );
return list;
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/DefinitionListBlockParser.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/DefinitionListBlockParser.java?rev=709605&r1=709604&r2=709605&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/DefinitionListBlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/DefinitionListBlockParser.java Fri Oct 31 16:57:03 2008
@@ -29,7 +29,7 @@
public class DefinitionListBlockParser
implements BlockParser
{
- static String LS = System.getProperty( "line.separator" );
+ static final String LS = System.getProperty( "line.separator" );
/** {@inheritDoc} */
public boolean accept( String line, ByLineSource source )
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.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/FigureBlockParser.java?rev=709605&r1=709604&r2=709605&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/FigureBlockParser.java Fri Oct 31 16:57:03 2008
@@ -65,7 +65,7 @@
* @return a StringBuffer appended with lines
* @throws ParseException
*/
- private String appendUntilEmptyLine(ByLineSource source )
+ private String appendUntilEmptyLine( ByLineSource source )
throws ParseException
{
StringBuffer text = new StringBuffer();
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlockParser.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/VerbatimBlockParser.java?rev=709605&r1=709604&r2=709605&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlockParser.java Fri Oct 31 16:57:03 2008
@@ -29,7 +29,7 @@
public class VerbatimBlockParser
implements BlockParser
{
- static String LS = System.getProperty( "line.separator" );
+ static final String LS = System.getProperty( "line.separator" );
/** {@inheritDoc} */
public boolean accept( String line, ByLineSource source )
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.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/ListBlockParser.java?rev=709605&r1=709604&r2=709605&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java Fri Oct 31 16:57:03 2008
@@ -31,9 +31,9 @@
public class ListBlockParser
implements BlockParser
{
- public static int BULLETED_LIST = 0;
+ public static final int BULLETED_LIST = 0;
- public static int NUMBERED_LIST = 1;
+ public static final int NUMBERED_LIST = 1;
/** {@inheritDoc} */
public boolean accept( String line, ByLineSource source )
@@ -61,7 +61,7 @@
break;
}
- if (text.length()>0 && isList( line ) )
+ if ( text.length() > 0 && isList( line ) )
{
// We reached a new line with list prefix
addItem( treeListBuilder, text );
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=709605&r1=709604&r2=709605&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 Fri Oct 31 16:57:03 2008
@@ -97,7 +97,7 @@
{
List list = getListItems( treeComponent );
- int type = ((TreeComponent)treeComponent.getChildren().get(0)).getType();
+ int type = ( (TreeComponent) treeComponent.getChildren().get( 0 ) ).getType();
if ( type == ListBlockParser.BULLETED_LIST )
{
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=709605&r1=709604&r2=709605&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 Fri Oct 31 16:57:03 2008
@@ -49,9 +49,9 @@
sink.table_();
}
- private final int [] getJustification() {
- final AbstractFatherBlock b =
- ((AbstractFatherBlock)getBlocks().get( 0 ));
+ private final int[] getJustification()
+ {
+ final AbstractFatherBlock b = ( (AbstractFatherBlock) getBlocks().get( 0 ) );
int[] justification = new int[b.getBlocks().size()];
for ( int i = 0; i < justification.length; i++ )
{
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=709605&r1=709604&r2=709605&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 Fri Oct 31 16:57:03 2008
@@ -1340,7 +1340,8 @@
out.flush();
if ( tableRowsWriter == null )
{
- throw new IllegalArgumentException( "tableRows( int[] justification, boolean grid ) was not called before." );
+ throw new IllegalArgumentException( "tableRows( int[] justification, boolean grid )"
+ + " was not called before." );
}
tableRows = tableRowsWriter.toString();
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=709605&r1=709604&r2=709605&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 Fri Oct 31 16:57:03 2008
@@ -377,6 +377,6 @@
return getMonoSpacedFont( this.currentStyle, this.currentSize, this.currentColor );
}
- return getFont(this.currentStyle, this.currentSize, this.currentColor );
+ return getFont( this.currentStyle, this.currentSize, this.currentColor );
}
}
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=709605&r1=709604&r2=709605&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 Fri Oct 31 16:57:03 2008
@@ -50,7 +50,8 @@
* <ul>
* <li>Roman lists are not supported.</li>
* <li>Horizontal rule is not supported with 1.3.
- * See <a href="http://www.mail-archive.com/itext-questions@lists.sourceforge.net/msg10323.html">http://www.mail-archive.com/itext-questions@lists.sourceforge.net/msg10323.html</a></li>
+ * See <a href="http://www.mail-archive.com/itext-questions@lists.sourceforge.net/msg10323.html">
+ * http://www.mail-archive.com/itext-questions@lists.sourceforge.net/msg10323.html</a></li>
* <li>iText has some problems with <code>ElementTags.TABLE</code> and <code>ElementTags.TABLEFITSPAGE</code>.
* See http://sourceforge.net/tracker/index.php?func=detail&aid=786427&group_id=15255&atid=115255.</li>
* <li>Images could be on another page and next text on the last one.</li>
@@ -67,7 +68,7 @@
extends SinkAdapter
{
/** This is the place where the iText DTD is located. IMPORTANT: this DTD is not uptodate! */
- public final static String DTD = "http://itext.sourceforge.net/itext.dtd";
+ public static final String DTD = "http://itext.sourceforge.net/itext.dtd";
/** This is the reference to the DTD. */
public static final String DOCTYPE = "ITEXT SYSTEM \"" + DTD + "\"";
@@ -1143,7 +1144,8 @@
public void figureGraphics( String name )
{
String urlName = null;
- if ( ( name.toLowerCase( Locale.ENGLISH ).startsWith( "http://" ) ) || ( name.toLowerCase( Locale.ENGLISH ).startsWith( "https://" ) ) )
+ if ( ( name.toLowerCase( Locale.ENGLISH ).startsWith( "http://" ) )
+ || ( name.toLowerCase( Locale.ENGLISH ).startsWith( "https://" ) ) )
{
urlName = name;
}
@@ -1167,7 +1169,8 @@
if ( urlName == null )
{
- getLog().warn( "No image " + name + " found in the class loader. Try to call setClassLoader(ClassLoader) before." );
+ getLog().warn( "No image " + name + " found in the class loader. Try to call setClassLoader(ClassLoader)"
+ + " before." );
return;
}
@@ -1797,7 +1800,8 @@
return sb.toString().trim();
}
- private void startChunk( String fontName, int fontSize, String fontStyle, int fontColorBlue, int fontColorGreen, int fontColorRed, String localDestination )
+ private void startChunk( String fontName, int fontSize, String fontStyle, int fontColorBlue, int fontColorGreen,
+ int fontColorRed, String localDestination )
{
writeStartElement( ElementTags.CHUNK );
writeAddAttribute( ElementTags.FONT, fontName );
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=709605&r1=709604&r2=709605&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 Fri Oct 31 16:57:03 2008
@@ -50,8 +50,9 @@
public static Rectangle getDefaultPageSize()
{
String defaultCountry = Locale.getDefault().getCountry();
- if ( defaultCountry != null &&
- ( defaultCountry.equals( Locale.US.getCountry() ) || defaultCountry.equals( Locale.CANADA.getCountry() ) ) )
+ if ( defaultCountry != null
+ && ( defaultCountry.equals( Locale.US.getCountry() )
+ || defaultCountry.equals( Locale.CANADA.getCountry() ) ) )
{
return PageSize.LETTER;
}
@@ -89,9 +90,9 @@
for ( int i = 0; i < sizes.length; i++ )
{
Field currentField = sizes[i];
- if ( ( currentField.getName().equalsIgnoreCase( aPageSize ) ) &&
- ( Modifier.isStatic( currentField.getModifiers() ) ) &&
- ( currentField.getType().equals( Rectangle.class ) ) )
+ if ( ( currentField.getName().equalsIgnoreCase( aPageSize ) )
+ && ( Modifier.isStatic( currentField.getModifiers() ) )
+ && ( currentField.getType().equals( Rectangle.class ) ) )
{
return true;
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.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/TWikiMarkup.java?rev=709605&r1=709604&r2=709605&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.java Fri Oct 31 16:57:03 2008
@@ -22,7 +22,6 @@
import javax.swing.text.html.HTML.Tag;
import org.apache.maven.doxia.markup.TextMarkup;
-import org.codehaus.plexus.util.StringUtils;
/**
* This interface defines all markups and syntaxes used by the <b>TWiki</b> format.
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=709605&r1=709604&r2=709605&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 Fri Oct 31 16:57:03 2008
@@ -29,7 +29,6 @@
import javax.swing.text.html.HTML.Tag;
import org.apache.maven.doxia.sink.AbstractTextSink;
-import org.apache.maven.doxia.sink.AbstractXmlSink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.sink.SinkUtils;
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=709605&r1=709604&r2=709605&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 Fri Oct 31 16:57:03 2008
@@ -259,16 +259,9 @@
{
int len = SPECIAL_CHAR[charType].length();
ret.addAll( parseFormat( line.substring( 0, minIndex ) ) );
- ret
- .add( ( (FormatBlockFactory) FACTORY_MAP.get( SPECIAL_CHAR[charType] ) )
- .createBlock( (Block[]) parseFormat(
- line
- .substring(
- minIndex
- + len,
- rhOffsets[charType] ) )
- .toArray(
- new Block[] {} ) ) );
+ ret.add( ( (FormatBlockFactory) FACTORY_MAP.get( SPECIAL_CHAR[charType] ) )
+ .createBlock( (Block[]) parseFormat( line.substring( minIndex + len, rhOffsets[charType] ) )
+ .toArray( new Block[] {} ) ) );
ret.addAll( parseFormat( line.substring( rhOffsets[charType] + len ) ) );
}
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=709605&r1=709604&r2=709605&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 Fri Oct 31 16:57:03 2008
@@ -54,7 +54,7 @@
sink.table_();
}
- private final int[] getJustification()
+ private int[] getJustification()
{
int[] justification = new int[( (AbstractFatherBlock) getBlocks()[0] ).getBlocks().length];
for ( int i = 0; i < justification.length; i++ )
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/WikiWordBlock.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/WikiWordBlock.java?rev=709605&r1=709604&r2=709605&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/WikiWordBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/WikiWordBlock.java Fri Oct 31 16:57:03 2008
@@ -73,7 +73,7 @@
* Creates the WikiWordBlock.
*
* @param aWikiword the wiki word
- * @param aText text to show in the wiki link
+ * @param content content to show in the wiki link
* @param resolver responsible of resolving the link to the wikiWord
* @throws IllegalArgumentException if the wikiword is <code>null</code>
*/
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/XHTMLWikiWordLinkResolver.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/XHTMLWikiWordLinkResolver.java?rev=709605&r1=709604&r2=709605&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/XHTMLWikiWordLinkResolver.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/XHTMLWikiWordLinkResolver.java Fri Oct 31 16:57:03 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.doxia.module.twiki.parser;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.doxia.module.twiki.parser;
/**
* Transform WikiWord to HTML links
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java?rev=709605&r1=709604&r2=709605&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java Fri Oct 31 16:57:03 2008
@@ -181,7 +181,7 @@
{
verbatim();
- attribs.addAttribute( SinkEventAttributeSet.DECORATION, "boxed");
+ attribs.addAttribute( SinkEventAttributeSet.DECORATION, "boxed" );
sink.verbatim( attribs );
}