Author: ltheussl
Date: Sun Dec 20 18:49:58 2009
New Revision: 892639
URL: http://svn.apache.org/viewvc?rev=892639&view=rev
Log:
[DOXIA-374] Xhtml tables without a border attribute should render with no
border by default
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
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=892639&r1=892638&r2=892639&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
Sun Dec 20 18:49:58 2009
@@ -925,7 +925,7 @@
String border = parser.getAttributeValue( null,
Attribute.BORDER.toString() );
boolean grid = true;
- if ( "0".equals( border ) )
+ if ( border == null || "0".equals( border ) )
{
grid = false;
}
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java?rev=892639&r1=892638&r2=892639&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
Sun Dec 20 18:49:58 2009
@@ -551,7 +551,12 @@
Iterator it = sink.getEventList().iterator();
assertEquals( "table", ( (SinkEventElement) it.next() ).getName() );
- assertEquals( "tableRows", ( (SinkEventElement) it.next() ).getName()
);
+
+ // DOXIA-374
+ SinkEventElement el = (SinkEventElement) it.next();
+ assertEquals( "tableRows", el.getName() );
+ assertFalse( ( (Boolean) el.getArgs()[1] ).booleanValue() );
+
assertEquals( "tableCaption", ( (SinkEventElement) it.next()
).getName() );
assertEquals( "tableCaption_", ( (SinkEventElement) it.next()
).getName() );
assertEquals( "tableRow", ( (SinkEventElement) it.next() ).getName() );