maven-doxia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vsive...@apache.org
Subject svn commit: r705065 [1/2] - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src: main/java/org/apache/maven/doxia/module/twiki/ main/java/org/apache/maven/doxia/module/twiki/parser/ test/java/org/apache/maven/doxia/module/twiki/parser/
Date Wed, 15 Oct 2008 21:46:10 GMT
Author: vsiveton
Date: Wed Oct 15 14:46:08 2008
New Revision: 705065

URL: http://svn.apache.org/viewvc?rev=705065&view=rev
Log:
o code formatting - no change

Modified:
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AbstractFatherBlock.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/Block.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BlockParser.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/HorizontalRuleBlock.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ImageBlock.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ItalicBlock.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/MonospaceBlock.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/NopBlock.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/ParagraphBlockParser.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/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/TableCellHeaderBlock.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableRowBlock.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/TextParser.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/VerbatimBlock.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/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/XHTMLBlock.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-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/AbstractBlockTestCase.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/BlockTest.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/FormatedTextTest.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ListTest.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/ParagraphTest.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/SectionTest.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TableTest.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/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

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.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/TWikiSiteModule.java?rev=705065&r1=705064&r2=705065&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java Wed Oct 15 14:46:08 2008
@@ -30,7 +30,8 @@
  * @since 1.0
  * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule" role-hint="twiki"
  */
-public final class TWikiSiteModule implements SiteModule
+public final class TWikiSiteModule
+    implements SiteModule
 {
 
     /**

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AbstractFatherBlock.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/AbstractFatherBlock.java?rev=705065&r1=705064&r2=705065&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AbstractFatherBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/AbstractFatherBlock.java Wed Oct 15 14:46:08 2008
@@ -29,7 +29,8 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-abstract class AbstractFatherBlock implements Block
+abstract class AbstractFatherBlock
+    implements Block
 {
     /**
      * @see AbstractFatherBlock#AbstractFatherBlock(Block[])
@@ -66,8 +67,7 @@
         {
             if ( childBlocks[i] == null )
             {
-                throw new IllegalArgumentException( "bucket " + i
-                    + " can't be null" );
+                throw new IllegalArgumentException( "bucket " + i + " can't be null" );
             }
         }
         this.childBlocks = childBlocks;
@@ -91,7 +91,7 @@
      *
      * @return <code>Block[]</code> with the childBlocks.
      */
-    public final Block [] getBlocks()
+    public final Block[] getBlocks()
     {
         return childBlocks;
     }

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -21,14 +21,14 @@
 
 import org.apache.maven.doxia.sink.Sink;
 
-
 /**
  * Represents an anchor
  *
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class AnchorBlock implements Block
+class AnchorBlock
+    implements Block
 {
     /**
      * anchor name
@@ -41,7 +41,8 @@
      * @param name name of the anchor
      * @throws IllegalArgumentException if the arguments are <code>null</code>
      */
-    AnchorBlock( final String name ) throws IllegalArgumentException
+    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/Block.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/Block.java?rev=705065&r1=705064&r2=705065&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/Block.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/Block.java Wed Oct 15 14:46:08 2008
@@ -21,7 +21,6 @@
 
 import org.apache.maven.doxia.sink.Sink;
 
-
 /**
  * Document objet model: we parse the document to a bunch of these.
  * <p/>

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BlockParser.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/BlockParser.java?rev=705065&r1=705064&r2=705065&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/BlockParser.java Wed Oct 15 14:46:08 2008
@@ -42,5 +42,6 @@
      * @return a block
      * @throws ParseException on error
      */
-    Block visit( String line, ByLineSource source ) throws ParseException;
+    Block visit( String line, ByLineSource source )
+        throws ParseException;
 }

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -27,14 +27,15 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class BoldBlock extends AbstractFatherBlock
+class BoldBlock
+    extends AbstractFatherBlock
 {
     /**
      * Creates the BoldBlock.
      *
      * @param childBlocks child blocks
      */
-    public BoldBlock( final Block [] childBlocks )
+    public BoldBlock( final Block[] childBlocks )
     {
         super( childBlocks );
     }

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -1,10 +1,5 @@
 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
@@ -24,8 +19,10 @@
  * under the License.
  */
 
-
-
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Parse looking for formated text (bold, italic, ...)
@@ -48,76 +45,67 @@
     /**
      * creates bold blocks
      */
-    private static final FormatBlockFactory BOLD_FACTORY =
-        new FormatBlockFactory()
+    private static final FormatBlockFactory BOLD_FACTORY = new FormatBlockFactory()
+    {
+        /** {@inheritDoc} */
+        public Block createBlock( final Block[] childrens )
         {
-            /** {@inheritDoc} */
-            public Block createBlock( final Block [] childrens )
-            {
-                return new BoldBlock( childrens );
-            }
-        };
+            return new BoldBlock( childrens );
+        }
+    };
 
     /**
      * creates italic blocks
      */
-    private static final FormatBlockFactory ITALIC_FACTORY =
-        new FormatBlockFactory()
+    private static final FormatBlockFactory ITALIC_FACTORY = new FormatBlockFactory()
+    {
+        /** {@inheritDoc} */
+        public Block createBlock( final Block[] childrens )
         {
-            /** {@inheritDoc} */
-            public Block createBlock( final Block [] childrens )
-            {
-                return new ItalicBlock( childrens );
-            }
-        };
+            return new ItalicBlock( childrens );
+        }
+    };
 
     /**
      * creates monospaced blocks
      */
-    private static final FormatBlockFactory MONOSPACED_FACTORY =
-        new FormatBlockFactory()
+    private static final FormatBlockFactory MONOSPACED_FACTORY = new FormatBlockFactory()
+    {
+        /** {@inheritDoc} */
+        public Block createBlock( final Block[] childrens )
         {
-            /** {@inheritDoc} */
-            public Block createBlock( final Block [] childrens )
-            {
-                return new MonospaceBlock( childrens );
-            }
-        };
+            return new MonospaceBlock( childrens );
+        }
+    };
 
     /**
      * creates bold italic blocks
      */
-    private static final FormatBlockFactory BOLDITALIC_FACTORY =
-        new FormatBlockFactory()
+    private static final FormatBlockFactory BOLDITALIC_FACTORY = new FormatBlockFactory()
+    {
+        /** {@inheritDoc} */
+        public Block createBlock( final Block[] childrens )
         {
-            /** {@inheritDoc} */
-            public Block createBlock( final Block [] childrens )
-            {
-                return new BoldBlock( new Block[]{new ItalicBlock( childrens )} );
-            }
-        };
+            return new BoldBlock( new Block[] { new ItalicBlock( childrens ) } );
+        }
+    };
 
     /**
      * creates bold monospace blocks
      */
-    private static final FormatBlockFactory BOLDMONO_FACTORY =
-        new FormatBlockFactory()
+    private static final FormatBlockFactory BOLDMONO_FACTORY = new FormatBlockFactory()
+    {
+        /** {@inheritDoc} */
+        public Block createBlock( final Block[] childrens )
         {
-            /** {@inheritDoc} */
-            public Block createBlock( final Block [] childrens )
-            {
-                return new BoldBlock( new Block[]{
-                    new MonospaceBlock( childrens )
-                } );
-            }
-        };
+            return new BoldBlock( new Block[] { new MonospaceBlock( childrens ) } );
+        }
+    };
 
     /**
      * format characters
      */
-    private static final String [] SPECIAL_CHAR = new String []{
-        "__", "==", "*", "_", "="
-    };
+    private static final String[] SPECIAL_CHAR = new String[] { "__", "==", "*", "_", "=" };
 
     static
     {
@@ -132,9 +120,9 @@
      * @param line line to parse
      * @return TextBlock, ItalicBlock, BoldBlock, MonospacedBlock, ...
      */
-    final Block []parse( final String line )
+    final Block[] parse( final String line )
     {
-        return (Block[]) parseFormat( line ).toArray( new Block []{} );
+        return (Block[]) parseFormat( line ).toArray( new Block[] {} );
     }
 
     /**
@@ -176,8 +164,8 @@
     private List parseFormat( final String line )
     {
         final List ret = new ArrayList();
-        final int []lhOffsets = new int[SPECIAL_CHAR.length];
-        final int []rhOffsets = new int[SPECIAL_CHAR.length];
+        final int[] lhOffsets = new int[SPECIAL_CHAR.length];
+        final int[] rhOffsets = new int[SPECIAL_CHAR.length];
 
         // for each text format markers...
         for ( int i = 0; i < SPECIAL_CHAR.length; i++ )
@@ -188,8 +176,7 @@
             while ( t != -1 && ( t = line.indexOf( SPECIAL_CHAR[i], t ) ) != -1 )
             {
                 // and check if it at the begining of a word.
-                if ( t == 0 || isSpace( line.charAt( t - 1 ) )
-                        || isParenthesis( line.charAt( t - 1 ) ) )
+                if ( t == 0 || isSpace( line.charAt( t - 1 ) ) || isParenthesis( line.charAt( t - 1 ) ) )
                 {
                     // if it is, and if, check to avoid going beyond the string
                     if ( t + specialLen < line.length() )
@@ -272,11 +259,16 @@
         {
             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 ) ) );
         }
 
@@ -288,7 +280,8 @@
      * @param c character to test
      * @return <code>true</code> if c is a parenthesis
      */
-    private boolean isParenthesis( final char c ) {
+    private boolean isParenthesis( final char c )
+    {
         return c == '(' || c == ')';
     }
 

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -35,7 +35,8 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-public class GenericListBlockParser implements BlockParser
+public class GenericListBlockParser
+    implements BlockParser
 {
     static final String EOL = System.getProperty( "line.separator" );
 
@@ -43,10 +44,11 @@
      * parser used to create text blocks
      */
     private FormatedTextParser formatedTextParser;
+
     /**
      * supported patterns
      */
-    private final Pattern [] patterns = new Pattern[TYPES.length];
+    private final Pattern[] patterns = new Pattern[TYPES.length];
 
     /**
      * Creates the GenericListBlockParser.
@@ -55,8 +57,7 @@
     {
         for ( int i = 0; i < TYPES.length; i++ )
         {
-            patterns[i] = Pattern.compile( "^((   )+)"
-                + TYPES[i].getItemPattern() + "(.*)$" );
+            patterns[i] = Pattern.compile( "^((   )+)" + TYPES[i].getItemPattern() + "(.*)$" );
         }
     }
 
@@ -74,13 +75,12 @@
     }
 
     /** {@inheritDoc}
-     * @throws org.apache.maven.doxia.parser.ParseException 
+     * @throws org.apache.maven.doxia.parser.ParseException
      */
     public final Block visit( final String line, final ByLineSource source )
         throws ParseException
     {
-        final TreeListBuilder treeListBuilder =
-            new TreeListBuilder( formatedTextParser );
+        final TreeListBuilder treeListBuilder = new TreeListBuilder( formatedTextParser );
         // new TreeListBuilder(formatedTextParser);
         String l = line;
         do
@@ -99,8 +99,7 @@
                     final int textGroup = 3;
                     assert m.group( 1 ).length() % numberOfSpaces == 0;
                     final int level = m.group( 1 ).length() / numberOfSpaces;
-                    treeListBuilder.feedEntry( TYPES[i], level,
-                                               m.group( textGroup ).trim() );
+                    treeListBuilder.feedEntry( TYPES[i], level, m.group( textGroup ).trim() );
                     break;
                 }
             }
@@ -115,7 +114,6 @@
         return treeListBuilder.getBlock();
     }
 
-
     /**
      * Sets the formatTextParser.
      *
@@ -125,8 +123,7 @@
     {
         if ( textParser == null )
         {
-            throw new IllegalArgumentException(
-                "formatTextParser can't be null" );
+            throw new IllegalArgumentException( "formatTextParser can't be null" );
         }
         this.formatedTextParser = textParser;
     }
@@ -142,14 +139,15 @@
          * @param items children of the new listblock
          * @return a new ListBlock
          */
-        ListBlock createList( final ListItemBlock []items );
+        ListBlock createList( final ListItemBlock[] items );
 
     }
 
     /**
      * unordered list
      */
-    private static final Type LIST = new Type() {
+    private static final Type LIST = new Type()
+    {
         /** {@inheritDoc} */
         public String getItemPattern()
         {
@@ -157,7 +155,7 @@
         }
 
         /** {@inheritDoc} */
-        public ListBlock createList( final ListItemBlock []items )
+        public ListBlock createList( final ListItemBlock[] items )
         {
             return new UnorderedListBlock( items );
         }
@@ -166,7 +164,8 @@
     /**
      * a.
      */
-    private static final Type ORDERED_LOWER_ALPHA = new Type() {
+    private static final Type ORDERED_LOWER_ALPHA = new Type()
+    {
         /** {@inheritDoc} */
         public String getItemPattern()
         {
@@ -174,17 +173,17 @@
         }
 
         /** {@inheritDoc} */
-        public ListBlock createList( final ListItemBlock []items )
+        public ListBlock createList( final ListItemBlock[] items )
         {
-            return new NumeratedListBlock( Sink.NUMBERING_LOWER_ALPHA,
-                                           items );
+            return new NumeratedListBlock( Sink.NUMBERING_LOWER_ALPHA, items );
         }
     };
 
     /**
      * A.
      */
-    private static final Type ORDERED_UPPER_ALPHA = new Type() {
+    private static final Type ORDERED_UPPER_ALPHA = new Type()
+    {
         /** {@inheritDoc} */
         public String getItemPattern()
         {
@@ -192,17 +191,17 @@
         }
 
         /** {@inheritDoc} */
-        public ListBlock createList( final ListItemBlock []items )
+        public ListBlock createList( final ListItemBlock[] items )
         {
-            return new NumeratedListBlock( Sink.NUMBERING_UPPER_ALPHA,
-                                           items );
+            return new NumeratedListBlock( Sink.NUMBERING_UPPER_ALPHA, items );
         }
     };
 
     /**
      * 1.
      */
-    private static final Type ORDERERED_DECIMAL = new Type(){
+    private static final Type ORDERERED_DECIMAL = new Type()
+    {
         /** {@inheritDoc} */
         public String getItemPattern()
         {
@@ -210,17 +209,17 @@
         }
 
         /** {@inheritDoc} */
-        public ListBlock createList( final ListItemBlock []items )
+        public ListBlock createList( final ListItemBlock[] items )
         {
-            return new NumeratedListBlock( Sink.NUMBERING_DECIMAL,
-                                           items );
+            return new NumeratedListBlock( Sink.NUMBERING_DECIMAL, items );
         }
     };
 
     /**
      * i.
      */
-    private static final Type ORDERERED_LOWER_ROMAN = new Type(){
+    private static final Type ORDERERED_LOWER_ROMAN = new Type()
+    {
         /** {@inheritDoc} */
         public String getItemPattern()
         {
@@ -228,17 +227,17 @@
         }
 
         /** {@inheritDoc} */
-        public ListBlock createList( final ListItemBlock []items )
+        public ListBlock createList( final ListItemBlock[] items )
         {
-            return new NumeratedListBlock( Sink.NUMBERING_LOWER_ROMAN,
-                                           items );
+            return new NumeratedListBlock( Sink.NUMBERING_LOWER_ROMAN, items );
         }
     };
 
     /**
      * I.
      */
-    private static final Type ORDERERED_UPPER_ROMAN = new Type(){
+    private static final Type ORDERERED_UPPER_ROMAN = new Type()
+    {
         /** {@inheritDoc} */
         public String getItemPattern()
         {
@@ -246,16 +245,15 @@
         }
 
         /** {@inheritDoc} */
-        public ListBlock createList( final ListItemBlock []items )
+        public ListBlock createList( final ListItemBlock[] items )
         {
-            return new NumeratedListBlock( Sink.NUMBERING_UPPER_ROMAN,
-                                           items );
+            return new NumeratedListBlock( Sink.NUMBERING_UPPER_ROMAN, items );
         }
     };
 
-    private static final Type[] TYPES = {
-        LIST, ORDERED_LOWER_ALPHA, ORDERED_UPPER_ALPHA, ORDERERED_DECIMAL, ORDERERED_LOWER_ROMAN, ORDERERED_UPPER_ROMAN
-    };
+    private static final Type[] TYPES =
+        { LIST, ORDERED_LOWER_ALPHA, ORDERED_UPPER_ALPHA, ORDERERED_DECIMAL, ORDERERED_LOWER_ROMAN,
+            ORDERERED_UPPER_ROMAN };
 
 }
 
@@ -271,10 +269,12 @@
      * parser that create text blocks
      */
     private final FormatedTextParser textParser;
+
     /**
      * tree root
      */
     private final TreeComponent root;
+
     /**
      * the current element of the tree
      */
@@ -306,8 +306,7 @@
      * @param level indentation level of the item
      * @param text  text of the item
      */
-    void feedEntry( final GenericListBlockParser.Type type,
-                           final int level, final String text )
+    void feedEntry( final GenericListBlockParser.Type type, final int level, final String text )
     {
         final int currentDepth = current.getDepth();
         final int incomingLevel = level - 1;
@@ -319,7 +318,7 @@
         else if ( incomingLevel > currentDepth )
         {
             // el actual ahora es el �ltimo que insert�
-            final TreeComponent []components = current.getChildren();
+            final TreeComponent[] components = current.getChildren();
             if ( components.length == 0 )
             {
                 /* for example:
@@ -367,7 +366,7 @@
      */
     private ListBlock getList( final TreeComponent tc )
     {
-        ListItemBlock[] li = (ListItemBlock[]) getListItems( tc ).toArray( new ListItemBlock[]{} );
+        ListItemBlock[] li = (ListItemBlock[]) getListItems( tc ).toArray( new ListItemBlock[] {} );
         return tc.getChildren()[0].getType().createList( li );
     }
 
@@ -383,7 +382,7 @@
         {
             final TreeComponent child = tc.getChildren()[i];
 
-            Block[] text = new Block[]{};
+            Block[] text = new Block[] {};
             if ( child.getFather() != null )
             {
                 text = textParser.parse( child.getText() );
@@ -414,14 +413,17 @@
          * childrens
          */
         private List children = new ArrayList();
+
         /**
          * node text
          */
         private String text;
+
         /**
          * the father
          */
         private TreeComponent father;
+
         /**
          * type of the list
          */
@@ -434,8 +436,7 @@
          * @param text   component text
          * @param type   component type
          */
-        TreeComponent( final TreeComponent father, final String text,
-                              final GenericListBlockParser.Type type )
+        TreeComponent( final TreeComponent father, final String text, final GenericListBlockParser.Type type )
         {
             this.text = text;
             this.father = father;
@@ -447,7 +448,7 @@
          */
         TreeComponent[] getChildren()
         {
-            return (TreeComponent[]) children.toArray( new TreeComponent[]{} );
+            return (TreeComponent[]) children.toArray( new TreeComponent[] {} );
         }
 
         /**
@@ -457,8 +458,7 @@
          * @param ttype component type
          * @return the new node created
          */
-        TreeComponent addChildren( final String t,
-                                          final GenericListBlockParser.Type ttype )
+        TreeComponent addChildren( final String t, final GenericListBlockParser.Type ttype )
         {
             if ( t == null || ttype == null )
             {

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -25,20 +25,19 @@
 import org.apache.maven.doxia.util.ByLineSource;
 import org.apache.maven.doxia.parser.ParseException;
 
-
 /**
  * Block that represents an horizontal rule
  *
  * @author Juan F. Codagnone
  * @version $Id$
  */
-public class HRuleBlockParser implements BlockParser
+public class HRuleBlockParser
+    implements BlockParser
 {
     /**
      * pattern used to detect horizontal rulers
      */
-    private static final Pattern HRULE_PATTERN =
-        Pattern.compile( "^(---)(-*)(.*)$" );
+    private static final Pattern HRULE_PATTERN = Pattern.compile( "^(---)(-*)(.*)$" );
 
     /** {@inheritDoc} */
     public final boolean accept( final String line )
@@ -60,7 +59,7 @@
     }
 
     /** {@inheritDoc}
-     * @throws org.apache.maven.doxia.parser.ParseException 
+     * @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/HorizontalRuleBlock.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/HorizontalRuleBlock.java?rev=705065&r1=705064&r2=705065&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/HorizontalRuleBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/HorizontalRuleBlock.java Wed Oct 15 14:46:08 2008
@@ -21,14 +21,14 @@
 
 import org.apache.maven.doxia.sink.Sink;
 
-
 /**
  * Represents an horizontal block
  *
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class HorizontalRuleBlock implements Block
+class HorizontalRuleBlock
+    implements Block
 {
     /** {@inheritDoc} */
     public final void traverse( final Sink sink )
@@ -39,8 +39,7 @@
     /** {@inheritDoc} */
     public final boolean equals( final Object obj )
     {
-        return obj == this
-            || ( obj != null && getClass().equals( obj.getClass() ) );
+        return obj == this || ( obj != null && getClass().equals( obj.getClass() ) );
     }
 
     /** {@inheritDoc} */

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ImageBlock.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/ImageBlock.java?rev=705065&r1=705064&r2=705065&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ImageBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ImageBlock.java Wed Oct 15 14:46:08 2008
@@ -27,7 +27,8 @@
  * @author Christian Nardi
  * @version $Id$
  */
-class ImageBlock implements Block
+class ImageBlock
+    implements Block
 {
     /**
      * img reference

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ItalicBlock.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/ItalicBlock.java?rev=705065&r1=705064&r2=705065&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ItalicBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/ItalicBlock.java Wed Oct 15 14:46:08 2008
@@ -27,14 +27,15 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class ItalicBlock extends AbstractFatherBlock
+class ItalicBlock
+    extends AbstractFatherBlock
 {
     /**
      * Creates the BoldBlock.
      *
      * @param childBlocks child blocks
      */
-    ItalicBlock( final Block [] childBlocks )
+    ItalicBlock( final Block[] childBlocks )
     {
         super( childBlocks );
     }

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -27,12 +27,14 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class LinkBlock implements Block
+class LinkBlock
+    implements Block
 {
     /**
      * link reference
      */
     private final String reference;
+
     /**
      * link text
      */
@@ -89,8 +91,7 @@
         else if ( obj instanceof LinkBlock )
         {
             final LinkBlock l = (LinkBlock) obj;
-            ret = reference.equals( l.reference )
-                && content.equals( l.content );
+            ret = reference.equals( l.reference ) && content.equals( l.content );
         }
 
         return ret;
@@ -102,7 +103,6 @@
         final int magic1 = 17;
         final int magic2 = 37;
 
-        return magic1 + magic2 * reference.hashCode()
-            + magic2 * content.hashCode();
+        return magic1 + magic2 * reference.hashCode() + magic2 * content.hashCode();
     }
 }

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -1,6 +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
@@ -31,7 +30,8 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-abstract class ListBlock extends AbstractFatherBlock
+abstract class ListBlock
+    extends AbstractFatherBlock
 {
     /**
      * Creates the ListBlock.

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -27,14 +27,15 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class ListItemBlock extends AbstractFatherBlock
+class ListItemBlock
+    extends AbstractFatherBlock
 {
     private final ListBlock innerList;
 
     /**
      * @see #ListItemBlock(Block[], ListBlock)
      */
-    ListItemBlock( final Block [] blocks )
+    ListItemBlock( final Block[] blocks )
         throws IllegalArgumentException
     {
         this( blocks, null );
@@ -47,7 +48,7 @@
      * @param innerList child list
      * @throws IllegalArgumentException if textBlocks is null
      */
-    ListItemBlock( final Block [] blocks, final ListBlock innerList )
+    ListItemBlock( final Block[] blocks, final ListBlock innerList )
         throws IllegalArgumentException
     {
         super( blocks );
@@ -119,7 +120,6 @@
         final int magic1 = 17;
         final int magic2 = 37;
 
-        return magic1 + magic2 * super.hashCode()
-            + ( innerList == null ? 0 : magic2 * innerList.hashCode() );
+        return magic1 + magic2 * super.hashCode() + ( innerList == null ? 0 : magic2 * innerList.hashCode() );
     }
 }

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/MonospaceBlock.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/MonospaceBlock.java?rev=705065&r1=705064&r2=705065&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/MonospaceBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/MonospaceBlock.java Wed Oct 15 14:46:08 2008
@@ -27,14 +27,15 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class MonospaceBlock extends AbstractFatherBlock
+class MonospaceBlock
+    extends AbstractFatherBlock
 {
     /**
      * Creates the MonospaceBlock.
      *
      * @param childBlocks child blocks
      */
-    MonospaceBlock( final Block [] childBlocks )
+    MonospaceBlock( final Block[] childBlocks )
     {
         super( childBlocks );
     }

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/NopBlock.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/NopBlock.java?rev=705065&r1=705064&r2=705065&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/NopBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/NopBlock.java Wed Oct 15 14:46:08 2008
@@ -27,7 +27,8 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class NopBlock implements Block
+class NopBlock
+    implements Block
 {
     /** {@inheritDoc} */
     public final void traverse( final Sink sink )

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -32,7 +32,8 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class NumeratedListBlock extends ListBlock
+class NumeratedListBlock
+    extends ListBlock
 {
     /**
      * order item type. one of Sink#NUMBERING_....

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -25,9 +25,10 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class ParagraphBlock extends AbstractFatherBlock
+class ParagraphBlock
+    extends AbstractFatherBlock
 {
-    ParagraphBlock( final Block []blocks )
+    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/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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -34,28 +34,34 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-public class ParagraphBlockParser implements BlockParser
+public class ParagraphBlockParser
+    implements BlockParser
 {
     /**
      * pattern used to dectect end of paragraph
      */
     private final Pattern paragraphSeparator = Pattern.compile( "^(\\s*)$" );
+
     /**
      * {@link SectionBlockParser} to use. injected
      */
     private SectionBlockParser sectionParser;
+
     /**
      * {@link ListBlockParser} to use. injected
      */
     private GenericListBlockParser listParser;
+
     /**
      * {@link FormatedTextParser} to use. injected
      */
     private FormatedTextParser textParser;
+
     /**
      * {@link HRuleBlockParser} to use. injected
      */
     private HRuleBlockParser hrulerParser;
+
     /**
      * {@link TableBlockParser} to use. injected
      */
@@ -74,9 +80,7 @@
     /** {@inheritDoc} */
     public final boolean accept( final String line )
     {
-        return !sectionParser.accept( line )
-                && !hrulerParser.accept( line )
-                && !verbatimParser.accept( line );
+        return !sectionParser.accept( line ) && !hrulerParser.accept( line ) && !verbatimParser.accept( line );
     }
 
     /** {@inheritDoc}
@@ -116,8 +120,7 @@
                 {
                     if ( sb.length() != 0 )
                     {
-                        childs.addAll( Arrays.asList( textParser
-                            .parse( sb.toString().trim() ) ) );
+                        childs.addAll( Arrays.asList( textParser.parse( sb.toString().trim() ) ) );
                         sb = new StringBuffer();
                     }
                     childs.add( listParser.visit( l, source ) );
@@ -161,8 +164,7 @@
 
         if ( sb.length() != 0 )
         {
-            childs.addAll( Arrays.asList( textParser
-                .parse( sb.toString().trim() ) ) );
+            childs.addAll( Arrays.asList( textParser.parse( sb.toString().trim() ) ) );
             sb = new StringBuffer();
         }
 
@@ -171,7 +173,7 @@
             return NOP;
         }
 
-        return new ParagraphBlock( (Block[]) childs.toArray( new Block[]{} ) );
+        return new ParagraphBlock( (Block[]) childs.toArray( new Block[] {} ) );
     }
 
     /**
@@ -236,8 +238,7 @@
     /**
      * @param aTableBlockParser Table parser to use
      */
-    public final void setTableBlockParser(
-        final TableBlockParser aTableBlockParser )
+    public final void setTableBlockParser( final TableBlockParser aTableBlockParser )
     {
         if ( aTableBlockParser == null )
         {

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -30,7 +30,8 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-public class SectionBlock extends AbstractFatherBlock
+public class SectionBlock
+    extends AbstractFatherBlock
 {
     /** {@inheritDoc} */
     private final String title;
@@ -48,8 +49,8 @@
      * @param blocks child blocks
      * @throws IllegalArgumentException if the parameters are not in the domain
      */
-    public SectionBlock( final String title, final int level,
-                         final Block []blocks ) throws IllegalArgumentException
+    public SectionBlock( final String title, final int level, final Block[] blocks )
+        throws IllegalArgumentException
     {
         super( blocks );
         final int maxLevel = 5;
@@ -115,14 +116,13 @@
     {
         try
         {
-            final Method m = sink.getClass().getMethod( name, new Class[]{} );
+            final Method m = sink.getClass().getMethod( name, new Class[] {} );
             m.invoke( sink, Collections.EMPTY_LIST.toArray() );
         }
         catch ( Exception e )
         {
             // FIXME
-            throw new IllegalArgumentException( "invoking sink's " + name
-                + " method: " + e.getMessage() );
+            throw new IllegalArgumentException( "invoking sink's " + name + " method: " + e.getMessage() );
         }
     }
 

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -32,13 +32,13 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-public class SectionBlockParser implements BlockParser
+public class SectionBlockParser
+    implements BlockParser
 {
     /**
      * '---++ Header', '---## Header'
      */
-    private static final Pattern HEADER_DA = Pattern
-        .compile( "^---([+]+)\\s*(.+)\\s*$" );
+    private static final Pattern HEADER_DA = Pattern.compile( "^---([+]+)\\s*(.+)\\s*$" );
 
     /**
      * {@link ParagraphBlockParser} to use. injected
@@ -62,7 +62,7 @@
     }
 
     /** {@inheritDoc}
-     * @throws org.apache.maven.doxia.parser.ParseException 
+     * @throws org.apache.maven.doxia.parser.ParseException
      */
     public final Block visit( final String line, final ByLineSource source )
         throws ParseException
@@ -71,8 +71,7 @@
 
         if ( !m.lookingAt() )
         {
-            throw new IllegalArgumentException( "don't know how to handle: "
-                + line );
+            throw new IllegalArgumentException( "don't know how to handle: " + line );
         }
 
         String newLine;
@@ -86,9 +85,12 @@
             }
             else
             {
-                if(verbatimBlockParser.accept( newLine )) {
+                if ( verbatimBlockParser.accept( newLine ) )
+                {
                     blocks.add( verbatimBlockParser.visit( newLine, source ) );
-                } else {
+                }
+                else
+                {
                     blocks.add( paraParser.visit( newLine, source ) );
                 }
             }
@@ -99,8 +101,7 @@
             source.ungetLine();
         }
 
-        return new SectionBlock( m.group( 2 ), getLevel( m.group( 1 ) ),
-                                 (Block[]) blocks.toArray( new Block[]{} ) );
+        return new SectionBlock( m.group( 2 ), getLevel( m.group( 1 ) ), (Block[]) blocks.toArray( new Block[] {} ) );
     }
 
     /**
@@ -108,14 +109,14 @@
      * @return tha level of the section
      * @throws IllegalArgumentException on error
      */
-    static int getLevel( final String s ) throws IllegalArgumentException
+    static int getLevel( final String s )
+        throws IllegalArgumentException
     {
         for ( int i = 0, n = s.length(); i < n; i++ )
         {
             if ( s.charAt( i ) != '+' )
             {
-                throw new IllegalArgumentException( "the argument must have only"
-                    + " '+' characters" );
+                throw new IllegalArgumentException( "the argument must have only" + " '+' characters" );
             }
         }
         return s.length();
@@ -154,8 +155,9 @@
      *
      * @param verbatimBlockParser <code>VerbatimBlockParser</code> with the verbatimBlockParser.
      */
-    public final void setVerbatimBlockParser(VerbatimBlockParser verbatimBlockParser) {
-        if ( verbatimBlockParser  == null )
+    public final void setVerbatimBlockParser( VerbatimBlockParser verbatimBlockParser )
+    {
+        if ( verbatimBlockParser == null )
         {
             throw new IllegalArgumentException( "argument can't be null" );
         }

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -27,14 +27,15 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class TableBlock extends AbstractFatherBlock
+class TableBlock
+    extends AbstractFatherBlock
 {
     /**
      * Creates the TableBlock.
      *
      * @param childBlocks child blocks
      */
-    public TableBlock( final Block [] childBlocks )
+    public TableBlock( final Block[] childBlocks )
     {
         super( childBlocks );
     }
@@ -53,9 +54,9 @@
         sink.table_();
     }
 
-    private final int [] getJustification() {
-        int[] justification = new int[((AbstractFatherBlock)getBlocks()[0]).
-                                      getBlocks().length];
+    private final int[] getJustification()
+    {
+        int[] justification = new int[( (AbstractFatherBlock) getBlocks()[0] ).getBlocks().length];
         for ( int i = 0; i < justification.length; i++ )
         {
             justification[i] = Sink.JUSTIFY_CENTER;

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -33,13 +33,14 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-public class TableBlockParser implements BlockParser
+public class TableBlockParser
+    implements BlockParser
 {
     /**
      * pattern to detect tables
      */
-    private static final Pattern TABLE_PATTERN =
-        Pattern.compile( "^\\s*([|].*[|])+\\s*$" );
+    private static final Pattern TABLE_PATTERN = Pattern.compile( "^\\s*([|].*[|])+\\s*$" );
+
     /**
      * text parser
      */
@@ -73,15 +74,12 @@
                 final List cells = new ArrayList();
 
                 /* for each cell... */
-                for ( int lh = l.indexOf( '|' ) + 1, rh;
-                      ( rh = l.indexOf( '|', lh ) ) != -1;
-                      lh = rh + 1 )
+                for ( int lh = l.indexOf( '|' ) + 1, rh; ( rh = l.indexOf( '|', lh ) ) != -1; lh = rh + 1 )
                 {
-                    final Block [] bs = textParser.parse( l.substring( lh, rh )
-                        .trim() );
+                    final Block[] bs = textParser.parse( l.substring( lh, rh ).trim() );
                     if ( bs.length == 1 && bs[0] instanceof BoldBlock )
                     {
-                        final Block []tmp = ( (BoldBlock) bs[0] ).getBlocks();
+                        final Block[] tmp = ( (BoldBlock) bs[0] ).getBlocks();
                         cells.add( new TableCellHeaderBlock( tmp ) );
                     }
                     else
@@ -89,7 +87,7 @@
                         cells.add( new TableCellBlock( bs ) );
                     }
                 }
-                rows.add( new TableRowBlock( (Block[]) cells.toArray( new Block[]{} ) ) );
+                rows.add( new TableRowBlock( (Block[]) cells.toArray( new Block[] {} ) ) );
             }
 
         }
@@ -97,7 +95,7 @@
 
         assert rows.size() >= 1;
 
-        return new TableBlock( (Block[]) rows.toArray( new Block[]{} ) );
+        return new TableBlock( (Block[]) rows.toArray( new Block[] {} ) );
     }
 
     /**

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -21,21 +21,21 @@
 
 import org.apache.maven.doxia.sink.Sink;
 
-
 /**
  * Table cell
  *
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class TableCellBlock extends AbstractFatherBlock
+class TableCellBlock
+    extends AbstractFatherBlock
 {
     /**
      * Creates the TableCellBlock.
      *
      * @param childBlocks childrens
      */
-    TableCellBlock( final Block [] childBlocks )
+    TableCellBlock( final Block[] childBlocks )
     {
         super( childBlocks );
     }

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableCellHeaderBlock.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/TableCellHeaderBlock.java?rev=705065&r1=705064&r2=705065&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableCellHeaderBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableCellHeaderBlock.java Wed Oct 15 14:46:08 2008
@@ -27,14 +27,15 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class TableCellHeaderBlock extends AbstractFatherBlock
+class TableCellHeaderBlock
+    extends AbstractFatherBlock
 {
     /**
      * Creates the TableCellHeaderBlock.
      *
      * @param childBlocks childrens
      */
-    TableCellHeaderBlock( final Block [] childBlocks )
+    TableCellHeaderBlock( final Block[] childBlocks )
     {
         super( childBlocks );
     }

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableRowBlock.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/TableRowBlock.java?rev=705065&r1=705064&r2=705065&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableRowBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/TableRowBlock.java Wed Oct 15 14:46:08 2008
@@ -21,21 +21,21 @@
 
 import org.apache.maven.doxia.sink.Sink;
 
-
 /**
  * Represens a Table Row
  *
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class TableRowBlock extends AbstractFatherBlock
+class TableRowBlock
+    extends AbstractFatherBlock
 {
     /**
      * Creates the TableRowBlock.
      *
      * @param childBlocks children blocks
      */
-    TableRowBlock( final Block [] childBlocks )
+    TableRowBlock( final Block[] childBlocks )
     {
         super( childBlocks );
     }

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -27,7 +27,8 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class TextBlock implements Block
+class TextBlock
+    implements Block
 {
     /**
      * the text
@@ -40,7 +41,8 @@
      * @param text some text. can't ben <code>null</code>
      * @throws IllegalArgumentException if parameters are not in the domain
      */
-    TextBlock( final String text ) throws IllegalArgumentException
+    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/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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -38,32 +38,31 @@
      */
     private static final Pattern WIKIWORD_PATTERN =
         Pattern.compile( "(!?([A-Z]\\w*[.])?([A-Z][a-z]+){2,}(#\\w*)?)" );
+
     /**
      * pattern to detect SpecificLinks links [[reference][text]]
      */
-    private static final Pattern SPECIFICLINK_PATTERN =
-        Pattern.compile( "!?\\[\\[([^\\]]+)\\]\\[([^\\]]+)\\]\\]" );
+    private static final Pattern SPECIFICLINK_PATTERN = Pattern.compile( "!?\\[\\[([^\\]]+)\\]\\[([^\\]]+)\\]\\]" );
+
     /**
      * pattern to detect ForcedLinks links [[reference asd]]
      */
-    private static final Pattern FORCEDLINK_PATTERN =
-        Pattern.compile( "(!)?(\\[\\[(.+)\\]\\])" );
+    private static final Pattern FORCEDLINK_PATTERN = Pattern.compile( "(!)?(\\[\\[(.+)\\]\\])" );
+
     /**
      * anchor name
      */
-    private static final Pattern ANCHOR_PATTERN =
-        Pattern.compile( "#(([A-Z][A-Za-z]*){2,})" );
+    private static final Pattern ANCHOR_PATTERN = Pattern.compile( "#(([A-Z][A-Za-z]*){2,})" );
+
     /**
      * url word
      */
-    private static final Pattern URL_PATTERN =
-        Pattern.compile( "(\\w+):[/][/][^\\s]*" );
+    private static final Pattern URL_PATTERN = Pattern.compile( "(\\w+):[/][/][^\\s]*" );
 
     /**
      *  image pattern specification
      */
-    private static final Pattern IMAGE_PATTERN =
-        Pattern.compile( "(.*)\\.(png|jpg|gif|bmp)" );
+    private static final Pattern IMAGE_PATTERN = Pattern.compile( "(.*)\\.(png|jpg|gif|bmp)" );
 
     /**
      *  image tag pattern specification (used for images at relative URLs)
@@ -117,7 +116,8 @@
             xhtmlMatcher = pattern.matcher( line );
         }
 
-        if ( xhtmlMatcher!= null && xhtmlMatcher.find() ) {
+        if ( xhtmlMatcher != null && xhtmlMatcher.find() )
+        {
             parseXHTML( line, ret, xhtmlMatcher );
         }
         else if ( linkMatcher.find() )
@@ -140,7 +140,8 @@
         {
             parseUrl( line, ret, urlMatcher );
         }
-        else if ( imageTagMatcher.find() ) {
+        else if ( imageTagMatcher.find() )
+        {
             parseImage( line, ret, imageTagMatcher );
         }
         else
@@ -160,7 +161,8 @@
      * @param ret where the results live
      * @param imageTagMatcher image tag matcher
      */
-    private void parseImage(final String line, final List ret, final Matcher imageTagMatcher) {
+    private void parseImage( final String line, final List ret, final Matcher imageTagMatcher )
+    {
         ret.addAll( parse( line.substring( 0, imageTagMatcher.start() ) ) );
         final String src = imageTagMatcher.group( 2 );
         ret.add( new ImageBlock( src ) );
@@ -173,8 +175,7 @@
      * @param ret where the results live
      * @param urlMatcher url matcher
      */
-    private void parseUrl( final String line, final List ret,
-                           final Matcher urlMatcher )
+    private void parseUrl( final String line, final List ret, final Matcher urlMatcher )
     {
         ret.addAll( parse( line.substring( 0, urlMatcher.start() ) ) );
         final String url = urlMatcher.group( 0 );
@@ -187,8 +188,7 @@
         {
             ret.add( new LinkBlock( url, new TextBlock( url ) ) );
         }
-        ret.addAll( parse( line.substring(
-                urlMatcher.end(), line.length() ) ) );
+        ret.addAll( parse( line.substring( urlMatcher.end(), line.length() ) ) );
     }
 
     /**
@@ -197,8 +197,7 @@
      * @param ret where the results live
      * @param anchorMatcher anchor matcher
      */
-    private void parseAnchor( final String line, final List ret,
-                              final Matcher anchorMatcher )
+    private void parseAnchor( final String line, final List ret, final Matcher anchorMatcher )
     {
         ret.addAll( parse( line.substring( 0, anchorMatcher.start() ) ) );
         ret.add( new AnchorBlock( anchorMatcher.group( 1 ) ) );
@@ -211,8 +210,7 @@
      * @param ret where the results live
      * @param forcedLinkMatcher forced link matcher
      */
-    private void parseForcedLink( final String line, final List ret,
-                                  final Matcher forcedLinkMatcher )
+    private void parseForcedLink( final String line, final List ret, final Matcher forcedLinkMatcher )
     {
         if ( forcedLinkMatcher.group( 1 ) != null )
         {
@@ -232,17 +230,14 @@
                 }
                 else
                 {
-                    ret.add( new LinkBlock( s.substring( 0, i ),
-                                            new TextBlock( s.substring( i ).trim() ) ) );
+                    ret.add( new LinkBlock( s.substring( 0, i ), new TextBlock( s.substring( i ).trim() ) ) );
                 }
             }
             else
             {
-                ret.addAll( parse( line.substring( 0,
-                        forcedLinkMatcher.start() ) ) );
+                ret.addAll( parse( line.substring( 0, forcedLinkMatcher.start() ) ) );
                 ret.add( createLink( showText, showText ) );
-                ret.addAll( parse( line.substring( forcedLinkMatcher.end(),
-                        line.length() ) ) );
+                ret.addAll( parse( line.substring( forcedLinkMatcher.end(), line.length() ) ) );
             }
         }
     }
@@ -256,7 +251,7 @@
     private Block createLink( final String link, final String showText )
     {
         final Block content;
-        if( URL_PATTERN.matcher( showText ).matches() && IMAGE_PATTERN.matcher( showText ).matches() )
+        if ( URL_PATTERN.matcher( showText ).matches() && IMAGE_PATTERN.matcher( showText ).matches() )
         {
             content = new ImageBlock( showText );
         }
@@ -270,8 +265,7 @@
             return new LinkBlock( link, content );
         }
 
-        final StringTokenizer tokenizer =
-            new StringTokenizer( link );
+        final StringTokenizer tokenizer = new StringTokenizer( link );
         final StringBuffer sb = new StringBuffer();
 
         while ( tokenizer.hasMoreElements() )
@@ -283,15 +277,13 @@
         return new WikiWordBlock( sb.toString(), content, wikiWordLinkResolver );
     }
 
-
     /**
      * Parses a wiki word
      * @param line the line to parse
      * @param ret where the results live
      * @param wikiMatcher wiki matcher
      */
-    private void parseWiki( final String line, final List ret,
-                            final Matcher wikiMatcher )
+    private void parseWiki( final String line, final List ret, final Matcher wikiMatcher )
     {
         final String wikiWord = wikiMatcher.group();
         ret.addAll( parse( line.substring( 0, wikiMatcher.start() ) ) );
@@ -301,36 +293,31 @@
         }
         else
         {
-            ret.add( new WikiWordBlock( wikiWord , wikiWordLinkResolver ) );
+            ret.add( new WikiWordBlock( wikiWord, wikiWordLinkResolver ) );
         }
         ret.addAll( parse( line.substring( wikiMatcher.end(), line.length() ) ) );
     }
 
-
     /**
      * Parses a link
      * @param line the line to parse
      * @param ret where the results live
      * @param linkMatcher link matcher
      */
-    private void parseLink( final String line, final List ret,
-                            final Matcher linkMatcher )
+    private void parseLink( final String line, final List ret, final Matcher linkMatcher )
     {
         ret.addAll( parse( line.substring( 0, linkMatcher.start() ) ) );
         if ( line.charAt( linkMatcher.start() ) == '!' )
         {
-            ret.add( new TextBlock( line.substring( linkMatcher.start() + 1,
-                                                    linkMatcher.end() ) ) );
+            ret.add( new TextBlock( line.substring( linkMatcher.start() + 1, linkMatcher.end() ) ) );
         }
         else
         {
-            ret.add( createLink( linkMatcher.group( 1 ),
-                                    linkMatcher.group( 2 ) ) );
+            ret.add( createLink( linkMatcher.group( 1 ), linkMatcher.group( 2 ) ) );
         }
         ret.addAll( parse( line.substring( linkMatcher.end(), line.length() ) ) );
     }
 
-
     /**
      * Parses xhtml.
      *

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -32,7 +32,8 @@
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class UnorderedListBlock extends ListBlock
+class UnorderedListBlock
+    extends ListBlock
 {
     /**
      * Creates the UnorderedListBlock.

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlock.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/VerbatimBlock.java?rev=705065&r1=705064&r2=705065&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlock.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlock.java Wed Oct 15 14:46:08 2008
@@ -27,14 +27,15 @@
  * @author Christian Nardi
  * @version $Id$
  */
-class VerbatimBlock extends AbstractFatherBlock
+class VerbatimBlock
+    extends AbstractFatherBlock
 {
     /**
      * Creates the VerbatimBlock.
      *
      * @param childBlocks child blocks
      */
-    VerbatimBlock( final Block [] childBlocks )
+    VerbatimBlock( final Block[] childBlocks )
     {
         super( childBlocks );
     }

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -33,16 +33,15 @@
  * @author Christian Nardi
  * @version $Id$
  */
-public class VerbatimBlockParser implements BlockParser
+public class VerbatimBlockParser
+    implements BlockParser
 {
     /**
      * pattern to detect verbatim start tags
      */
-    private static final Pattern VERBATIM_START_PATTERN =
-        Pattern.compile( "\\s*<verbatim>" );
+    private static final Pattern VERBATIM_START_PATTERN = Pattern.compile( "\\s*<verbatim>" );
 
-    private static final Pattern VERBATIM_END_PATTERN =
-        Pattern.compile( "</verbatim>" );
+    private static final Pattern VERBATIM_END_PATTERN = Pattern.compile( "</verbatim>" );
 
     /** {@inheritDoc} */
     public final boolean accept( final String line )
@@ -78,7 +77,6 @@
             l = source.getNextLine();
         }
 
-
-        return new VerbatimBlock( (Block[]) lines.toArray( new Block[]{} ) );
+        return new VerbatimBlock( (Block[]) lines.toArray( new Block[] {} ) );
     }
 }

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -21,23 +21,25 @@
 
 import org.apache.maven.doxia.sink.Sink;
 
-
 /**
  * Represent a WikiWord
  *
  * @author Juan F. Codagnone
  * @version $Id$
  */
-class WikiWordBlock implements Block
+class WikiWordBlock
+    implements Block
 {
     /**
      * the wiki word
      */
     private final String wikiword;
+
     /**
      * content to show in the wiki word link
      */
     private final Block content;
+
     /**
      * Resolves WikiWord links
      */
@@ -48,8 +50,7 @@
      * @param aWikiword the wikiWord
      * @param resolver responsible of resolving the link to the wikiWord
      */
-    WikiWordBlock( final String aWikiword,
-            final WikiWordLinkResolver resolver )
+    WikiWordBlock( final String aWikiword, final WikiWordLinkResolver resolver )
     {
         this( aWikiword, aWikiword, resolver );
     }
@@ -63,8 +64,7 @@
      * @throws IllegalArgumentException if the wikiword is <code>null</code>
      * @deprecated
      */
-    WikiWordBlock( final String aWikiword, final String aText ,
-            final WikiWordLinkResolver resolver )
+    WikiWordBlock( final String aWikiword, final String aText, final WikiWordLinkResolver resolver )
     {
         this( aWikiword, new TextBlock( aText ), resolver );
     }
@@ -77,8 +77,7 @@
      * @param resolver responsible of resolving the link to the wikiWord
      * @throws IllegalArgumentException if the wikiword is <code>null</code>
      */
-    WikiWordBlock( final String aWikiword, final Block content ,
-            final WikiWordLinkResolver resolver )
+    WikiWordBlock( final String aWikiword, final Block content, final WikiWordLinkResolver resolver )
     {
         if ( aWikiword == null || content == null || resolver == null )
         {
@@ -109,8 +108,7 @@
         else if ( obj instanceof WikiWordBlock )
         {
             final WikiWordBlock w = (WikiWordBlock) obj;
-            ret = wikiword.equals( w.wikiword )
-                && content.equals( w.content );
+            ret = wikiword.equals( w.wikiword ) && content.equals( w.content );
         }
 
         return ret;
@@ -122,7 +120,6 @@
         final int magic1 = 17;
         final int magic2 = 37;
 
-        return magic1 + magic2 * wikiword.hashCode()
-            + magic2 * content.hashCode();
+        return magic1 + magic2 * wikiword.hashCode() + magic2 * content.hashCode();
     }
 }

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -27,7 +27,8 @@
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id$
  */
-class XHTMLBlock implements Block
+class XHTMLBlock
+    implements Block
 {
     private final String tag;
 
@@ -37,7 +38,8 @@
      * @param tag the tag, eg: &lt;pre&gt;
      * @throws IllegalArgumentException if the arguments are <code>null</code>
      */
-    XHTMLBlock( final String tag ) throws IllegalArgumentException
+    XHTMLBlock( final String tag )
+        throws IllegalArgumentException
     {
         if ( tag == null )
         {
@@ -49,7 +51,7 @@
     /** {@inheritDoc}*/
     public final void traverse( final Sink sink )
     {
-        if ( tag.trim().length() == 0)
+        if ( tag.trim().length() == 0 )
         {
             return;
         }

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=705065&r1=705064&r2=705065&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 Wed Oct 15 14:46:08 2008
@@ -24,7 +24,8 @@
  * @author Christian Nardi
  * @version $Id$
  */
-public class XHTMLWikiWordLinkResolver implements WikiWordLinkResolver
+public class XHTMLWikiWordLinkResolver
+    implements WikiWordLinkResolver
 {
     /**
      * This only works for xhtml output, but there is no way

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/AbstractBlockTestCase.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/AbstractBlockTestCase.java?rev=705065&r1=705064&r2=705065&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/AbstractBlockTestCase.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/AbstractBlockTestCase.java Wed Oct 15 14:46:08 2008
@@ -23,55 +23,60 @@
 
 import org.apache.maven.doxia.module.twiki.TWikiParser;
 
-
 /**
  * Common code to the Block unit tests
  *
  * @author Juan F. Codagnone
  * @since Nov 1, 2005
  */
-public abstract class AbstractBlockTestCase extends TestCase
+public abstract class AbstractBlockTestCase
+    extends TestCase
 {
     /**
      * sectionParser to use in all the tests
      */
     protected final SectionBlockParser sectionParser = new SectionBlockParser();
+
     /**
      * ParagraphBlockParser  to use in all the tests
      */
-    protected final ParagraphBlockParser paraParser =
-        new ParagraphBlockParser();
+    protected final ParagraphBlockParser paraParser = new ParagraphBlockParser();
+
     /**
      * ListBlockParser used in all the tests
      */
-    protected final GenericListBlockParser listParser =
-        new GenericListBlockParser();
+    protected final GenericListBlockParser listParser = new GenericListBlockParser();
+
     /**
      * FormatedTextParser used in all the tests
      */
-    protected final FormatedTextParser formatTextParser =
-        new FormatedTextParser();
+    protected final FormatedTextParser formatTextParser = new FormatedTextParser();
+
     /**
      * TextParser used in all the tests
      */
-    protected final TextParser textParser = new TextParser( 
-            new XHTMLWikiWordLinkResolver() );
+    protected final TextParser textParser = new TextParser( new XHTMLWikiWordLinkResolver() );
+
     /**
      * TextParser used in all the tests
      */
     protected final HRuleBlockParser hruleParser = new HRuleBlockParser();
+
     /**
      * TableBlockParser used in all the tests
      */
     protected final TableBlockParser tableParser = new TableBlockParser();
+
     /**
      * TWiki used in all the tests
      */
     protected final TWikiParser twikiParser = new TWikiParser();
-    /** 
+
+    /**
      * Parser for verbatim blocks
      */
     private final VerbatimBlockParser verbatimParser = new VerbatimBlockParser();
+
     /**
      * Creates the AbstractBlockTestCase.
      */
@@ -90,12 +95,13 @@
         formatTextParser.setTextParser( textParser );
         tableParser.setTextParser( formatTextParser );
     }
+
     /**
      * Returns the verbatimParser.
-     * 
+     *
      * @return <code>VerbatimBlockParser</code> with the verbatimParser.
      */
-    protected final VerbatimBlockParser getVerbatimParser() 
+    protected final VerbatimBlockParser getVerbatimParser()
     {
         return verbatimParser;
     }



Mime
View raw message