Author: hboutemy
Date: Fri Oct 31 16:03:27 2008
New Revision: 709594
URL: http://svn.apache.org/viewvc?rev=709594&view=rev
Log:
fixed errors reported by Checkstyle
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
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/parser/XhtmlBaseParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java?rev=709594&r1=709593&r2=709594&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
Fri Oct 31 16:03:27 2008
@@ -127,7 +127,8 @@
sink.verbatim_();
}
- else {
+ else
+ {
sink.rawText( snippet.toString() );
}
}
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=709594&r1=709593&r2=709594&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
Fri Oct 31 16:03:27 2008
@@ -6,7 +6,7 @@
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
- * "License" ); you may not use this file except in compliance
+ * "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
@@ -30,7 +30,7 @@
* </p>
*
* @author ltheussl
- * @version $Id:$
+ * @version $Id$
* @since 1.0
*/
public interface HtmlMarkup
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=709594&r1=709593&r2=709594&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 Oct 31 16:03:27 2008
@@ -647,11 +647,11 @@
{
if ( "underline".equals( decoration ) ||
"line-through".equals( decoration ) )
{
- atts.addAttribute( SinkEventAttributes.DECORATION,
decoration);
+ atts.addAttribute( SinkEventAttributes.DECORATION,
decoration );
}
else if ( "sub".equals( decoration ) || "sup".equals(
decoration ) )
{
- atts.addAttribute( SinkEventAttributes.VALIGN, decoration);
+ atts.addAttribute( SinkEventAttributes.VALIGN, decoration
);
}
}
@@ -732,23 +732,23 @@
{
while ( this.sectionLevel >= newLevel )
{
- if ( sectionLevel == Sink.SECTION_LEVEL_5)
+ if ( sectionLevel == Sink.SECTION_LEVEL_5 )
{
sink.section5_();
}
- else if ( sectionLevel == Sink.SECTION_LEVEL_4)
+ else if ( sectionLevel == Sink.SECTION_LEVEL_4 )
{
sink.section4_();
}
- else if ( sectionLevel == Sink.SECTION_LEVEL_3)
+ else if ( sectionLevel == Sink.SECTION_LEVEL_3 )
{
sink.section3_();
}
- else if ( sectionLevel == Sink.SECTION_LEVEL_2)
+ else if ( sectionLevel == Sink.SECTION_LEVEL_2 )
{
sink.section2_();
}
- else if ( sectionLevel == Sink.SECTION_LEVEL_1)
+ else if ( sectionLevel == Sink.SECTION_LEVEL_1 )
{
sink.section1_();
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java?rev=709594&r1=709593&r2=709594&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
Fri Oct 31 16:03:27 2008
@@ -79,7 +79,7 @@
for ( int i = 0; i < length; i++ )
{
- if ( text.charAt(i) == '\r' )
+ if ( text.charAt( i ) == '\r' )
{
if ( ( i + 1 ) < length && text.charAt( i + 1 ) == '\n' )
{
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java?rev=709594&r1=709593&r2=709594&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
Fri Oct 31 16:03:27 2008
@@ -381,7 +381,8 @@
}
/** [EMAIL PROTECTED] */
- public String toString() {
+ public String toString()
+ {
StringBuffer s = new StringBuffer();
Enumeration names = getAttributeNames();
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java?rev=709594&r1=709593&r2=709594&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
Fri Oct 31 16:03:27 2008
@@ -159,7 +159,7 @@
{
String[] temp = new String[a.length + b.length];
System.arraycopy( a, 0, temp, 0, a.length );
- System.arraycopy( b, 0, temp, a.length, b.length);
+ System.arraycopy( b, 0, temp, a.length, b.length );
Arrays.sort( temp ); // necessary for binary searches in
filterAttributes()
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java?rev=709594&r1=709593&r2=709594&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
Fri Oct 31 16:03:27 2008
@@ -940,7 +940,7 @@
if ( width != null )
{
- atts.addAttribute( Attribute.WIDTH.toString(), width);
+ atts.addAttribute( Attribute.WIDTH.toString(), width );
}
atts.removeAttribute( Attribute.ALIGN.toString() );
@@ -1194,7 +1194,7 @@
/**
* @param headerRow true if it is an header row
- * @param width the cell size
+ * @param attributes the cell attributes
* @see javax.swing.text.html.HTML.Tag#TH
* @see javax.swing.text.html.HTML.Tag#TD
*/
@@ -1578,38 +1578,38 @@
}
else
{
- if ( attributes.containsAttribute(SinkEventAttributes.DECORATION,
"underline") )
+ if ( attributes.containsAttribute( SinkEventAttributes.DECORATION,
"underline" ) )
{
writeStartTag( Tag.U );
}
- if ( attributes.containsAttribute(SinkEventAttributes.DECORATION,
"line-through") )
+ if ( attributes.containsAttribute( SinkEventAttributes.DECORATION,
"line-through" ) )
{
writeStartTag( Tag.S );
}
- if ( attributes.containsAttribute(SinkEventAttributes.VALIGN,
"sub") )
+ if ( attributes.containsAttribute( SinkEventAttributes.VALIGN,
"sub" ) )
{
writeStartTag( Tag.SUB );
}
- if ( attributes.containsAttribute(SinkEventAttributes.VALIGN,
"sup") )
+ if ( attributes.containsAttribute( SinkEventAttributes.VALIGN,
"sup" ) )
{
writeStartTag( Tag.SUP );
}
text( text );
- if ( attributes.containsAttribute(SinkEventAttributes.VALIGN,
"sup") )
+ if ( attributes.containsAttribute( SinkEventAttributes.VALIGN,
"sup" ) )
{
writeEndTag( Tag.SUP );
}
- if ( attributes.containsAttribute(SinkEventAttributes.VALIGN,
"sub") )
+ if ( attributes.containsAttribute( SinkEventAttributes.VALIGN,
"sub" ) )
{
writeEndTag( Tag.SUB );
}
- if ( attributes.containsAttribute(SinkEventAttributes.DECORATION,
"line-through") )
+ if ( attributes.containsAttribute( SinkEventAttributes.DECORATION,
"line-through" ) )
{
writeEndTag( Tag.S );
}
- if ( attributes.containsAttribute(SinkEventAttributes.DECORATION,
"underline") )
+ if ( attributes.containsAttribute( SinkEventAttributes.DECORATION,
"underline" ) )
{
writeEndTag( Tag.U );
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java?rev=709594&r1=709593&r2=709594&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
Fri Oct 31 16:03:27 2008
@@ -168,7 +168,8 @@
{
buffer.append( "_" );
}
- else if ( isAciiLetter( c ) || isAciiDigit( c ) || ( c == '-' ) ||
( c == '_' ) || ( c == ':' ) || ( c == '.' ) )
+ else if ( isAciiLetter( c ) || isAciiDigit( c ) || ( c == '-' ) ||
( c == '_' ) || ( c == ':' )
+ || ( c == '.' ) )
{
buffer.append( c );
}
@@ -254,10 +255,11 @@
private static boolean isAciiDigit( char c )
{
- return ( ( c >= '0' && c <= '9') );
+ return ( ( c >= '0' && c <= '9' ) );
}
- private DoxiaUtils() {
+ private DoxiaUtils()
+ {
// utility class
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java?rev=709594&r1=709593&r2=709594&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
Fri Oct 31 16:03:27 2008
@@ -332,7 +332,8 @@
{
buffer.append( "_" );
}
- else if ( ( Character.isLetterOrDigit( c ) ) || ( c == '-' ) || (
c == '_' ) || ( c == ':' ) || ( c == '.' ) )
+ else if ( ( Character.isLetterOrDigit( c ) ) || ( c == '-' ) || (
c == '_' ) || ( c == ':' )
+ || ( c == '.' ) )
{
buffer.append( c );
}
@@ -378,7 +379,8 @@
return true;
}
- private HtmlTools() {
+ private HtmlTools()
+ {
// utility class
}
}
