Author: ltheussl
Date: Mon May 18 09:14:05 2009
New Revision: 775865
URL: http://svn.apache.org/viewvc?rev=775865&view=rev
Log:
Emit top link as paragraph, not table, to avoid unwanted styling in html output.
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.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-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java?rev=775865&r1=775864&r2=775865&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
Mon May 18 09:14:05 2009
@@ -31,9 +31,6 @@
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
import com.gargoylesoftware.htmlunit.html.HtmlPreformattedText;
-import com.gargoylesoftware.htmlunit.html.HtmlTable;
-import com.gargoylesoftware.htmlunit.html.HtmlTableDataCell;
-import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
import java.util.Iterator;
@@ -148,16 +145,8 @@
assertEquals( element.getTagName(), "i" );
assertEquals( element.asText().trim(), "italic" );
- HtmlTable table = (HtmlTable) elementIterator.next();
- assertEquals( table.getAttributeValue( "border" ), "0" );
-
- element = (HtmlElement) elementIterator.next();
- // this is a htmlunit bug
- assertEquals( element.getTagName(), "tbody" );
-
- HtmlTableRow tr = (HtmlTableRow) elementIterator.next();
- HtmlTableDataCell td = (HtmlTableDataCell) elementIterator.next();
- assertEquals( td.getAttributeValue( "align" ), "right" );
+ p = (HtmlParagraph) elementIterator.next();
+ assertEquals( p.getAttributeValue( "style" ), "float:right;" );
a = (HtmlAnchor) elementIterator.next();
assertEquals( a.getAttributeValue( "href" ), "#top" );
@@ -195,16 +184,8 @@
HtmlPreformattedText pre = (HtmlPreformattedText)
elementIterator.next();
assertEquals( pre.asText().trim(), "<source>1.5</source>" );
- table = (HtmlTable) elementIterator.next();
- assertEquals( table.getAttributeValue( "border" ), "0" );
-
- element = (HtmlElement) elementIterator.next();
- // this is a htmlunit bug
- assertEquals( element.getTagName(), "tbody" );
-
- tr = (HtmlTableRow) elementIterator.next();
- td = (HtmlTableDataCell) elementIterator.next();
- assertEquals( td.getAttributeValue( "align" ), "right" );
+ p = (HtmlParagraph) elementIterator.next();
+ assertEquals( p.getAttributeValue( "style" ), "float:right;" );
a = (HtmlAnchor) elementIterator.next();
assertEquals( a.getAttributeValue( "href" ), "#top" );
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=775865&r1=775864&r2=775865&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
Mon May 18 09:14:05 2009
@@ -33,6 +33,7 @@
import org.apache.maven.doxia.parser.AbstractXmlParser;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.doxia.util.DoxiaUtils;
import org.apache.maven.doxia.util.HtmlTools;
@@ -462,23 +463,13 @@
*/
private void writeTopLink( Sink sink )
{
- int[] justify = { Sink.JUSTIFY_RIGHT };
-
- sink.table();
-
- sink.tableRows( justify, false );
-
- sink.tableRow();
- sink.tableCell();
+ SinkEventAttributeSet atts = new SinkEventAttributeSet();
+ atts.addAttribute( SinkEventAttributeSet.STYLE, "float:right;" );
+ sink.paragraph( atts );
sink.link( "#top" );
sink.text( "[top]" );
sink.link_();
- sink.tableCell_();
- sink.tableRow_();
-
- sink.tableRows_();
-
- sink.table_();
+ sink.paragraph_();
}
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java?rev=775865&r1=775864&r2=775865&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
Mon May 18 09:14:05 2009
@@ -110,17 +110,11 @@
assertEquals( "paragraph", ( (SinkEventElement) it.next() ).getName()
);
assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "paragraph_", ( (SinkEventElement) it.next() ).getName()
);
- assertEquals( "table", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "tableRows", ( (SinkEventElement) it.next() ).getName()
);
- assertEquals( "tableRow", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "tableCell", ( (SinkEventElement) it.next() ).getName()
);
+ assertEquals( "paragraph", ( (SinkEventElement) it.next() ).getName()
);
assertEquals( "link", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
assertEquals( "link_", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "tableCell_", ( (SinkEventElement) it.next() ).getName()
);
- assertEquals( "tableRow_", ( (SinkEventElement) it.next() ).getName()
);
- assertEquals( "tableRows_", ( (SinkEventElement) it.next() ).getName()
);
- assertEquals( "table_", ( (SinkEventElement) it.next() ).getName() );
+ assertEquals( "paragraph_", ( (SinkEventElement) it.next() ).getName()
);
assertEquals( "definition_", ( (SinkEventElement) it.next()
).getName() );
assertEquals( "definitionList_", ( (SinkEventElement) it.next()
).getName() );
assertEquals( "section1_", ( (SinkEventElement) it.next() ).getName()
);
