svn commit: r926048 - /maven/doxia/doxia-sitetools/trunk/pom.xml

[ltheussl]

Author: ltheussl
Date: Mon Mar 22 12:38:05 2010
New Revision: 926048

URL: http://svn.apache.org/viewvc?rev=926048&view=rev
Log:
Test latest doxia

Modified:
maven/doxia/doxia-sitetools/trunk/pom.xml

Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=926048&r1=926047&r2=926048&view=diff
==
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Mon Mar 22 12:38:05 2010
@@ -115,7 +115,7 @@ under the License.
 
   
 ${project.version}
-1.1.2
+1.1.3-SNAPSHOT
   
 
   

svn commit: r926049 - in /maven/doxia/doxia/trunk/doxia-core/src: main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java

[ltheussl]

Author: ltheussl
Date: Mon Mar 22 12:40:16 2010
New Revision: 926049

URL: http://svn.apache.org/viewvc?rev=926049&view=rev
Log:
[DOXIA-385] Xdoc: tables without "align" attribute is center aligned

Modified:

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java

maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java

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=926049&r1=926048&r2=926049&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
 Mon Mar 22 12:40:16 2010
@@ -1225,11 +1225,6 @@ public class XhtmlBaseSink
 }
 
 MutableAttributeSet att = new SinkEventAttributeSet();
-if ( !this.tableAttributes.isDefined( Attribute.ALIGN.toString() ) )
-{
-att.addAttribute( Attribute.ALIGN, "center" );
-}
-
 if ( !this.tableAttributes.isDefined( Attribute.BORDER.toString() ) )
 {
 att.addAttribute( Attribute.BORDER, ( grid ? "1" : "0" ) );
@@ -1376,44 +1371,11 @@ public class XhtmlBaseSink
 
 MutableAttributeSet att = new SinkEventAttributeSet();
 
-String justif = null;
 if ( attributes == null )
 {
 attributes = new SinkEventAttributeSet( 0 );
 }
 
-if ( attributes.isDefined( Attribute.ALIGN.toString() ) )
-{
-justif = attributes.getAttribute( Attribute.ALIGN.toString() 
).toString();
-}
-
-if ( !this.cellCountStack.isEmpty() && !this.cellJustifStack.isEmpty() 
)
-{
-int cellCount = Integer.parseInt( 
this.cellCountStack.getLast().toString() );
-int[] cellJustif = (int[]) this.cellJustifStack.getLast();
-if ( justif == null && cellJustif != null && cellJustif.length > 0
-&& this.isCellJustifStack.getLast().equals( Boolean.TRUE ) )
-{
-switch ( cellJustif[Math.min( cellCount, cellJustif.length - 1 
)] )
-{
-case JUSTIFY_LEFT:
-justif = "left";
-break;
-case JUSTIFY_RIGHT:
-justif = "right";
-break;
-case JUSTIFY_CENTER:
-default:
-justif = "center";
-}
-}
-}
-
-if ( justif != null )
-{
-att.addAttribute( Attribute.ALIGN, justif );
-}
-
 att.addAttributes( SinkUtils.filterAttributes(
 attributes, SinkUtils.SINK_TD_ATTRIBUTES  ) );
 

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java?rev=926049&r1=926048&r2=926049&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
 Mon Mar 22 12:40:16 2010
@@ -629,7 +629,7 @@ public class XhtmlBaseSinkTest
 sink.close();
 }
 
-assertEquals( "", writer.toString() );
+assertEquals( "", 
writer.toString() );
 }
 
 /**
@@ -714,7 +714,7 @@ public class XhtmlBaseSinkTest
 sink.close();
 }
 
-assertEquals( "" +
+assertEquals( "" +
 "caption", 
writer.toString() );
 }
 

svn commit: r926050 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java

[ltheussl]

Author: ltheussl
Date: Mon Mar 22 12:41:01 2010
New Revision: 926050

URL: http://svn.apache.org/viewvc?rev=926050&view=rev
Log:
Fix test after r926049.

Modified:

maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java?rev=926050&r1=926049&r2=926050&view=diff
==
--- 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
 Mon Mar 22 12:41:01 2010
@@ -114,7 +114,6 @@ public class AttributesVerifier
 tr = (HtmlTableRow) elementIterator.next();
 
 th = (HtmlTableHeaderCell) elementIterator.next();
-assertEquals( "left", th.getAttributeValue( "align" ) );
 assertEquals( "2", th.getAttributeValue( "rowspan" ) );
 assertEquals( "middle", th.getAttributeValue( "valign" ) );