Author: ltheussl
Date: Fri May 15 12:54:18 2009
New Revision: 775115
URL: http://svn.apache.org/viewvc?rev=775115&view=rev
Log:
fix checkstyle errors
Modified:
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/DocbookBookRenderer.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.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/parser/XhtmlBaseParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineSource.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
Modified:
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/DocbookBookRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/DocbookBookRenderer.java?rev=775115&r1=775114&r2=775115&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/DocbookBookRenderer.java
(original)
+++
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/DocbookBookRenderer.java
Fri May 15 12:54:18 2009
@@ -72,8 +72,8 @@
{
if ( !context.getOutputDirectory().mkdirs() )
{
- throw new BookDoxiaException( "Could not make directory: " +
- context.getOutputDirectory().getAbsolutePath() + "." );
+ throw new BookDoxiaException( "Could not make directory: "
+ + context.getOutputDirectory().getAbsolutePath() + "."
);
}
}
@@ -132,7 +132,7 @@
sink.chapter();
- if (StringUtils.isNotEmpty( chapter.getTitle()))
+ if ( StringUtils.isNotEmpty( chapter.getTitle() ) )
{
sink.chapterTitle();
sink.text( chapter.getTitle() );
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java?rev=775115&r1=775114&r2=775115&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
Fri May 15 12:54:18 2009
@@ -50,7 +50,7 @@
private MacroManager macroManager;
/** Log instance. */
- private Log log;
+ private Log logger;
/** {...@inheritdoc} */
public int getType()
@@ -136,7 +136,7 @@
/** {...@inheritdoc} */
public void enableLogging( Log log )
{
- this.log = log;
+ this.logger = log;
}
/**
@@ -148,12 +148,12 @@
*/
protected Log getLog()
{
- if ( log == null )
+ if ( logger == null )
{
- log = new SystemStreamLog();
+ logger = new SystemStreamLog();
}
- return log;
+ return logger;
}
/**
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=775115&r1=775114&r2=775115&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
Fri May 15 12:54:18 2009
@@ -98,11 +98,11 @@
/** Tag pattern as defined in http://www.w3.org/TR/REC-xml/#NT-Name */
private static final Pattern PATTERN_TAG = Pattern.compile(
".*<([A-Za-z][A-Za-z0-9:_.-]*)([^>]*)>.*" );
- private boolean ignorable;
+ private boolean ignorableWhitespace;
- private boolean collapsible;
+ private boolean collapsibleWhitespace;
- private boolean trimmable;
+ private boolean trimmableWhitespace;
private Map entities;
@@ -263,7 +263,7 @@
for ( Iterator it =
CachedFileEntityResolver.ENTITY_CACHE.values().iterator(); it.hasNext(); )
{
- byte[] res = (byte[])it.next();
+ byte[] res = (byte[]) it.next();
addDTDEntities( parser, new String( res ) );
}
@@ -351,7 +351,7 @@
*/
protected boolean isIgnorableWhitespace()
{
- return ignorable;
+ return ignorableWhitespace;
}
/**
@@ -365,7 +365,7 @@
*/
protected void setIgnorableWhitespace( boolean ignorable )
{
- this.ignorable = ignorable;
+ this.ignorableWhitespace = ignorable;
}
/**
@@ -377,7 +377,7 @@
*/
protected boolean isCollapsibleWhitespace()
{
- return collapsible;
+ return collapsibleWhitespace;
}
/**
@@ -391,7 +391,7 @@
*/
protected void setCollapsibleWhitespace( boolean collapsible )
{
- this.collapsible = collapsible;
+ this.collapsibleWhitespace = collapsible;
}
/**
@@ -403,7 +403,7 @@
*/
protected boolean isTrimmableWhitespace()
{
- return trimmable;
+ return trimmableWhitespace;
}
/**
@@ -417,7 +417,7 @@
*/
protected void setTrimmableWhitespace( boolean trimmable )
{
- this.trimmable = trimmable;
+ this.trimmableWhitespace = trimmable;
}
/**
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java?rev=775115&r1=775114&r2=775115&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
Fri May 15 12:54:18 2009
@@ -860,11 +860,11 @@
sink.verbatim( attribs );
}
- private void handleSectionStart( Sink sink, int sectionLevel,
SinkEventAttributeSet attribs )
+ private void handleSectionStart( Sink sink, int level,
SinkEventAttributeSet attribs )
{
- consecutiveSections( sectionLevel, sink );
- sink.section( sectionLevel, attribs );
- sink.sectionTitle( sectionLevel, attribs );
+ consecutiveSections( level, sink );
+ sink.section( level, attribs );
+ sink.sectionTitle( level, attribs );
}
private void handleTableStart( Sink sink, SinkEventAttributeSet attribs,
XmlPullParser parser )
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java?rev=775115&r1=775114&r2=775115&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineReaderSource.java
Fri May 15 12:54:18 2009
@@ -130,7 +130,7 @@
}
/** {...@inheritdoc} */
- public final void ungetLine() throws IllegalStateException
+ public final void ungetLine()
{
if ( ungetted )
{
@@ -140,7 +140,7 @@
}
/** {...@inheritdoc} */
- public final void unget( final String s ) throws IllegalStateException
+ public final void unget( final String s )
{
if ( s == null )
{
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineSource.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineSource.java?rev=775115&r1=775114&r2=775115&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineSource.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/ByLineSource.java
Fri May 15 12:54:18 2009
@@ -58,7 +58,7 @@
* @throws java.lang.IllegalStateException if the ungetLine/unget is
called more than
* one time without calling getNextLine()
*/
- void ungetLine() throws IllegalStateException;
+ void ungetLine();
/**
@@ -68,7 +68,7 @@
* @throws java.lang.IllegalStateException if the ungetLine/unget is
called more than
* one time without calling getNextLine()
*/
- void unget( String s ) throws IllegalStateException;
+ void unget( String s );
/**
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.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/ParagraphBlockParser.java?rev=775115&r1=775114&r2=775115&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
Fri May 15 12:54:18 2009
@@ -59,7 +59,7 @@
*
* @throws org.apache.maven.doxia.parser.ParseException if any
*/
- public Block visit(String line, ByLineSource source, boolean
generateParagraphTags)
+ public Block visit( String line, ByLineSource source, boolean
generateParagraphTags )
throws ParseException
{
if ( generateParagraphTags )
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=775115&r1=775114&r2=775115&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/ListBlockParser.java
Fri May 15 12:54:18 2009
@@ -131,12 +131,12 @@
if ( line.startsWith( "*" ) || line.startsWith( "-" ) ||
line.startsWith( "#" ) )
{
String temp = line.substring( 1 );
- while ( temp.charAt( 0 ) == '*' || temp.charAt( 0 ) == '-' ||
temp.charAt( 0 ) == '#')
+ while ( temp.charAt( 0 ) == '*' || temp.charAt( 0 ) == '-' ||
temp.charAt( 0 ) == '#' )
{
temp = temp.substring( 1 );
}
- if (temp.charAt( 0 ) == ' ')
+ if ( temp.charAt( 0 ) == ' ' )
{
return true;
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java?rev=775115&r1=775114&r2=775115&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableBlockParser.java
Fri May 15 12:54:18 2009
@@ -89,7 +89,7 @@
{
List textBlocks = new ArrayList();
- textBlocks.add( ( (ParagraphBlockParser) paragraphParser )
+ textBlocks.add( ( ( ParagraphBlockParser) paragraphParser )
.visit(text[i], new ByLineReaderSource( new
StringReader( EMPTY_STRING ) ), false ) );
List blocks = new ArrayList();
@@ -117,7 +117,7 @@
it += 2;
continue;
}
- texts.add(text[it]);
+ texts.add( text[it] );
it++;
}
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=775115&r1=775114&r2=775115&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
Fri May 15 12:54:18 2009
@@ -79,7 +79,7 @@
// this populates faqs
super.parse( source, sink );
- writeFaqs( faqs, sink );
+ writeFaqs( sink );
}
/** {...@inheritdoc} */
@@ -209,6 +209,7 @@
if ( parser.getName().equals( FAQS_TAG.toString() ) )
{
// Do nothing
+ return;
}
else if ( parser.getName().equals( PART_TAG.toString() ) )
{
@@ -318,7 +319,7 @@
* @param sink The sink to consume the event.
* @throws ParseException if something goes wrong.
*/
- private void writeFaqs( Faqs faqs, Sink sink )
+ private void writeFaqs( Sink sink )
throws ParseException
{
FmlContentParser xdocParser = new FmlContentParser();
