Author: ltheussl
Date: Wed May 27 16:59:36 2009
New Revision: 779240
URL: http://svn.apache.org/viewvc?rev=779240&view=rev
Log:
Don't process empty texts. Reduce code duplication.
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
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=779240&r1=779239&r2=779240&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
Wed May 27 16:59:36 2009
@@ -1389,14 +1389,13 @@
/** {...@inheritdoc} */
public void text( String text )
{
- switch ( actionContext.getCurrentAction() )
+ if ( StringUtils.isEmpty( text ) )
{
- case SinkActionContext.UNDEFINED:
- break;
-
- case SinkActionContext.HEAD:
- break;
+ return;
+ }
+ switch ( actionContext.getCurrentAction() )
+ {
case SinkActionContext.AUTHOR:
header.addAuthor( text );
break;
@@ -1409,166 +1408,6 @@
header.setTitle( text );
break;
- case SinkActionContext.SECTION_TITLE_1:
- writeStartElement( ElementTags.CHUNK );
- writeAddAttribute( ElementTags.FONT, font.getFontName() );
- writeAddAttribute( ElementTags.SIZE, font.getFontSize() );
- writeAddAttribute( ElementTags.STYLE, font.getFontStyle() );
- writeAddAttribute( ElementTags.BLUE, font.getFontColorBlue() );
- writeAddAttribute( ElementTags.GREEN, font.getFontColorGreen()
);
- writeAddAttribute( ElementTags.RED, font.getFontColorRed() );
-
- write( text );
-
- writeEndElement(); // ElementTags.CHUNK
- break;
-
- case SinkActionContext.SECTION_TITLE_2:
- writeStartElement( ElementTags.CHUNK );
- writeAddAttribute( ElementTags.FONT, font.getFontName() );
- writeAddAttribute( ElementTags.SIZE, font.getFontSize() );
- writeAddAttribute( ElementTags.STYLE, font.getFontStyle() );
- writeAddAttribute( ElementTags.BLUE, font.getFontColorBlue() );
- writeAddAttribute( ElementTags.GREEN, font.getFontColorGreen()
);
- writeAddAttribute( ElementTags.RED, font.getFontColorRed() );
-
- write( text );
-
- writeEndElement(); // ElementTags.CHUNK
- break;
-
- case SinkActionContext.SECTION_TITLE_3:
- writeStartElement( ElementTags.CHUNK );
- writeAddAttribute( ElementTags.FONT, font.getFontName() );
- writeAddAttribute( ElementTags.SIZE, font.getFontSize() );
- writeAddAttribute( ElementTags.STYLE, font.getFontStyle() );
- writeAddAttribute( ElementTags.BLUE, font.getFontColorBlue() );
- writeAddAttribute( ElementTags.GREEN, font.getFontColorGreen()
);
- writeAddAttribute( ElementTags.RED, font.getFontColorRed() );
-
- write( text );
-
- writeEndElement(); // ElementTags.CHUNK
- break;
-
- case SinkActionContext.SECTION_TITLE_4:
- writeStartElement( ElementTags.CHUNK );
- writeAddAttribute( ElementTags.FONT, font.getFontName() );
- writeAddAttribute( ElementTags.SIZE, font.getFontSize() );
- writeAddAttribute( ElementTags.STYLE, font.getFontStyle() );
- writeAddAttribute( ElementTags.BLUE, font.getFontColorBlue() );
- writeAddAttribute( ElementTags.GREEN, font.getFontColorGreen()
);
- writeAddAttribute( ElementTags.RED, font.getFontColorRed() );
-
- write( text );
-
- writeEndElement(); // ElementTags.CHUNK
- break;
-
- case SinkActionContext.SECTION_TITLE_5:
- writeStartElement( ElementTags.CHUNK );
- writeAddAttribute( ElementTags.FONT, font.getFontName() );
- writeAddAttribute( ElementTags.SIZE, font.getFontSize() );
- writeAddAttribute( ElementTags.STYLE, font.getFontStyle() );
- writeAddAttribute( ElementTags.BLUE, font.getFontColorBlue() );
- writeAddAttribute( ElementTags.GREEN, font.getFontColorGreen()
);
- writeAddAttribute( ElementTags.RED, font.getFontColorRed() );
-
- write( text );
-
- writeEndElement(); // ElementTags.CHUNK
- break;
-
- case SinkActionContext.LIST_ITEM:
- writeStartElement( ElementTags.CHUNK );
- writeAddAttribute( ElementTags.FONT, font.getFontName() );
- writeAddAttribute( ElementTags.SIZE, font.getFontSize() );
- writeAddAttribute( ElementTags.STYLE, font.getFontStyle() );
- writeAddAttribute( ElementTags.BLUE, font.getFontColorBlue() );
- writeAddAttribute( ElementTags.GREEN, font.getFontColorGreen()
);
- writeAddAttribute( ElementTags.RED, font.getFontColorRed() );
-
- write( text );
-
- writeEndElement(); // ElementTags.CHUNK
- break;
-
- case SinkActionContext.NUMBERED_LIST_ITEM:
- writeStartElement( ElementTags.CHUNK );
- writeAddAttribute( ElementTags.FONT, font.getFontName() );
- writeAddAttribute( ElementTags.SIZE, font.getFontSize() );
- writeAddAttribute( ElementTags.STYLE, font.getFontStyle() );
- writeAddAttribute( ElementTags.BLUE, font.getFontColorBlue() );
- writeAddAttribute( ElementTags.GREEN, font.getFontColorGreen()
);
- writeAddAttribute( ElementTags.RED, font.getFontColorRed() );
-
- write( text );
-
- writeEndElement(); // ElementTags.CHUNK
- break;
-
- case SinkActionContext.DEFINED_TERM:
- writeStartElement( ElementTags.CHUNK );
- writeAddAttribute( ElementTags.FONT, font.getFontName() );
- writeAddAttribute( ElementTags.SIZE, font.getFontSize() );
- writeAddAttribute( ElementTags.STYLE, font.getFontStyle() );
- writeAddAttribute( ElementTags.BLUE, font.getFontColorBlue() );
- writeAddAttribute( ElementTags.GREEN, font.getFontColorGreen()
);
- writeAddAttribute( ElementTags.RED, font.getFontColorRed() );
-
- write( text );
-
- writeEndElement(); // ElementTags.CHUNK
- break;
-
- case SinkActionContext.DEFINITION:
- writeStartElement( ElementTags.CHUNK );
- writeAddAttribute( ElementTags.FONT, font.getFontName() );
- writeAddAttribute( ElementTags.SIZE, font.getFontSize() );
- writeAddAttribute( ElementTags.STYLE, font.getFontStyle() );
- writeAddAttribute( ElementTags.BLUE, font.getFontColorBlue() );
- writeAddAttribute( ElementTags.GREEN, font.getFontColorGreen()
);
- writeAddAttribute( ElementTags.RED, font.getFontColorRed() );
-
- write( text );
-
- writeEndElement(); // ElementTags.CHUNK
- break;
-
- case SinkActionContext.TABLE:
- break;
-
- case SinkActionContext.TABLE_ROW:
- break;
-
- case SinkActionContext.TABLE_HEADER_CELL:
- writeStartElement( ElementTags.CHUNK );
- writeAddAttribute( ElementTags.FONT, font.getFontName() );
- writeAddAttribute( ElementTags.SIZE, font.getFontSize() );
- writeAddAttribute( ElementTags.STYLE, font.getFontStyle() );
- writeAddAttribute( ElementTags.BLUE, font.getFontColorBlue() );
- writeAddAttribute( ElementTags.GREEN, font.getFontColorGreen()
);
- writeAddAttribute( ElementTags.RED, font.getFontColorRed() );
-
- write( text );
-
- writeEndElement(); // ElementTags.CHUNK
- break;
-
- case SinkActionContext.TABLE_CELL:
- writeStartElement( ElementTags.CHUNK );
- writeAddAttribute( ElementTags.FONT, font.getFontName() );
- writeAddAttribute( ElementTags.SIZE, font.getFontSize() );
- writeAddAttribute( ElementTags.STYLE, font.getFontStyle() );
- writeAddAttribute( ElementTags.BLUE, font.getFontColorBlue() );
- writeAddAttribute( ElementTags.GREEN, font.getFontColorGreen()
);
- writeAddAttribute( ElementTags.RED, font.getFontColorRed() );
-
- write( text );
-
- writeEndElement(); // ElementTags.CHUNK
- break;
-
case SinkActionContext.TABLE_CAPTION:
this.tableCaption = text;
break;
@@ -1606,51 +1445,38 @@
}
break;
- case SinkActionContext.FIGURE:
- case SinkActionContext.FIGURE_GRAPHICS:
- break;
-
case SinkActionContext.FIGURE_CAPTION:
writeAddAttribute( ElementTags.ALT, text );
break;
- case SinkActionContext.LINK:
- writeStartElement( ElementTags.CHUNK );
- writeAddAttribute( ElementTags.FONT, font.getFontName() );
- writeAddAttribute( ElementTags.SIZE, font.getFontSize() );
- writeAddAttribute( ElementTags.STYLE, font.getFontStyle() );
- writeAddAttribute( ElementTags.BLUE, font.getFontColorBlue() );
- writeAddAttribute( ElementTags.GREEN, font.getFontColorGreen()
);
- writeAddAttribute( ElementTags.RED, font.getFontColorRed() );
-
- write( text );
-
- writeEndElement(); // ElementTags.CHUNK
- break;
-
- case SinkActionContext.ANCHOR:
- writeStartElement( ElementTags.CHUNK );
- writeAddAttribute( ElementTags.FONT, font.getFontName() );
- writeAddAttribute( ElementTags.SIZE, font.getFontSize() );
- writeAddAttribute( ElementTags.STYLE, font.getFontStyle() );
- writeAddAttribute( ElementTags.BLUE, font.getFontColorBlue() );
- writeAddAttribute( ElementTags.GREEN, font.getFontColorGreen()
);
- writeAddAttribute( ElementTags.RED, font.getFontColorRed() );
-
- write( text );
-
- writeEndElement(); // ElementTags.CHUNK
- break;
-
case SinkActionContext.SECTION_TITLE:
case SinkActionContext.SECTION_1:
case SinkActionContext.SECTION_2:
case SinkActionContext.SECTION_3:
case SinkActionContext.SECTION_4:
case SinkActionContext.SECTION_5:
+ case SinkActionContext.FIGURE:
+ case SinkActionContext.FIGURE_GRAPHICS:
+ case SinkActionContext.TABLE_ROW:
+ case SinkActionContext.TABLE:
+ case SinkActionContext.HEAD:
+ case SinkActionContext.UNDEFINED:
break;
case SinkActionContext.PARAGRAPH:
+ case SinkActionContext.ANCHOR:
+ case SinkActionContext.LINK:
+ case SinkActionContext.TABLE_CELL:
+ case SinkActionContext.TABLE_HEADER_CELL:
+ case SinkActionContext.DEFINITION:
+ case SinkActionContext.DEFINED_TERM:
+ case SinkActionContext.NUMBERED_LIST_ITEM:
+ case SinkActionContext.LIST_ITEM:
+ case SinkActionContext.SECTION_TITLE_5:
+ case SinkActionContext.SECTION_TITLE_4:
+ case SinkActionContext.SECTION_TITLE_3:
+ case SinkActionContext.SECTION_TITLE_2:
+ case SinkActionContext.SECTION_TITLE_1:
default:
writeStartElement( ElementTags.CHUNK );
writeAddAttribute( ElementTags.FONT, font.getFontName() );
