maven-doxia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1090706 [3/3] - in /maven/doxia/doxia/trunk: ./ doxia-book/ doxia-book/src/main/java/org/apache/maven/doxia/book/ doxia-book/src/main/java/org/apache/maven/doxia/book/context/ doxia-book/src/main/java/org/apache/maven/doxia/book/services/i...
Date Sat, 09 Apr 2011 23:15:31 GMT
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=1090706&r1=1090705&r2=1090706&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
Sat Apr  9 23:15:28 2011
@@ -90,7 +90,7 @@ public class ParagraphBlockParser
         throws ParseException
     {
         StringBuffer sb = new StringBuffer();
-        List childs = new ArrayList();
+        List<Block> childs = new ArrayList<Block>();
 
         boolean sawText = false;
 
@@ -173,7 +173,7 @@ public class ParagraphBlockParser
             return NOP;
         }
 
-        return new ParagraphBlock( (Block[]) childs.toArray( new Block[] {} ) );
+        return new ParagraphBlock( childs.toArray( new Block[] {} ) );
     }
 
     /**

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=1090706&r1=1090705&r2=1090706&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
Sat Apr  9 23:15:28 2011
@@ -75,7 +75,7 @@ public class SectionBlockParser
         }
 
         String newLine;
-        final ArrayList blocks = new ArrayList();
+        final ArrayList<Block> blocks = new ArrayList<Block>();
 
         while ( ( newLine = source.getNextLine() ) != null && !accept( newLine )
)
         {
@@ -101,7 +101,7 @@ public class SectionBlockParser
             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 ) ), blocks.toArray(
new Block[] {} ) );
     }
 
     /**

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=1090706&r1=1090705&r2=1090706&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
Sat Apr  9 23:15:28 2011
@@ -63,7 +63,7 @@ public class TableBlockParser
             throw new IllegalAccessError( "call accept before this ;)" );
         }
 
-        final List rows = new ArrayList();
+        final List<Block> rows = new ArrayList<Block>();
         String l = line;
 
         do
@@ -71,7 +71,7 @@ public class TableBlockParser
             final Matcher m = TABLE_PATTERN.matcher( l );
             if ( m.lookingAt() )
             {
-                final List cells = new ArrayList();
+                final List<Block> cells = new ArrayList<Block>();
 
                 /* for each cell... */
                 for ( int lh = l.indexOf( '|' ) + 1, rh; ( rh = l.indexOf( '|', lh ) ) !=
-1; lh = rh + 1 )
@@ -95,7 +95,7 @@ public class TableBlockParser
 
         assert rows.size() >= 1;
 
-        return new TableBlock( (Block[]) rows.toArray( new Block[] {} ) );
+        return new TableBlock( rows.toArray( new Block[] {} ) );
     }
 
     /**

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=1090706&r1=1090705&r2=1090706&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
Sat Apr  9 23:15:28 2011
@@ -97,9 +97,9 @@ public class TextParser
      * @param line line to parse
      * @return a list of block that represents the input
      */
-    public final List parse( final String line )
+    public final List<Block> parse( final String line )
     {
-        final List ret = new ArrayList();
+        final List<Block> ret = new ArrayList<Block>();
 
         final Matcher linkMatcher = SPECIFICLINK_PATTERN.matcher( line );
         final Matcher wikiMatcher = WIKIWORD_PATTERN.matcher( line );
@@ -164,7 +164,7 @@ public class TextParser
      * @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<Block> ret, final Matcher
imageTagMatcher )
     {
         ret.addAll( parse( line.substring( 0, imageTagMatcher.start() ) ) );
         final String src = imageTagMatcher.group( 2 );
@@ -178,7 +178,7 @@ public class TextParser
      * @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<Block> ret, final Matcher
urlMatcher )
     {
         ret.addAll( parse( line.substring( 0, urlMatcher.start() ) ) );
         final String url = urlMatcher.group( 0 );
@@ -200,7 +200,7 @@ public class TextParser
      * @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<Block> ret, final Matcher
anchorMatcher )
     {
         ret.addAll( parse( line.substring( 0, anchorMatcher.start() ) ) );
         ret.add( new AnchorBlock( anchorMatcher.group( 1 ) ) );
@@ -213,7 +213,7 @@ public class TextParser
      * @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<Block> ret, final Matcher
forcedLinkMatcher )
     {
         if ( forcedLinkMatcher.group( 1 ) != null )
         {
@@ -286,7 +286,7 @@ public class TextParser
      * @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<Block> ret, final Matcher
wikiMatcher )
     {
         final String wikiWord = wikiMatcher.group();
         ret.addAll( parse( line.substring( 0, wikiMatcher.start() ) ) );
@@ -307,7 +307,7 @@ public class TextParser
      * @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<Block> ret, final Matcher
linkMatcher )
     {
         ret.addAll( parse( line.substring( 0, linkMatcher.start() ) ) );
         if ( line.charAt( linkMatcher.start() ) == '!' )
@@ -328,7 +328,7 @@ public class TextParser
      * @param ret where the results live
      * @param xhtmlMatcher xhtml matcher
      */
-    private void parseXHTML( final String line, final List ret, final Matcher xhtmlMatcher
)
+    private void parseXHTML( final String line, final List<Block> ret, final Matcher
xhtmlMatcher )
     {
         if ( xhtmlMatcher.group( 1 ).indexOf( "noautolink" ) != -1 )
         {

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=1090706&r1=1090705&r2=1090706&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
Sat Apr  9 23:15:28 2011
@@ -61,7 +61,7 @@ public class VerbatimBlockParser
             throw new IllegalAccessError( "call accept before this ;)" );
         }
 
-        final List lines = new ArrayList();
+        final List<Block> lines = new ArrayList<Block>();
         Matcher matcher = VERBATIM_START_PATTERN.matcher( line );
         matcher.find();
         String l = line.substring( matcher.end() );
@@ -78,6 +78,6 @@ public class VerbatimBlockParser
             l = source.getNextLine();
         }
 
-        return new VerbatimBlock( (Block[]) lines.toArray( new Block[] {} ) );
+        return new VerbatimBlock( lines.toArray( new Block[] {} ) );
     }
 }

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml?rev=1090706&r1=1090705&r2=1090706&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/pom.xml Sat Apr  9 23:15:28 2011
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

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=1090706&r1=1090705&r2=1090706&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
Sat Apr  9 23:15:28 2011
@@ -64,7 +64,7 @@ public class XdocParser
     private String macroName;
 
     /** The macro parameters. */
-    private Map macroParameters = new HashMap();
+    private Map<String, Object> macroParameters = new HashMap<String, Object>();
 
     /** Indicates that we're inside &lt;properties&gt; or &lt;head&gt;.*/
     private boolean inHead;
@@ -401,7 +401,7 @@ public class XdocParser
 
             if ( macroParameters == null )
             {
-                macroParameters = new HashMap();
+                macroParameters = new HashMap<String, Object>();
             }
 
             if ( StringUtils.isEmpty( macroName ) )

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml?rev=1090706&r1=1090705&r2=1090706&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/pom.xml Sat Apr  9 23:15:28 2011
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <artifactId>doxia-modules</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-modules/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/pom.xml?rev=1090706&r1=1090705&r2=1090706&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/pom.xml Sat Apr  9 23:15:28 2011
@@ -22,7 +22,7 @@ under the License.
   <parent>
     <artifactId>doxia</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-sink-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-sink-api/pom.xml?rev=1090706&r1=1090705&r2=1090706&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-sink-api/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-sink-api/pom.xml Sat Apr  9 23:15:28 2011
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <artifactId>doxia</artifactId>
     <groupId>org.apache.maven.doxia</groupId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/doxia-test-docs/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-test-docs/pom.xml?rev=1090706&r1=1090705&r2=1090706&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-test-docs/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-test-docs/pom.xml Sat Apr  9 23:15:28 2011
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.doxia</groupId>
     <artifactId>doxia</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

Modified: maven/doxia/doxia/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=1090706&r1=1090705&r2=1090706&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/pom.xml (original)
+++ maven/doxia/doxia/trunk/pom.xml Sat Apr  9 23:15:28 2011
@@ -31,7 +31,7 @@ under the License.
 
   <groupId>org.apache.maven.doxia</groupId>
   <artifactId>doxia</artifactId>
-  <version>1.1.5-SNAPSHOT</version>
+  <version>1.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Doxia</name>
@@ -265,6 +265,14 @@ under the License.
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
           <version>1.3</version>
         </plugin>
@@ -282,6 +290,13 @@ under the License.
           <version>1.3.5</version>
         </plugin>
         <plugin>
+          <groupId>org.codehaus.modello</groupId>
+          <artifactId>modello-maven-plugin</artifactId>
+          <configuration>
+            <useJava5>true</useJava5>
+          </configuration>
+        </plugin>
+        <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>clirr-maven-plugin</artifactId>
           <configuration>
@@ -292,7 +307,7 @@ under the License.
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <configuration>
-            <source>1.4</source>
+            <source>1.5</source>
             <links>
               <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
               <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
@@ -383,7 +398,7 @@ under the License.
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
-              <source>1.4</source>
+              <source>1.5</source>
               <links>
                 <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
                 <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
@@ -424,7 +439,7 @@ under the License.
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
               <aggregate>true</aggregate>
-              <source>1.4</source>
+              <source>1.5</source>
               <links>
                 <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
                 <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>



Mime
View raw message