Author: ltheussl
Date: Thu May 28 10:17:25 2009
New Revision: 779533
URL: http://svn.apache.org/viewvc?rev=779533&view=rev
Log:
Make sure we use our own tags
Modified:
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/AbstractXdocBookSink.java
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xhtml/XhtmlBookSink.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/XhtmlBaseSink.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-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
Modified:
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/AbstractXdocBookSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/AbstractXdocBookSink.java?rev=779533&r1=779532&r2=779533&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/AbstractXdocBookSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/AbstractXdocBookSink.java
Thu May 28 10:17:25 2009
@@ -22,9 +22,8 @@
import java.io.Writer;
import java.util.Locale;
-import javax.swing.text.html.HTML.Tag;
-
import org.apache.maven.doxia.module.xdoc.XdocSink;
+
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
@@ -68,7 +67,7 @@
/** {...@inheritdoc} */
public void body()
{
- writeStartTag( Tag.BODY );
+ writeStartTag( BODY );
write( "<section name=\"\">" );
@@ -89,7 +88,7 @@
write( "</section>" );
- writeEndTag( Tag.BODY );
+ writeEndTag( BODY );
writeEndTag( DOCUMENT_TAG );
Modified:
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xhtml/XhtmlBookSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xhtml/XhtmlBookSink.java?rev=779533&r1=779532&r2=779533&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xhtml/XhtmlBookSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xhtml/XhtmlBookSink.java
Thu May 28 10:17:25 2009
@@ -25,8 +25,6 @@
import java.io.Writer;
-import javax.swing.text.html.HTML.Tag;
-
/**
* An Xhtml Sink that doesn't write out head or body elements.
*
@@ -203,13 +201,13 @@
/** {...@inheritdoc} */
public void sectionTitle()
{
- writeStartTag( Tag.H1 );
+ writeStartTag( H1 );
}
/** {...@inheritdoc} */
public void sectionTitle_()
{
- writeEndTag( Tag.H1 );
+ writeEndTag( H1 );
}
/** {...@inheritdoc} */
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=779533&r1=779532&r2=779533&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
Thu May 28 10:17:25 2009
@@ -25,7 +25,6 @@
import java.util.TreeSet;
import javax.swing.text.html.HTML.Attribute;
-import javax.swing.text.html.HTML.Tag;
import org.apache.maven.doxia.macro.MacroExecutionException;
import org.apache.maven.doxia.markup.HtmlMarkup;
@@ -124,133 +123,134 @@
SinkEventAttributeSet attribs = getAttributesFromParser( parser );
- if ( parser.getName().equals( Tag.H2.toString() ) )
+ if ( parser.getName().equals( HtmlMarkup.H2.toString() ) )
{
handleSectionStart( sink, Sink.SECTION_LEVEL_1, attribs );
}
- else if ( parser.getName().equals( Tag.H3.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.H3.toString() ) )
{
handleSectionStart( sink, Sink.SECTION_LEVEL_2, attribs );
}
- else if ( parser.getName().equals( Tag.H4.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.H4.toString() ) )
{
handleSectionStart( sink, Sink.SECTION_LEVEL_3, attribs );
}
- else if ( parser.getName().equals( Tag.H5.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.H5.toString() ) )
{
handleSectionStart( sink, Sink.SECTION_LEVEL_4, attribs );
}
- else if ( parser.getName().equals( Tag.H6.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.H6.toString() ) )
{
handleSectionStart( sink, Sink.SECTION_LEVEL_5, attribs );
}
- else if ( parser.getName().equals( Tag.U.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.U.toString() ) )
{
decoration.addAttribute( SinkEventAttributes.DECORATION,
"underline" );
}
- else if ( parser.getName().equals( Tag.S.toString() ) ||
parser.getName().equals( Tag.STRIKE.toString() )
+ else if ( parser.getName().equals( HtmlMarkup.S.toString() )
+ || parser.getName().equals( HtmlMarkup.STRIKE.toString() )
|| parser.getName().equals( "del" ) )
{
decoration.addAttribute( SinkEventAttributes.DECORATION,
"line-through" );
}
- else if ( parser.getName().equals( Tag.SUB.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.SUB.toString() ) )
{
decoration.addAttribute( SinkEventAttributes.VALIGN, "sub" );
}
- else if ( parser.getName().equals( Tag.SUP.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.SUP.toString() ) )
{
decoration.addAttribute( SinkEventAttributes.VALIGN, "sup" );
}
- else if ( parser.getName().equals( Tag.P.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.P.toString() ) )
{
handlePStart( sink, attribs );
}
- else if ( parser.getName().equals( Tag.DIV.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.DIV.toString() ) )
{
visited = handleDivStart( parser, attribs, sink );
}
- else if ( parser.getName().equals( Tag.PRE.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.PRE.toString() ) )
{
handlePreStart( attribs, sink );
}
- else if ( parser.getName().equals( Tag.UL.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.UL.toString() ) )
{
sink.list( attribs );
}
- else if ( parser.getName().equals( Tag.OL.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.OL.toString() ) )
{
handleOLStart( parser, sink, attribs );
}
- else if ( parser.getName().equals( Tag.LI.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.LI.toString() ) )
{
handleLIStart( sink, attribs );
}
- else if ( parser.getName().equals( Tag.DL.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.DL.toString() ) )
{
sink.definitionList( attribs );
}
- else if ( parser.getName().equals( Tag.DT.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.DT.toString() ) )
{
sink.definitionListItem( attribs );
sink.definedTerm( attribs );
}
- else if ( parser.getName().equals( Tag.DD.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.DD.toString() ) )
{
sink.definition( attribs );
}
- else if ( ( parser.getName().equals( Tag.B.toString() ) )
- || ( parser.getName().equals( Tag.STRONG.toString() ) ) )
+ else if ( ( parser.getName().equals( HtmlMarkup.B.toString() ) )
+ || ( parser.getName().equals( HtmlMarkup.STRONG.toString() ) )
)
{
sink.bold();
}
- else if ( ( parser.getName().equals( Tag.I.toString() ) )
- || ( parser.getName().equals( Tag.EM.toString() ) ) )
+ else if ( ( parser.getName().equals( HtmlMarkup.I.toString() ) )
+ || ( parser.getName().equals( HtmlMarkup.EM.toString() ) ) )
{
handleFigureCaptionStart( sink, attribs );
}
- else if ( ( parser.getName().equals( Tag.CODE.toString() ) )
- || ( parser.getName().equals( Tag.SAMP.toString() ) )
- || ( parser.getName().equals( Tag.TT.toString() ) ) )
+ else if ( ( parser.getName().equals( HtmlMarkup.CODE.toString() ) )
+ || ( parser.getName().equals( HtmlMarkup.SAMP.toString() ) )
+ || ( parser.getName().equals( HtmlMarkup.TT.toString() ) ) )
{
sink.monospaced();
}
- else if ( parser.getName().equals( Tag.A.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.A.toString() ) )
{
handleAStart( parser, sink, attribs );
}
- else if ( parser.getName().equals( Tag.TABLE.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.TABLE.toString() ) )
{
handleTableStart( sink, attribs, parser );
}
- else if ( parser.getName().equals( Tag.TR.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.TR.toString() ) )
{
sink.tableRow( attribs );
}
- else if ( parser.getName().equals( Tag.TH.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.TH.toString() ) )
{
sink.tableHeaderCell( attribs );
}
- else if ( parser.getName().equals( Tag.TD.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.TD.toString() ) )
{
sink.tableCell( attribs );
}
- else if ( parser.getName().equals( Tag.CAPTION.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.CAPTION.toString() ) )
{
sink.tableCaption( attribs );
}
- else if ( parser.getName().equals( Tag.BR.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.BR.toString() ) )
{
sink.lineBreak( attribs );
}
- else if ( parser.getName().equals( Tag.HR.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.HR.toString() ) )
{
sink.horizontalRule( attribs );
}
- else if ( parser.getName().equals( Tag.IMG.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.IMG.toString() ) )
{
handleImgStart( parser, sink, attribs );
}
- else if ( parser.getName().equals( Tag.SCRIPT.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.SCRIPT.toString() ) )
{
handleUnknown( parser, sink, TAG_TYPE_START );
scriptBlock = true;
@@ -279,26 +279,26 @@
{
boolean visited = true;
- if ( parser.getName().equals( Tag.P.toString() ) )
+ if ( parser.getName().equals( HtmlMarkup.P.toString() ) )
{
if ( !inFigure )
{
sink.paragraph_();
}
}
- else if ( parser.getName().equals( Tag.U.toString() )
- || parser.getName().equals( Tag.S.toString() )
- || parser.getName().equals( Tag.STRIKE.toString() )
+ else if ( parser.getName().equals( HtmlMarkup.U.toString() )
+ || parser.getName().equals( HtmlMarkup.S.toString() )
+ || parser.getName().equals( HtmlMarkup.STRIKE.toString() )
|| parser.getName().equals( "del" ) )
{
decoration.removeAttribute( SinkEventAttributes.DECORATION );
}
- else if ( parser.getName().equals( Tag.SUB.toString() )
- || parser.getName().equals( Tag.SUP.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.SUB.toString() )
+ || parser.getName().equals( HtmlMarkup.SUP.toString() ) )
{
decoration.removeAttribute( SinkEventAttributes.VALIGN );
}
- else if ( parser.getName().equals( Tag.DIV.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.DIV.toString() ) )
{
if ( inFigure )
{
@@ -310,55 +310,55 @@
visited = false;
}
}
- else if ( parser.getName().equals( Tag.PRE.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.PRE.toString() ) )
{
verbatim_();
sink.verbatim_();
}
- else if ( parser.getName().equals( Tag.UL.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.UL.toString() ) )
{
sink.list_();
}
- else if ( parser.getName().equals( Tag.OL.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.OL.toString() ) )
{
sink.numberedList_();
orderedListDepth--;
}
- else if ( parser.getName().equals( Tag.LI.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.LI.toString() ) )
{
handleListItemEnd( sink );
}
- else if ( parser.getName().equals( Tag.DL.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.DL.toString() ) )
{
sink.definitionList_();
}
- else if ( parser.getName().equals( Tag.DT.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.DT.toString() ) )
{
sink.definedTerm_();
}
- else if ( parser.getName().equals( Tag.DD.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.DD.toString() ) )
{
sink.definition_();
sink.definitionListItem_();
}
- else if ( ( parser.getName().equals( Tag.B.toString() ) )
- || ( parser.getName().equals( Tag.STRONG.toString() ) ) )
+ else if ( ( parser.getName().equals( HtmlMarkup.B.toString() ) )
+ || ( parser.getName().equals( HtmlMarkup.STRONG.toString() ) )
)
{
sink.bold_();
}
- else if ( ( parser.getName().equals( Tag.I.toString() ) )
- || ( parser.getName().equals( Tag.EM.toString() ) ) )
+ else if ( ( parser.getName().equals( HtmlMarkup.I.toString() ) )
+ || ( parser.getName().equals( HtmlMarkup.EM.toString() ) ) )
{
handleFigureCaptionEnd( sink );
}
- else if ( ( parser.getName().equals( Tag.CODE.toString() ) )
- || ( parser.getName().equals( Tag.SAMP.toString() ) )
- || ( parser.getName().equals( Tag.TT.toString() ) ) )
+ else if ( ( parser.getName().equals( HtmlMarkup.CODE.toString() ) )
+ || ( parser.getName().equals( HtmlMarkup.SAMP.toString() ) )
+ || ( parser.getName().equals( HtmlMarkup.TT.toString() ) ) )
{
sink.monospaced_();
}
- else if ( parser.getName().equals( Tag.A.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.A.toString() ) )
{
handleAEnd( sink );
}
@@ -367,49 +367,49 @@
// Tables
//
----------------------------------------------------------------------
- else if ( parser.getName().equals( Tag.TABLE.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.TABLE.toString() ) )
{
sink.tableRows_();
sink.table_();
}
- else if ( parser.getName().equals( Tag.TR.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.TR.toString() ) )
{
sink.tableRow_();
}
- else if ( parser.getName().equals( Tag.TH.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.TH.toString() ) )
{
sink.tableHeaderCell_();
}
- else if ( parser.getName().equals( Tag.TD.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.TD.toString() ) )
{
sink.tableCell_();
}
- else if ( parser.getName().equals( Tag.CAPTION.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.CAPTION.toString() ) )
{
sink.tableCaption_();
}
- else if ( parser.getName().equals( Tag.H2.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.H2.toString() ) )
{
sink.sectionTitle1_();
}
- else if ( parser.getName().equals( Tag.H3.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.H3.toString() ) )
{
sink.sectionTitle2_();
}
- else if ( parser.getName().equals( Tag.H4.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.H4.toString() ) )
{
sink.sectionTitle3_();
}
- else if ( parser.getName().equals( Tag.H5.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.H5.toString() ) )
{
sink.sectionTitle4_();
}
- else if ( parser.getName().equals( Tag.H6.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.H6.toString() ) )
{
sink.sectionTitle5_();
}
- else if ( parser.getName().equals( Tag.SCRIPT.toString() ) )
+ else if ( parser.getName().equals( HtmlMarkup.SCRIPT.toString() ) )
{
handleUnknown( parser, sink, TAG_TYPE_END );
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=779533&r1=779532&r2=779533&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
Thu May 28 10:17:25 2009
@@ -31,6 +31,7 @@
import org.apache.maven.doxia.markup.Markup;
import org.apache.maven.doxia.util.DoxiaUtils;
import org.apache.maven.doxia.util.HtmlTools;
+
import org.codehaus.plexus.util.StringUtils;
/**
@@ -408,7 +409,7 @@
attributes, SinkUtils.SINK_BASE_ATTRIBUTES ) );
att.removeAttribute( Attribute.ID.toString() );
- writeStartTag( Tag.DIV, att );
+ writeStartTag( HtmlMarkup.DIV, att );
}
}
@@ -422,7 +423,7 @@
{
if ( depth >= SECTION_LEVEL_1 && depth <= SECTION_LEVEL_5 )
{
- writeEndTag( Tag.DIV );
+ writeEndTag( HtmlMarkup.DIV );
}
}
@@ -444,23 +445,23 @@
if ( depth == SECTION_LEVEL_1 )
{
- writeStartTag( Tag.H2, atts );
+ writeStartTag( HtmlMarkup.H2, atts );
}
else if ( depth == SECTION_LEVEL_2 )
{
- writeStartTag( Tag.H3, atts );
+ writeStartTag( HtmlMarkup.H3, atts );
}
else if ( depth == SECTION_LEVEL_3 )
{
- writeStartTag( Tag.H4, atts );
+ writeStartTag( HtmlMarkup.H4, atts );
}
else if ( depth == SECTION_LEVEL_4 )
{
- writeStartTag( Tag.H5, atts );
+ writeStartTag( HtmlMarkup.H5, atts );
}
else if ( depth == SECTION_LEVEL_5 )
{
- writeStartTag( Tag.H6, atts );
+ writeStartTag( HtmlMarkup.H6, atts );
}
}
@@ -478,23 +479,23 @@
{
if ( depth == SECTION_LEVEL_1 )
{
- writeEndTag( Tag.H2 );
+ writeEndTag( HtmlMarkup.H2 );
}
else if ( depth == SECTION_LEVEL_2 )
{
- writeEndTag( Tag.H3 );
+ writeEndTag( HtmlMarkup.H3 );
}
else if ( depth == SECTION_LEVEL_3 )
{
- writeEndTag( Tag.H4 );
+ writeEndTag( HtmlMarkup.H4 );
}
else if ( depth == SECTION_LEVEL_4 )
{
- writeEndTag( Tag.H5 );
+ writeEndTag( HtmlMarkup.H5 );
}
else if ( depth == SECTION_LEVEL_5 )
{
- writeEndTag( Tag.H6 );
+ writeEndTag( HtmlMarkup.H6 );
}
}
@@ -528,7 +529,7 @@
MutableAttributeSet atts = SinkUtils.filterAttributes(
attributes, SinkUtils.SINK_BASE_ATTRIBUTES );
- writeStartTag( Tag.UL, atts );
+ writeStartTag( HtmlMarkup.UL, atts );
}
/**
@@ -537,7 +538,7 @@
*/
public void list_()
{
- writeEndTag( Tag.UL );
+ writeEndTag( HtmlMarkup.UL );
}
/**
@@ -558,7 +559,7 @@
MutableAttributeSet atts = SinkUtils.filterAttributes(
attributes, SinkUtils.SINK_BASE_ATTRIBUTES );
- writeStartTag( Tag.LI, atts );
+ writeStartTag( HtmlMarkup.LI, atts );
}
/**
@@ -567,7 +568,7 @@
*/
public void listItem_()
{
- writeEndTag( Tag.LI );
+ writeEndTag( HtmlMarkup.LI );
}
/**
@@ -627,7 +628,7 @@
atts.addAttribute( Attribute.STYLE, "list-style-type: " + style );
- writeStartTag( Tag.OL, atts );
+ writeStartTag( HtmlMarkup.OL, atts );
}
/**
@@ -636,7 +637,7 @@
*/
public void numberedList_()
{
- writeEndTag( Tag.OL );
+ writeEndTag( HtmlMarkup.OL );
}
/**
@@ -657,7 +658,7 @@
MutableAttributeSet atts = SinkUtils.filterAttributes(
attributes, SinkUtils.SINK_BASE_ATTRIBUTES );
- writeStartTag( Tag.LI, atts );
+ writeStartTag( HtmlMarkup.LI, atts );
}
/**
@@ -666,7 +667,7 @@
*/
public void numberedListItem_()
{
- writeEndTag( Tag.LI );
+ writeEndTag( HtmlMarkup.LI );
}
/**
@@ -695,7 +696,7 @@
MutableAttributeSet atts = SinkUtils.filterAttributes(
attributes, SinkUtils.SINK_BASE_ATTRIBUTES );
- writeStartTag( Tag.DL, atts );
+ writeStartTag( HtmlMarkup.DL, atts );
}
/**
@@ -704,7 +705,7 @@
*/
public void definitionList_()
{
- writeEndTag( Tag.DL );
+ writeEndTag( HtmlMarkup.DL );
}
/**
@@ -716,7 +717,7 @@
MutableAttributeSet atts = SinkUtils.filterAttributes(
attributes, SinkUtils.SINK_BASE_ATTRIBUTES );
- writeStartTag( Tag.DT, atts );
+ writeStartTag( HtmlMarkup.DT, atts );
}
/**
@@ -734,7 +735,7 @@
*/
public void definedTerm_()
{
- writeEndTag( Tag.DT );
+ writeEndTag( HtmlMarkup.DT );
}
/**
@@ -755,7 +756,7 @@
MutableAttributeSet atts = SinkUtils.filterAttributes(
attributes, SinkUtils.SINK_BASE_ATTRIBUTES );
- writeStartTag( Tag.DD, atts );
+ writeStartTag( HtmlMarkup.DD, atts );
}
/**
@@ -764,7 +765,7 @@
*/
public void definition_()
{
- writeEndTag( Tag.DD );
+ writeEndTag( HtmlMarkup.DD );
}
/**
@@ -776,7 +777,7 @@
*/
public void figure()
{
- write( String.valueOf( LESS_THAN ) + Tag.IMG );
+ write( String.valueOf( LESS_THAN ) + HtmlMarkup.IMG );
legacyFigure = true;
}
@@ -801,7 +802,7 @@
atts.addAttribute( SinkEventAttributes.CLASS, "figure" );
}
- writeStartTag( Tag.DIV, atts );
+ writeStartTag( HtmlMarkup.DIV, atts );
}
/** {...@inheritdoc} */
@@ -819,7 +820,7 @@
}
else
{
- writeEndTag( Tag.DIV );
+ writeEndTag( HtmlMarkup.DIV );
inFigure = false;
}
@@ -845,7 +846,7 @@
MutableAttributeSet atts = new SinkEventAttributeSet( 1 );
atts.addAttribute( SinkEventAttributes.ALIGN, "center" );
- writeStartTag( Tag.P, atts );
+ writeStartTag( HtmlMarkup.P, atts );
}
int count = ( attributes == null ? 1 : attributes.getAttributeCount()
+ 1 );
@@ -860,11 +861,11 @@
atts.addAttribute( Attribute.ALT.toString(), "" );
}
- writeStartTag( Tag.IMG, atts, true );
+ writeStartTag( HtmlMarkup.IMG, atts, true );
if ( inFigure )
{
- writeEndTag( Tag.P );
+ writeEndTag( HtmlMarkup.P );
}
}
@@ -936,7 +937,7 @@
MutableAttributeSet atts = SinkUtils.filterAttributes(
attributes, SinkUtils.SINK_SECTION_ATTRIBUTES );
- writeStartTag( Tag.P, atts );
+ writeStartTag( HtmlMarkup.P, atts );
}
/**
@@ -947,7 +948,7 @@
{
if ( paragraphFlag )
{
- writeEndTag( Tag.P );
+ writeEndTag( HtmlMarkup.P );
paragraphFlag = false;
}
}
@@ -1016,7 +1017,7 @@
String width = (String) atts.getAttribute( Attribute.WIDTH.toString()
);
atts.removeAttribute( Attribute.WIDTH.toString() );
- writeStartTag( Tag.DIV, atts );
+ writeStartTag( HtmlMarkup.DIV, atts );
if ( width != null )
{
@@ -1026,7 +1027,7 @@
atts.removeAttribute( Attribute.ALIGN.toString() );
atts.removeAttribute( Attribute.CLASS.toString() );
- writeStartTag( Tag.PRE, atts );
+ writeStartTag( HtmlMarkup.PRE, atts );
}
/**
@@ -1036,8 +1037,8 @@
*/
public void verbatim_()
{
- writeEndTag( Tag.PRE );
- writeEndTag( Tag.DIV );
+ writeEndTag( HtmlMarkup.PRE );
+ writeEndTag( HtmlMarkup.DIV );
verbatimFlag = false;
@@ -1061,7 +1062,7 @@
MutableAttributeSet atts = SinkUtils.filterAttributes(
attributes, SinkUtils.SINK_HR_ATTRIBUTES );
- writeSimpleTag( Tag.HR, atts );
+ writeSimpleTag( HtmlMarkup.HR, atts );
}
/** {...@inheritdoc} */
@@ -1104,12 +1105,12 @@
{
this.tableRows = false;
- writeEndTag( Tag.TABLE );
+ writeEndTag( HtmlMarkup.TABLE );
String content = tempWriter.toString();
String startTable =
- new StringBuffer().append( Markup.LESS_THAN ).append(
Tag.TABLE.toString() ).toString();
+ new StringBuffer().append( Markup.LESS_THAN ).append(
HtmlMarkup.TABLE.toString() ).toString();
if ( content.lastIndexOf( startTable ) == -1 )
{
@@ -1123,10 +1124,10 @@
content = content.substring( content.lastIndexOf( startTable ) );
String startCaption =
- new StringBuffer().append( Markup.LESS_THAN ).append(
Tag.CAPTION.toString() )
+ new StringBuffer().append( Markup.LESS_THAN ).append(
HtmlMarkup.CAPTION.toString() )
.append( Markup.GREATER_THAN ).toString();
String endCaption =
- new StringBuffer().append( Markup.LESS_THAN ).append( Markup.SLASH
).append( Tag.CAPTION.toString() )
+ new StringBuffer().append( Markup.LESS_THAN ).append( Markup.SLASH
).append( HtmlMarkup.CAPTION.toString() )
.append( Markup.GREATER_THAN ).toString();
if ( content.indexOf( startCaption ) != -1 && content.indexOf(
endCaption ) != -1 )
@@ -1139,7 +1140,7 @@
String contentWithoutCaption = StringUtils.replace( content,
captionTag, "" );
String startTr =
- new StringBuffer().append( Markup.LESS_THAN ).append(
Tag.TR.toString() ).toString();
+ new StringBuffer().append( Markup.LESS_THAN ).append(
HtmlMarkup.TR.toString() ).toString();
StringBuffer text = new StringBuffer();
text.append( contentWithoutCaption.substring( 0,
contentWithoutCaption.indexOf( startTr ) ) );
@@ -1192,7 +1193,7 @@
tableAttributes.removeAttributes( tableAttributes );
- writeStartTag( Tag.TABLE, att );
+ writeStartTag( HtmlMarkup.TABLE, att );
}
/** {...@inheritdoc} */
@@ -1243,7 +1244,7 @@
att.addAttributes( SinkUtils.filterAttributes(
attributes, SinkUtils.SINK_TR_ATTRIBUTES ) );
- writeStartTag( Tag.TR, att );
+ writeStartTag( HtmlMarkup.TR, att );
evenTableRow = !evenTableRow;
@@ -1256,7 +1257,7 @@
*/
public void tableRow_()
{
- writeEndTag( Tag.TR );
+ writeEndTag( HtmlMarkup.TR );
cellCount = 0;
}
@@ -1331,7 +1332,7 @@
}
- Tag t = ( headerRow ? Tag.TH : Tag.TD );
+ Tag t = ( headerRow ? HtmlMarkup.TH : HtmlMarkup.TD );
MutableAttributeSet att = new SinkEventAttributeSet();
@@ -1367,7 +1368,7 @@
*/
private void tableCell_( boolean headerRow )
{
- Tag t = ( headerRow ? Tag.TH : Tag.TD );
+ Tag t = ( headerRow ? HtmlMarkup.TH : HtmlMarkup.TD );
writeEndTag( t );
@@ -1396,7 +1397,7 @@
MutableAttributeSet atts = SinkUtils.filterAttributes(
attributes, SinkUtils.SINK_SECTION_ATTRIBUTES );
- writeStartTag( Tag.CAPTION, atts );
+ writeStartTag( HtmlMarkup.CAPTION, atts );
}
/**
@@ -1405,7 +1406,7 @@
*/
public void tableCaption_()
{
- writeEndTag( Tag.CAPTION );
+ writeEndTag( HtmlMarkup.CAPTION );
}
/**
@@ -1449,7 +1450,7 @@
att.addAttribute( Attribute.NAME, id );
att.addAttributes( atts );
- writeStartTag( Tag.A, att );
+ writeStartTag( HtmlMarkup.A, att );
}
/**
@@ -1460,7 +1461,7 @@
{
if ( !headFlag )
{
- writeEndTag( Tag.A );
+ writeEndTag( HtmlMarkup.A );
}
}
@@ -1530,7 +1531,7 @@
att.addAttributes( attributes );
}
- writeStartTag( Tag.A, att );
+ writeStartTag( HtmlMarkup.A, att );
}
/**
@@ -1541,7 +1542,7 @@
{
if ( !headFlag )
{
- writeEndTag( Tag.A );
+ writeEndTag( HtmlMarkup.A );
}
}
@@ -1553,7 +1554,7 @@
{
if ( !headFlag )
{
- writeStartTag( Tag.I );
+ writeStartTag( HtmlMarkup.I );
}
}
@@ -1565,7 +1566,7 @@
{
if ( !headFlag )
{
- writeEndTag( Tag.I );
+ writeEndTag( HtmlMarkup.I );
}
}
@@ -1577,7 +1578,7 @@
{
if ( !headFlag )
{
- writeStartTag( Tag.B );
+ writeStartTag( HtmlMarkup.B );
}
}
@@ -1589,7 +1590,7 @@
{
if ( !headFlag )
{
- writeEndTag( Tag.B );
+ writeEndTag( HtmlMarkup.B );
}
}
@@ -1601,7 +1602,7 @@
{
if ( !headFlag )
{
- writeStartTag( Tag.TT );
+ writeStartTag( HtmlMarkup.TT );
}
}
@@ -1613,7 +1614,7 @@
{
if ( !headFlag )
{
- writeEndTag( Tag.TT );
+ writeEndTag( HtmlMarkup.TT );
}
}
@@ -1641,7 +1642,7 @@
MutableAttributeSet atts = SinkUtils.filterAttributes(
attributes, SinkUtils.SINK_BR_ATTRIBUTES );
- writeSimpleTag( Tag.BR, atts );
+ writeSimpleTag( HtmlMarkup.BR, atts );
}
}
@@ -1692,38 +1693,38 @@
{
if ( attributes.containsAttribute( SinkEventAttributes.DECORATION,
"underline" ) )
{
- writeStartTag( Tag.U );
+ writeStartTag( HtmlMarkup.U );
}
if ( attributes.containsAttribute( SinkEventAttributes.DECORATION,
"line-through" ) )
{
- writeStartTag( Tag.S );
+ writeStartTag( HtmlMarkup.S );
}
if ( attributes.containsAttribute( SinkEventAttributes.VALIGN,
"sub" ) )
{
- writeStartTag( Tag.SUB );
+ writeStartTag( HtmlMarkup.SUB );
}
if ( attributes.containsAttribute( SinkEventAttributes.VALIGN,
"sup" ) )
{
- writeStartTag( Tag.SUP );
+ writeStartTag( HtmlMarkup.SUP );
}
text( text );
if ( attributes.containsAttribute( SinkEventAttributes.VALIGN,
"sup" ) )
{
- writeEndTag( Tag.SUP );
+ writeEndTag( HtmlMarkup.SUP );
}
if ( attributes.containsAttribute( SinkEventAttributes.VALIGN,
"sub" ) )
{
- writeEndTag( Tag.SUB );
+ writeEndTag( HtmlMarkup.SUB );
}
if ( attributes.containsAttribute( SinkEventAttributes.DECORATION,
"line-through" ) )
{
- writeEndTag( Tag.S );
+ writeEndTag( HtmlMarkup.S );
}
if ( attributes.containsAttribute( SinkEventAttributes.DECORATION,
"underline" ) )
{
- writeEndTag( Tag.U );
+ writeEndTag( HtmlMarkup.U );
}
}
}
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=779533&r1=779532&r2=779533&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 May 28 10:17:25 2009
@@ -24,7 +24,6 @@
import java.util.Iterator;
import javax.swing.text.html.HTML.Attribute;
-import javax.swing.text.html.HTML.Tag;
import org.apache.maven.doxia.macro.MacroExecutionException;
import org.apache.maven.doxia.module.fml.model.Faq;
@@ -128,7 +127,7 @@
currentPart.setId( DoxiaUtils.encodeId( currentPart.getId(),
true ) );
}
}
- else if ( parser.getName().equals( Tag.TITLE.toString() ) )
+ else if ( parser.getName().equals( TITLE.toString() ) )
{
if ( currentPart == null )
{
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.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/XdocParser.java?rev=779533&r1=779532&r2=779533&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
Thu May 28 10:17:25 2009
@@ -27,7 +27,6 @@
import java.util.Map;
import javax.swing.text.html.HTML.Attribute;
-import javax.swing.text.html.HTML.Tag;
import org.apache.maven.doxia.macro.MacroExecutionException;
import org.apache.maven.doxia.macro.manager.MacroNotFoundException;
@@ -110,7 +109,7 @@
//Do nothing
return;
}
- else if ( parser.getName().equals( Tag.HEAD.toString() ) )
+ else if ( parser.getName().equals( HEAD.toString() ) )
{
if ( !inHead ) // we might be in head from a <properties> already
{
@@ -119,7 +118,7 @@
sink.head( attribs );
}
}
- else if ( parser.getName().equals( Tag.TITLE.toString() ) )
+ else if ( parser.getName().equals( TITLE.toString() ) )
{
sink.title( attribs );
}
@@ -131,7 +130,7 @@
{
sink.date( attribs );
}
- else if ( parser.getName().equals( Tag.META.toString() ) )
+ else if ( parser.getName().equals( META.toString() ) )
{
String name = parser.getAttributeValue( null,
Attribute.NAME.toString() );
String content = parser.getAttributeValue( null,
Attribute.CONTENT.toString() );
@@ -157,7 +156,7 @@
sink.unknown( "meta", new Object[] {new Integer(
TAG_TYPE_SIMPLE )}, attribs );
}
}
- else if ( parser.getName().equals( Tag.BODY.toString() ) )
+ else if ( parser.getName().equals( BODY.toString() ) )
{
if ( inHead )
{
@@ -245,7 +244,7 @@
}
}
}
- else if ( parser.getName().equals( Tag.PARAM.toString() ) )
+ else if ( parser.getName().equals( PARAM.toString() ) )
{
if ( !isSecondParsing() )
{
@@ -257,7 +256,7 @@
if ( StringUtils.isEmpty( paramName ) ||
StringUtils.isEmpty( paramValue ) )
{
throw new MacroExecutionException( "'" +
Attribute.NAME.toString() + "' and '"
- + Attribute.VALUE.toString() + "' attributes for
the '" + Tag.PARAM.toString()
+ + Attribute.VALUE.toString() + "' attributes for
the '" + PARAM.toString()
+ "' tag are required inside the '" +
MACRO_TAG.toString() + "' tag." );
}
@@ -301,17 +300,17 @@
//Do nothing
return;
}
- else if ( parser.getName().equals( Tag.HEAD.toString() ) )
+ else if ( parser.getName().equals( HEAD.toString() ) )
{
//Do nothing, head is closed with BODY start.
}
- else if ( parser.getName().equals( Tag.BODY.toString() ) )
+ else if ( parser.getName().equals( BODY.toString() ) )
{
consecutiveSections( 0, sink );
sink.body_();
}
- else if ( parser.getName().equals( Tag.TITLE.toString() ) )
+ else if ( parser.getName().equals( TITLE.toString() ) )
{
sink.title_();
}
@@ -368,7 +367,7 @@
macroName = null;
macroParameters = null;
}
- else if ( parser.getName().equals( Tag.PARAM.toString() ) )
+ else if ( parser.getName().equals( PARAM.toString() ) )
{
if ( !StringUtils.isNotEmpty( macroName ) )
{
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.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/XdocSink.java?rev=779533&r1=779532&r2=779533&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
Thu May 28 10:17:25 2009
@@ -23,7 +23,6 @@
import javax.swing.text.MutableAttributeSet;
import javax.swing.text.html.HTML.Attribute;
-import javax.swing.text.html.HTML.Tag;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.doxia.sink.SinkEventAttributes;
@@ -172,7 +171,7 @@
*/
public void title()
{
- writeStartTag( Tag.TITLE );
+ writeStartTag( TITLE );
}
/**
@@ -183,7 +182,7 @@
{
content( getTextBuffer().toString() );
- writeEndTag( Tag.TITLE );
+ writeEndTag( TITLE );
resetTextBuffer();
}
@@ -228,7 +227,7 @@
*/
public void body()
{
- writeStartTag( Tag.BODY );
+ writeStartTag( BODY );
}
/**
@@ -238,7 +237,7 @@
*/
public void body_()
{
- writeEndTag( Tag.BODY );
+ writeEndTag( BODY );
writeEndTag( DOCUMENT_TAG );
@@ -310,15 +309,15 @@
if ( depth == SECTION_LEVEL_3 )
{
- writeStartTag( Tag.H4, atts );
+ writeStartTag( H4, atts );
}
else if ( depth == SECTION_LEVEL_4 )
{
- writeStartTag( Tag.H5, atts );
+ writeStartTag( H5, atts );
}
else if ( depth == SECTION_LEVEL_5 )
{
- writeStartTag( Tag.H6, atts );
+ writeStartTag( H6, atts );
}
}
@@ -338,15 +337,15 @@
}
else if ( depth == SECTION_LEVEL_3 )
{
- writeEndTag( Tag.H4 );
+ writeEndTag( H4 );
}
else if ( depth == SECTION_LEVEL_4 )
{
- writeEndTag( Tag.H5 );
+ writeEndTag( H5 );
}
else if ( depth == SECTION_LEVEL_5 )
{
- writeEndTag( Tag.H6 );
+ writeEndTag( H6 );
}
}
@@ -390,7 +389,7 @@
else
{
atts.removeAttribute( Attribute.ALIGN.toString() );
- writeStartTag( Tag.PRE, atts );
+ writeStartTag( PRE, atts );
}
}
@@ -407,7 +406,7 @@
}
else
{
- writeEndTag( Tag.PRE );
+ writeEndTag( PRE );
}
setVerbatimFlag( false );
@@ -429,7 +428,7 @@
att.addAttribute( Attribute.ALIGN, "center" );
att.addAttribute( Attribute.BORDER, ( grid ? "1" : "0" ) );
- writeStartTag( Tag.TABLE, att );
+ writeStartTag( TABLE, att );
}
/**
@@ -443,7 +442,7 @@
MutableAttributeSet att = new SinkEventAttributeSet();
att.addAttribute( Attribute.VALIGN, "top" );
- writeStartTag( Tag.TR, att );
+ writeStartTag( TR, att );
setCellCount( 0 );
}
@@ -470,7 +469,7 @@
att.addAttribute( Attribute.TARGET, target );
}
- writeStartTag( Tag.A, att );
+ writeStartTag( A, att );
}
// ----------------------------------------------------------------------
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.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/XhtmlParser.java?rev=779533&r1=779532&r2=779533&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
Thu May 28 10:17:25 2009
@@ -20,7 +20,6 @@
*/
import javax.swing.text.html.HTML.Attribute;
-import javax.swing.text.html.HTML.Tag;
import org.apache.maven.doxia.macro.MacroExecutionException;
import org.apache.maven.doxia.parser.XhtmlBaseParser;
@@ -56,20 +55,20 @@
SinkEventAttributeSet attribs = getAttributesFromParser( parser );
- if ( parser.getName().equals( Tag.HTML.toString() ) )
+ if ( parser.getName().equals( HTML.toString() ) )
{
//Do nothing
return;
}
- else if ( parser.getName().equals( Tag.HEAD.toString() ) )
+ else if ( parser.getName().equals( HEAD.toString() ) )
{
sink.head( attribs );
}
- else if ( parser.getName().equals( Tag.TITLE.toString() ) )
+ else if ( parser.getName().equals( TITLE.toString() ) )
{
sink.title( attribs );
}
- else if ( parser.getName().equals( Tag.META.toString() ) )
+ else if ( parser.getName().equals( META.toString() ) )
{
String name = parser.getAttributeValue( null,
Attribute.NAME.toString() );
String content = parser.getAttributeValue( null,
Attribute.CONTENT.toString() );
@@ -100,15 +99,15 @@
* for a model or a major part of a model such as a form. This element
* often appears at the beginning or end of a model.
*/
- else if ( parser.getName().equals( Tag.ADDRESS.toString() ) )
+ else if ( parser.getName().equals( ADDRESS.toString() ) )
{
sink.author( attribs );
}
- else if ( parser.getName().equals( Tag.BODY.toString() ) )
+ else if ( parser.getName().equals( BODY.toString() ) )
{
sink.body( attribs );
}
- else if ( parser.getName().equals( Tag.DIV.toString() ) )
+ else if ( parser.getName().equals( DIV.toString() ) )
{
String divclass = parser.getAttributeValue( null,
Attribute.CLASS.toString() );
@@ -129,7 +128,7 @@
* Non-visual user agents are not required to respect extra white space
* in the content of a PRE element.
*/
- else if ( parser.getName().equals( Tag.PRE.toString() ) )
+ else if ( parser.getName().equals( PRE.toString() ) )
{
if ( boxed )
{
@@ -166,30 +165,30 @@
protected void handleEndTag( XmlPullParser parser, Sink sink )
throws XmlPullParserException, MacroExecutionException
{
- if ( parser.getName().equals( Tag.HTML.toString() ) )
+ if ( parser.getName().equals( HTML.toString() ) )
{
//Do nothing
return;
}
- else if ( parser.getName().equals( Tag.HEAD.toString() ) )
+ else if ( parser.getName().equals( HEAD.toString() ) )
{
sink.head_();
}
- else if ( parser.getName().equals( Tag.TITLE.toString() ) )
+ else if ( parser.getName().equals( TITLE.toString() ) )
{
sink.title_();
}
- else if ( parser.getName().equals( Tag.BODY.toString() ) )
+ else if ( parser.getName().equals( BODY.toString() ) )
{
consecutiveSections( 0, sink );
sink.body_();
}
- else if ( parser.getName().equals( Tag.ADDRESS.toString() ) )
+ else if ( parser.getName().equals( ADDRESS.toString() ) )
{
sink.author_();
}
- else if ( parser.getName().equals( Tag.DIV.toString() ) )
+ else if ( parser.getName().equals( DIV.toString() ) )
{
this.boxed = false;
super.baseEndTag( parser, sink );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.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/XhtmlSink.java?rev=779533&r1=779532&r2=779533&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
Thu May 28 10:17:25 2009
@@ -23,7 +23,6 @@
import javax.swing.text.MutableAttributeSet;
import javax.swing.text.html.HTML.Attribute;
-import javax.swing.text.html.HTML.Tag;
import org.apache.maven.doxia.sink.XhtmlBaseSink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
@@ -121,9 +120,9 @@
atts.addAttribute( "xml:lang", languageId );
}
- writeStartTag( Tag.HTML, atts );
+ writeStartTag( HTML, atts );
- writeStartTag( Tag.HEAD );
+ writeStartTag( HEAD );
}
/** {...@inheritdoc} */
@@ -136,8 +135,8 @@
// ((title,(script|style|meta|link|object|isindex)*,
//
(base,(script|style|meta|link|object|isindex)*)?)|(base,(script|style|meta|link|object|isindex)*,
// (title,(script|style|meta|link|object|isindex)*))))"
- writeStartTag( Tag.TITLE );
- writeEndTag( Tag.TITLE );
+ writeStartTag( TITLE );
+ writeEndTag( TITLE );
}
setHeadFlag( false );
@@ -148,7 +147,7 @@
write( "<meta http-equiv=\"Content-Type\" content=\"text/html;
charset=" + encoding + "\"/>" );
}
- writeEndTag( Tag.HEAD );
+ writeEndTag( HEAD );
}
/**
@@ -159,7 +158,7 @@
{
setHeadTitleFlag( true );
- writeStartTag( Tag.TITLE );
+ writeStartTag( TITLE );
}
/**
@@ -170,7 +169,7 @@
{
content( getTextBuffer().toString() );
- writeEndTag( Tag.TITLE );
+ writeEndTag( TITLE );
resetTextBuffer();
@@ -192,7 +191,7 @@
text = StringUtils.replace( text, "&#", "&#" );
att.addAttribute( Attribute.CONTENT, text );
- writeSimpleTag( Tag.META, att );
+ writeSimpleTag( META, att );
resetTextBuffer();
}
@@ -210,7 +209,7 @@
att.addAttribute( Attribute.NAME, "date" );
att.addAttribute( Attribute.CONTENT, getTextBuffer().toString() );
- writeSimpleTag( Tag.META, att );
+ writeSimpleTag( META, att );
resetTextBuffer();
}
@@ -222,7 +221,7 @@
*/
public void body()
{
- writeStartTag( Tag.BODY );
+ writeStartTag( BODY );
}
/**
@@ -232,9 +231,9 @@
*/
public void body_()
{
- writeEndTag( Tag.BODY );
+ writeEndTag( BODY );
- writeEndTag( Tag.HTML );
+ writeEndTag( HTML );
flush();
