You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/10/24 00:01:02 UTC
svn commit: r1633964 - in /maven/doxia/doxia/trunk: ./
doxia-core/src/main/java/org/apache/maven/doxia/markup/
doxia-core/src/main/java/org/apache/maven/doxia/module/site/
doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/
doxia-core/...
Author: hboutemy
Date: Thu Oct 23 22:01:01 2014
New Revision: 1633964
URL: http://svn.apache.org/r1633964
Log:
updated parent pom
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/Markup.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/TextMarkup.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/SiteModule.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleManager.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/RandomAccessSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptMarkup.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceMarkup.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookMarkup.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/SimplifiedDocbookMarkup.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlMarkup.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoMarkup.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Monospace.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBold.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBoldItalic.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceItalic.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/PBMReader.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerif.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBold.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBoldItalic.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifItalic.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Serif.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBold.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBoldItalic.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifItalic.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocMarkup.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlMarkup.java
maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributes.java
maven/doxia/doxia/trunk/pom.xml
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java Thu Oct 23 22:01:01 2014
@@ -35,6 +35,7 @@ import javax.swing.text.html.HTML.Tag;
* @version $Id$
* @since 1.0
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface HtmlMarkup
extends XmlMarkup
{
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/Markup.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/Markup.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/Markup.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/Markup.java Thu Oct 23 22:01:01 2014
@@ -26,6 +26,7 @@ package org.apache.maven.doxia.markup;
* @version $Id$
* @since 1.0
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface Markup
{
/** The vm line separator */
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/TextMarkup.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/TextMarkup.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/TextMarkup.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/TextMarkup.java Thu Oct 23 22:01:01 2014
@@ -26,6 +26,7 @@ package org.apache.maven.doxia.markup;
* @version $Id$
* @since 1.0
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface TextMarkup
extends Markup
{
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java Thu Oct 23 22:01:01 2014
@@ -19,6 +19,7 @@ package org.apache.maven.doxia.markup;
* under the License.
*/
+
/**
* List of constants used by <code>Xml</code> markup syntax.
*
@@ -26,6 +27,7 @@ package org.apache.maven.doxia.markup;
* @version $Id$
* @since 1.0
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface XmlMarkup
extends Markup
{
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/SiteModule.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/SiteModule.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/SiteModule.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/SiteModule.java Thu Oct 23 22:01:01 2014
@@ -19,8 +19,6 @@ package org.apache.maven.doxia.module.si
* under the License.
*/
-import org.apache.maven.doxia.parser.module.ParserModule;
-
/**
* Provides definitions for a Doxia module. This is used by the doxia site tools.
*
@@ -28,7 +26,7 @@ import org.apache.maven.doxia.parser.mod
* @version $Id$
* @since 1.0
* @deprecated use ParserModule
- * @see ParserModule
+ * @see org.apache.maven.doxia.parser.module.ParserModule
*/
public interface SiteModule
{
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleManager.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleManager.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleManager.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/SiteModuleManager.java Thu Oct 23 22:01:01 2014
@@ -20,7 +20,6 @@ package org.apache.maven.doxia.module.si
*/
import org.apache.maven.doxia.module.site.SiteModule;
-import org.apache.maven.doxia.parser.module.ParserModuleManager;
import java.util.Collection;
@@ -31,7 +30,7 @@ import java.util.Collection;
* @version $Id$
* @since 1.0
* @deprecated use ParserModuleManager
- * @see ParserModuleManager
+ * @see org.apache.maven.doxia.parser.module.ParserModuleManager
*/
public interface SiteModuleManager
{
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java Thu Oct 23 22:01:01 2014
@@ -418,7 +418,7 @@ public abstract class AbstractXmlParser
* @param type the tag event type. This should be one of HtmlMarkup.TAG_TYPE_SIMPLE,
* HtmlMarkup.TAG_TYPE_START, HtmlMarkup.TAG_TYPE_END or HtmlMarkup.ENTITY_TYPE.
* It will be passed as the first argument of the required parameters to the Sink
- * {@link org.apache.maven.doxia.sink.Sink#unknown(String, Object[], org.apache.maven.doxia.sink.SinkEventAttributes)}
+ * {@link org.apache.maven.doxia.sink.Sink#unknown(String, Object[], SinkEventAttributes)}
* method.
*/
protected void handleUnknown( XmlPullParser parser, Sink sink, int type )
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/RandomAccessSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/RandomAccessSink.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/RandomAccessSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/RandomAccessSink.java Thu Oct 23 22:01:01 2014
@@ -60,7 +60,8 @@ public class RandomAccessSink
{
this.sinkFactory = sinkFactory;
this.coreOutputStream = stream;
- this.coreSink = this.currentSink = sinkFactory.createSink( stream );
+ this.currentSink = sinkFactory.createSink( stream );
+ this.coreSink = this.currentSink;
}
public RandomAccessSink( SinkFactory sinkFactory, OutputStream stream, String encoding )
@@ -69,7 +70,8 @@ public class RandomAccessSink
this.sinkFactory = sinkFactory;
this.coreOutputStream = stream;
this.encoding = encoding;
- this.coreSink = this.currentSink = sinkFactory.createSink( stream, encoding );
+ this.currentSink = sinkFactory.createSink( stream, encoding );
+ this.coreSink = this.currentSink;
}
public RandomAccessSink( SinkFactory sinkFactory, File outputDirectory, String outputName )
@@ -77,7 +79,8 @@ public class RandomAccessSink
{
this.sinkFactory = sinkFactory;
this.coreOutputStream = new FileOutputStream( new File( outputDirectory, outputName ) );
- this.coreSink = this.currentSink = sinkFactory.createSink( coreOutputStream );
+ this.currentSink = sinkFactory.createSink( coreOutputStream );
+ this.coreSink = this.currentSink;
}
public RandomAccessSink( SinkFactory sinkFactory, File outputDirectory, String outputName, String encoding )
@@ -86,7 +89,8 @@ public class RandomAccessSink
this.sinkFactory = sinkFactory;
this.coreOutputStream = new FileOutputStream( new File( outputDirectory, outputName ) );
this.encoding = encoding;
- this.coreSink = this.currentSink = sinkFactory.createSink( coreOutputStream, encoding );
+ this.currentSink = sinkFactory.createSink( coreOutputStream, encoding );
+ this.coreSink = this.currentSink;
}
/**
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptMarkup.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptMarkup.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptMarkup.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptMarkup.java Thu Oct 23 22:01:01 2014
@@ -31,6 +31,7 @@ import org.codehaus.plexus.util.StringUt
* @version $Id$
* @since 1.0
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface AptMarkup
extends TextMarkup
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceMarkup.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceMarkup.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceMarkup.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceMarkup.java Thu Oct 23 22:01:01 2014
@@ -31,6 +31,7 @@ import org.apache.maven.doxia.markup.Tex
* @version $Id$
* @since 1.0
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface ConfluenceMarkup
extends TextMarkup
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java Thu Oct 23 22:01:01 2014
@@ -243,8 +243,8 @@ public class ChildBlocksBuilder
{
link = link.substring( 1 ); // chop off the lead ^ from link and from value
value = link;
- addHTMLSuffix =
- false; // force verbatim link to support attaching files/resources (not just .html files)
+ addHTMLSuffix = false; // force verbatim link to support attaching files/resources (not
+ // just .html files)
}
if ( addHTMLSuffix )
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java Thu Oct 23 22:01:01 2014
@@ -131,7 +131,8 @@ public class ListBlockParser
if ( line.startsWith( "*" ) || line.startsWith( "-" ) || line.startsWith( "#" ) )
{
String temp = line.substring( 1 );
- while ( temp.length() > 0 && ( temp.charAt( 0 ) == '*' || temp.charAt( 0 ) == '-' || temp.charAt( 0 ) == '#' ) )
+ while ( temp.length() > 0
+ && ( temp.charAt( 0 ) == '*' || temp.charAt( 0 ) == '-' || temp.charAt( 0 ) == '#' ) )
{
temp = temp.substring( 1 );
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java Thu Oct 23 22:01:01 2014
@@ -394,7 +394,7 @@ public class DocBookParser
}
else if ( parser.getName().equals( SimplifiedDocbookMarkup.CAPTION_TAG.toString() ) )
{
- handleCaptionEnd(sink);
+ handleCaptionEnd( sink );
}
else if ( parser.getName().equals( SimplifiedDocbookMarkup.TABLE_TAG.toString() )
|| parser.getName().equals( SimplifiedDocbookMarkup.INFORMALTABLE_TAG.toString() ) )
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookMarkup.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookMarkup.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookMarkup.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookMarkup.java Thu Oct 23 22:01:01 2014
@@ -33,6 +33,7 @@ import org.apache.maven.doxia.markup.Xml
* @since 1.0
* @deprecated This interface is incomplete and will be removed. Use {@link SimplifiedDocbookMarkup} instead.
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface DocbookMarkup
extends XmlMarkup
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/SimplifiedDocbookMarkup.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/SimplifiedDocbookMarkup.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/SimplifiedDocbookMarkup.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/SimplifiedDocbookMarkup.java Thu Oct 23 22:01:01 2014
@@ -32,6 +32,7 @@ import org.apache.maven.doxia.markup.Xml
* @version $Id$
* @since 1.1.1
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface SimplifiedDocbookMarkup
extends XmlMarkup
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlMarkup.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlMarkup.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlMarkup.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlMarkup.java Thu Oct 23 22:01:01 2014
@@ -33,6 +33,7 @@ import org.apache.maven.doxia.markup.Htm
* @version $Id$
* @since 1.0
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface FmlMarkup
extends HtmlMarkup
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java Thu Oct 23 22:01:01 2014
@@ -501,7 +501,8 @@ public class FmlParser
executeMacro( macroName, request, sink );
sink.close();
buffer.append( sw.toString() );
- } catch ( MacroNotFoundException me )
+ }
+ catch ( MacroNotFoundException me )
{
throw new MacroExecutionException( "Macro not found: " + macroName, me );
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java Thu Oct 23 22:01:01 2014
@@ -74,21 +74,21 @@ public class FoAggregateSink
*
* @see #setDocumentModel(DocumentModel, int)
*/
- public static int TOC_NONE = 0;
+ public static final int TOC_NONE = 0;
/**
* Table Of Content at the start of the document.
*
* @see #setDocumentModel(DocumentModel, int)
*/
- public static int TOC_START = 1;
+ public static final int TOC_START = 1;
/**
* Table Of Content at the end of the document.
*
* @see #setDocumentModel(DocumentModel, int)
*/
- public static int TOC_END = 2;
+ public static final int TOC_END = 2;
// TODO: make configurable
private static final String COVER_HEADER_HEIGHT = "1.5in";
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoMarkup.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoMarkup.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoMarkup.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoMarkup.java Thu Oct 23 22:01:01 2014
@@ -30,6 +30,7 @@ import org.apache.maven.doxia.markup.Xml
* @version $Id$
* @since 1.1
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface FoMarkup
extends XmlMarkup
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java Thu Oct 23 22:01:01 2014
@@ -1157,9 +1157,10 @@ public class ITextSink
}
/**
- * If the <code>name</code> is a relative link, the internal link will used a System property <code>itext.basedir</code>,
- * or the class loader.
- * {@inheritDoc} */
+ * If the <code>name</code> is a relative link, the internal link will used a System property
+ * <code>itext.basedir</code>, or the class loader.
+ * {@inheritDoc}
+ */
public void figureGraphics( String name )
{
String urlName = null;
@@ -1328,7 +1329,7 @@ public class ITextSink
font.addUnderlined();
writeStartElement( ElementTags.ANCHOR );
- if ( StringUtils.isNotEmpty( name )&& name.startsWith( "#" ) && StringUtils.isNotEmpty( header.getTitle() ))
+ if ( StringUtils.isNotEmpty( name ) && name.startsWith( "#" ) && StringUtils.isNotEmpty( header.getTitle() ) )
{
name = "#" + DoxiaUtils.encodeId( header.getTitle(), true ) + "_" + name.substring( 1 );
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java Thu Oct 23 22:01:01 2014
@@ -21,7 +21,6 @@ package org.apache.maven.doxia.module.ma
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.maven.doxia.macro.MacroExecutionException;
import org.apache.maven.doxia.markup.HtmlMarkup;
import org.apache.maven.doxia.module.xhtml.XhtmlParser;
import org.apache.maven.doxia.parser.ParseException;
@@ -30,7 +29,6 @@ import org.apache.maven.doxia.sink.Sink;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.pegdown.Extensions;
import org.pegdown.PegDownProcessor;
import org.pegdown.ast.HeaderNode;
@@ -198,8 +196,10 @@ public class MarkdownParser
}
}
- public static boolean isHtmlComment( Node node ) {
- if (node instanceof HtmlBlockNode) {
+ public static boolean isHtmlComment( Node node )
+ {
+ if ( node instanceof HtmlBlockNode )
+ {
HtmlBlockNode blockNode = (HtmlBlockNode) node;
return blockNode.getText().startsWith( "<!--" );
}
@@ -246,7 +246,8 @@ public class MarkdownParser
}
@Override
- protected boolean baseStartTag(XmlPullParser parser, Sink sink) {
+ protected boolean baseStartTag( XmlPullParser parser, Sink sink )
+ {
boolean visited = super.baseStartTag( parser, sink );
if ( !visited )
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Monospace.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Monospace.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Monospace.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Monospace.java Thu Oct 23 22:01:01 2014
@@ -25,7 +25,7 @@ package org.apache.maven.doxia.module.rt
class Monospace
extends FontMetrics
{
- static final CharMetrics[] metrics = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] METRICS = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
@@ -157,6 +157,6 @@ class Monospace
Monospace()
{
- super( true, 629, -157, new CharMetrics( 0, 0, -28, -250, 628, 805 ), metrics );
+ super( true, 629, -157, new CharMetrics( 0, 0, -28, -250, 628, 805 ), METRICS );
}
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBold.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBold.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBold.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBold.java Thu Oct 23 22:01:01 2014
@@ -25,7 +25,7 @@ package org.apache.maven.doxia.module.rt
class MonospaceBold
extends FontMetrics
{
- static final CharMetrics[] metrics = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] METRICS = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
@@ -157,7 +157,7 @@ class MonospaceBold
MonospaceBold()
{
- super( true, 626, -142, new CharMetrics( 0, 0, -113, -250, 749, 801 ), metrics );
+ super( true, 626, -142, new CharMetrics( 0, 0, -113, -250, 749, 801 ), METRICS );
}
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBoldItalic.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBoldItalic.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBoldItalic.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBoldItalic.java Thu Oct 23 22:01:01 2014
@@ -25,7 +25,7 @@ package org.apache.maven.doxia.module.rt
class MonospaceBoldItalic
extends FontMetrics
{
- static final CharMetrics[] metrics = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] METRICS = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
@@ -157,6 +157,6 @@ class MonospaceBoldItalic
MonospaceBoldItalic()
{
- super( true, 626, -142, new CharMetrics( 0, 0, -56, -250, 868, 801 ), metrics );
+ super( true, 626, -142, new CharMetrics( 0, 0, -56, -250, 868, 801 ), METRICS );
}
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceItalic.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceItalic.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceItalic.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceItalic.java Thu Oct 23 22:01:01 2014
@@ -25,7 +25,7 @@ package org.apache.maven.doxia.module.rt
class MonospaceItalic
extends FontMetrics
{
- static final CharMetrics[] metrics = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] METRICS = {new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
new CharMetrics( 600, 0, 0, 0, 0, 0 ), new CharMetrics( 600, 0, 0, 0, 0, 0 ),
@@ -157,6 +157,6 @@ class MonospaceItalic
MonospaceItalic()
{
- super( true, 629, -157, new CharMetrics( 0, 0, -28, -250, 742, 805 ), metrics );
+ super( true, 629, -157, new CharMetrics( 0, 0, -28, -250, 742, 805 ), METRICS );
}
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/PBMReader.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/PBMReader.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/PBMReader.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/PBMReader.java Thu Oct 23 22:01:01 2014
@@ -96,6 +96,7 @@ class PBMReader
case TYPE_PPM:
bytesPerLine = 3 * width;
break;
+ default:
}
stream = new BufferedInputStream( new FileInputStream( fileName ) );
@@ -297,7 +298,7 @@ class PBMReader
{
while ( getChar() != '\n' )
{
- ;
+ // nop
}
}
catch ( EOFException ignore )
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java Thu Oct 23 22:01:01 2014
@@ -636,6 +636,7 @@ public class RtfSink
case 5:
stl = STYLE_ROMAN;
break;
+ default:
}
Paragraph p = new Paragraph( stl, size );
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerif.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerif.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerif.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerif.java Thu Oct 23 22:01:01 2014
@@ -25,7 +25,7 @@ package org.apache.maven.doxia.module.rt
class SansSerif
extends FontMetrics
{
- static final CharMetrics[] metrics = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] METRICS = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
@@ -157,6 +157,6 @@ class SansSerif
SansSerif()
{
- super( false, 718, -207, new CharMetrics( 0, 0, -166, -225, 1000, 931 ), metrics );
+ super( false, 718, -207, new CharMetrics( 0, 0, -166, -225, 1000, 931 ), METRICS );
}
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBold.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBold.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBold.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBold.java Thu Oct 23 22:01:01 2014
@@ -25,7 +25,7 @@ package org.apache.maven.doxia.module.rt
class SansSerifBold
extends FontMetrics
{
- static final CharMetrics[] metrics = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] METRICS = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
@@ -157,6 +157,6 @@ class SansSerifBold
SansSerifBold()
{
- super( false, 718, -207, new CharMetrics( 0, 0, -170, -228, 1003, 962 ), metrics );
+ super( false, 718, -207, new CharMetrics( 0, 0, -170, -228, 1003, 962 ), METRICS );
}
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBoldItalic.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBoldItalic.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBoldItalic.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBoldItalic.java Thu Oct 23 22:01:01 2014
@@ -25,7 +25,7 @@ package org.apache.maven.doxia.module.rt
class SansSerifBoldItalic
extends FontMetrics
{
- static final CharMetrics[] metrics = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] METRICS = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
@@ -157,6 +157,6 @@ class SansSerifBoldItalic
SansSerifBoldItalic()
{
- super( false, 718, -207, new CharMetrics( 0, 0, -174, -228, 1114, 962 ), metrics );
+ super( false, 718, -207, new CharMetrics( 0, 0, -174, -228, 1114, 962 ), METRICS );
}
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifItalic.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifItalic.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifItalic.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifItalic.java Thu Oct 23 22:01:01 2014
@@ -25,7 +25,7 @@ package org.apache.maven.doxia.module.rt
class SansSerifItalic
extends FontMetrics
{
- static final CharMetrics[] metrics = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] METRICS = {new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
new CharMetrics( 278, 0, 0, 0, 0, 0 ), new CharMetrics( 278, 0, 0, 0, 0, 0 ),
@@ -157,6 +157,6 @@ class SansSerifItalic
SansSerifItalic()
{
- super( false, 718, -207, new CharMetrics( 0, 0, -170, -225, 1116, 931 ), metrics );
+ super( false, 718, -207, new CharMetrics( 0, 0, -170, -225, 1116, 931 ), METRICS );
}
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Serif.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Serif.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Serif.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/Serif.java Thu Oct 23 22:01:01 2014
@@ -25,7 +25,7 @@ package org.apache.maven.doxia.module.rt
class Serif
extends FontMetrics
{
- static final CharMetrics[] metrics = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] METRICS = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
@@ -157,6 +157,6 @@ class Serif
Serif()
{
- super( false, 683, -217, new CharMetrics( 0, 0, -168, -218, 1000, 898 ), metrics );
+ super( false, 683, -217, new CharMetrics( 0, 0, -168, -218, 1000, 898 ), METRICS );
}
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBold.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBold.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBold.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBold.java Thu Oct 23 22:01:01 2014
@@ -25,7 +25,7 @@ package org.apache.maven.doxia.module.rt
class SerifBold
extends FontMetrics
{
- static final CharMetrics[] metrics = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] METRICS = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
@@ -157,6 +157,6 @@ class SerifBold
SerifBold()
{
- super( false, 676, -205, new CharMetrics( 0, 0, -168, -218, 1000, 935 ), metrics );
+ super( false, 676, -205, new CharMetrics( 0, 0, -168, -218, 1000, 935 ), METRICS );
}
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBoldItalic.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBoldItalic.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBoldItalic.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifBoldItalic.java Thu Oct 23 22:01:01 2014
@@ -25,7 +25,7 @@ package org.apache.maven.doxia.module.rt
class SerifBoldItalic
extends FontMetrics
{
- static final CharMetrics[] metrics = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] METRICS = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
@@ -157,6 +157,6 @@ class SerifBoldItalic
SerifBoldItalic()
{
- super( false, 699, -205, new CharMetrics( 0, 0, -200, -218, 996, 921 ), metrics );
+ super( false, 699, -205, new CharMetrics( 0, 0, -200, -218, 996, 921 ), METRICS );
}
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifItalic.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifItalic.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifItalic.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/SerifItalic.java Thu Oct 23 22:01:01 2014
@@ -25,7 +25,7 @@ package org.apache.maven.doxia.module.rt
class SerifItalic
extends FontMetrics
{
- static final CharMetrics[] metrics = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
+ static final CharMetrics[] METRICS = {new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
new CharMetrics( 250, 0, 0, 0, 0, 0 ), new CharMetrics( 250, 0, 0, 0, 0, 0 ),
@@ -157,6 +157,6 @@ class SerifItalic
SerifItalic()
{
- super( false, 683, -205, new CharMetrics( 0, 0, -169, -217, 1010, 883 ), metrics );
+ super( false, 683, -205, new CharMetrics( 0, 0, -169, -217, 1010, 883 ), METRICS );
}
}
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiMarkup.java Thu Oct 23 22:01:01 2014
@@ -31,6 +31,7 @@ import org.apache.maven.doxia.markup.Tex
* @version $Id$
* @since 1.0
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface TWikiMarkup
extends TextMarkup
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocMarkup.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/XdocMarkup.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocMarkup.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocMarkup.java Thu Oct 23 22:01:01 2014
@@ -33,6 +33,7 @@ import org.apache.maven.doxia.markup.Htm
* @version $Id$
* @since 1.0
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface XdocMarkup
extends HtmlMarkup
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlMarkup.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlMarkup.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlMarkup.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlMarkup.java Thu Oct 23 22:01:01 2014
@@ -31,6 +31,7 @@ import org.apache.maven.doxia.markup.Htm
* @version $Id$
* @since 1.0
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface XhtmlMarkup
extends HtmlMarkup
{
Modified: maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributes.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributes.java?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributes.java (original)
+++ maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributes.java Thu Oct 23 22:01:01 2014
@@ -50,6 +50,7 @@ import javax.swing.text.MutableAttribute
* @version $Id$
* @since 1.1
*/
+@SuppressWarnings( "checkstyle:interfaceistype" )
public interface SinkEventAttributes
extends MutableAttributeSet
{
Modified: maven/doxia/doxia/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=1633964&r1=1633963&r2=1633964&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/pom.xml (original)
+++ maven/doxia/doxia/trunk/pom.xml Thu Oct 23 22:01:01 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath>../../pom/maven/pom.xml</relativePath>
</parent>
@@ -194,6 +194,7 @@ under the License.
<properties>
<mavenVersion>2.0.6</mavenVersion>
<maven.site.path>doxia-archives/doxia-LATEST</maven.site.path>
+ <checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,MethodName,InnerAssignment,MagicNumber</checkstyle.violation.ignore>
</properties>
<dependencyManagement>
@@ -377,6 +378,7 @@ under the License.
<excludes>
<exclude>org/apache/maven/doxia/sink/render/*</exclude>
<exclude>org/apache/maven/doxia/parser/module/*</exclude>
+ <exclude>org/apache/maven/doxia/module/fo/*</exclude>
</excludes>
</configuration>
</execution>
@@ -385,7 +387,6 @@ under the License.
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
<configuration>
<excludes>
<exclude>src/test/resources/**/*.apt</exclude>