Author: ltheussl
Date: Mon Jun 15 09:19:18 2009
New Revision: 784698
URL: http://svn.apache.org/viewvc?rev=784698&view=rev
Log:
Minor code optimizations
Modified:
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/DocbookUtils.java
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=784698&r1=784697&r2=784698&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
Mon Jun 15 09:19:18 2009
@@ -66,7 +66,7 @@
/**
* A selective stack of parent elements
*/
- private Stack parent = new Stack();
+ private final Stack parent = new Stack();
/**
* The list of DocBook elements that introduce a new level of hierarchy.
@@ -185,7 +185,7 @@
sink.body();
}
- SinkEventAttributeSet attribs = getAttributesFromParser( parser );
+ final SinkEventAttributeSet attribs = getAttributesFromParser( parser
);
simpleTag = parser.isEmptyElementTag();
if ( parser.getName().equals(
SimplifiedDocbookMarkup.ARTICLE_TAG.toString() ) )
@@ -259,7 +259,7 @@
else if ( parser.getName().equals(
SimplifiedDocbookMarkup.TRADEMARK_TAG.toString() ) )
{
trademark = '\u2122';
- Object trade = attribs.getAttribute( "class" );
+ final Object trade = attribs.getAttribute( "class" );
if ( trade != null )
{
@@ -477,7 +477,7 @@
protected void handleComment( XmlPullParser parser, Sink sink )
throws XmlPullParserException
{
- String text = parser.getText();
+ final String text = parser.getText();
if ( "PB".equals( text.trim() ) )
{
@@ -614,7 +614,7 @@
{
try
{
- String mailto = parser.nextText();
+ final String mailto = parser.nextText();
sink.link( "mailto:"; + mailto, attribs );
sink.monospaced();
sink.text( mailto, null );
@@ -654,7 +654,7 @@
private void handleAnchorStart( Sink sink, SinkEventAttributeSet attribs )
{
- Object id = attribs.getAttribute( SimplifiedDocbookMarkup.ID_ATTRIBUTE
);
+ final Object id = attribs.getAttribute(
SimplifiedDocbookMarkup.ID_ATTRIBUTE );
if ( id != null )
{
@@ -665,7 +665,7 @@
private void handleImageDataStart( Sink sink, SinkEventAttributeSet
attribs )
throws XmlPullParserException
{
- Object fileref = attribs.getAttribute(
SimplifiedDocbookMarkup.FILEREF_ATTRIBUTE );
+ final Object fileref = attribs.getAttribute(
SimplifiedDocbookMarkup.FILEREF_ATTRIBUTE );
if ( fileref == null )
{
@@ -685,7 +685,7 @@
private void handleLinkStart( Sink sink, SinkEventAttributeSet attribs )
throws XmlPullParserException
{
- Object linkend = attribs.getAttribute(
SimplifiedDocbookMarkup.LINKEND_ATTRIBUTE );
+ final Object linkend = attribs.getAttribute(
SimplifiedDocbookMarkup.LINKEND_ATTRIBUTE );
if ( linkend == null )
{
@@ -719,7 +719,7 @@
//default enumeration style is decimal
int numeration = Sink.NUMBERING_DECIMAL;
- Object num = attribs.getAttribute(
SimplifiedDocbookMarkup.NUMERATION_ATTRIBUTE );
+ final Object num = attribs.getAttribute(
SimplifiedDocbookMarkup.NUMERATION_ATTRIBUTE );
if ( num != null )
{
@@ -750,7 +750,7 @@
private void handleTableStart( Sink sink, SinkEventAttributeSet attribs )
{
- Object frame = attribs.getAttribute(
SimplifiedDocbookMarkup.FRAME_ATTRIBUTE );
+ final Object frame = attribs.getAttribute(
SimplifiedDocbookMarkup.FRAME_ATTRIBUTE );
if ( frame != null )
{
attribs.addAttribute( SimplifiedDocbookMarkup.FRAME_ATTRIBUTE,
@@ -807,7 +807,7 @@
private void handleUlinkStart( Sink sink, SinkEventAttributeSet attribs )
throws XmlPullParserException
{
- Object url = attribs.getAttribute(
SimplifiedDocbookMarkup.URL_ATTRIBUTE );
+ final Object url = attribs.getAttribute(
SimplifiedDocbookMarkup.URL_ATTRIBUTE );
if ( url == null )
{
@@ -827,7 +827,7 @@
private void handleXrefStart( Sink sink, SinkEventAttributeSet attribs )
throws XmlPullParserException
{
- Object linkend = attribs.getAttribute(
SimplifiedDocbookMarkup.LINKEND_ATTRIBUTE );
+ final Object linkend = attribs.getAttribute(
SimplifiedDocbookMarkup.LINKEND_ATTRIBUTE );
if ( linkend == null )
{
@@ -1014,21 +1014,21 @@
else if ( name.equals( SimplifiedDocbookMarkup.TGROUP_TAG.toString() )
)
{
// this is required by the DTD
- int cols = Integer.parseInt( (String) attribs.getAttribute( "cols"
) );
+ final int cols = Integer.parseInt( (String) attribs.getAttribute(
"cols" ) );
int[] justification = new int[cols];
int justif = Sink.JUSTIFY_LEFT;
- Object align = attribs.getAttribute( SinkEventAttributeSet.ALIGN );
+ final Object align = attribs.getAttribute(
SinkEventAttributeSet.ALIGN );
if ( align != null )
{
- String al = align.toString();
+ final String al = align.toString();
- if ( al.equals( "right" ) )
+ if ( "right".equals( al ) )
{
justif = Sink.JUSTIFY_RIGHT;
}
- else if ( al.equals( "center" ) )
+ else if ( "center".equals( al ) )
{
justif = Sink.JUSTIFY_CENTER;
}
@@ -1040,24 +1040,18 @@
}
boolean grid = false;
- Object rowsep = attribs.getAttribute( "rowsep" );
+ final Object rowsep = attribs.getAttribute( "rowsep" );
- if ( rowsep != null )
+ if ( rowsep != null && Integer.parseInt( (String) rowsep ) == 1 )
{
- if ( Integer.parseInt( (String) rowsep ) == 1 )
- {
- grid = true;
- }
+ grid = true;
}
- Object colsep = attribs.getAttribute( "colsep" );
+ final Object colsep = attribs.getAttribute( "colsep" );
- if ( colsep != null )
+ if ( colsep != null && Integer.parseInt( (String) colsep ) == 1 )
{
- if ( Integer.parseInt( (String) colsep ) == 1 )
- {
- grid = true;
- }
+ grid = true;
}
sink.tableRows( justification, grid );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookUtils.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/DocbookUtils.java?rev=784698&r1=784697&r2=784698&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookUtils.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookUtils.java
Mon Jun 15 09:19:18 2009
@@ -28,7 +28,7 @@
* @version $Id$
* @since 1.1.1
*/
-public class DocbookUtils
+public final class DocbookUtils
{
/**
* Translate a given Docbook table frame attribute value to a valid
@@ -45,31 +45,31 @@
* otherwise an IllegalArgumentException is thrown.
* @return a valid Doxia table frame attribute as specified above.
*/
- public static final String doxiaTableFrameAttribute( String frame )
+ public static String doxiaTableFrameAttribute( final String frame )
{
String fr = frame;
- if ( fr.equals( "all" ) )
+ if ( "all".equals( fr ) )
{
fr = "box";
}
- else if ( frame.equals( "bottom" ) )
+ else if ( "bottom".equals( fr ) )
{
fr = "below";
}
- else if ( fr.equals( "none" ) )
+ else if ( "none".equals( fr ) )
{
fr = "void";
}
- else if ( fr.equals( "sides" ) )
+ else if ( "sides".equals( fr ) )
{
fr = "vsides";
}
- else if ( fr.equals( "top" ) )
+ else if ( "top".equals( fr ) )
{
fr = "above";
}
- else if ( fr.equals( "topbot" ) )
+ else if ( "topbot".equals( fr ) )
{
fr = "hsides";
}
@@ -91,7 +91,7 @@
* @param style a docbook ordered-list numbering style.
* @return a doxia numbering style.
*/
- public static final int doxiaListNumbering( String style )
+ public static int doxiaListNumbering( final String style )
{
if ( SimplifiedDocbookMarkup.LOWERALPHA_STYLE.equals( style ) )
{
@@ -129,7 +129,7 @@
* @param numbering a doxia numbering style.
* @return a docbook ordered-list numbering style.
*/
- public static final String docbookListNumbering( int numbering )
+ public static String docbookListNumbering( final int numbering )
{
switch ( numbering )
{
@@ -160,7 +160,7 @@
* @param trade a valid class atribute for the docbook
<code><trademark></code> tag.
* @return the corresponding unicode character.
*/
- public static final char trademarkFromClass( String trade )
+ public static char trademarkFromClass( final String trade )
{
if ( "registered".equals( trade ) )
{
@@ -183,4 +183,9 @@
throw new IllegalArgumentException( "Not a trademark class: " +
trade );
}
}
+
+ private DocbookUtils()
+ {
+ // utility class
+ }
}
