svn commit: r583579 - in /maven/doxia: doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/ doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/

[ltheussl]

Author: ltheussl
Date: Wed Oct 10 12:07:38 2007
New Revision: 583579

URL: http://svn.apache.org/viewvc?rev=583579&view=rev
Log:
Remove itemFlag from XhtmlSink. I guess it was used to work around a bug in the 
apt parser, this should be fixed there. Paragraphs are legal and significant in 
list items, so they shouldn't be stripped.

Modified:
    
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.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-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java?rev=583579&r1=583578&r2=583579&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
 Wed Oct 10 12:07:38 2007
@@ -201,12 +201,14 @@
 
         li = (HtmlListItem) elementIterator.next();
         assertNotNull( li );
-        // No paragraph renderer
-        assertEquals( li.getFirstChild().asText().trim(), "Item 11." );
+        p = (HtmlParagraph) elementIterator.next();
+        assertNotNull( p );
+        assertEquals( p.getFirstChild().asText().trim(), "Item 11." );
         li = (HtmlListItem) elementIterator.next();
         assertNotNull( li );
-        // No paragraph renderer
-        assertEquals( li.getFirstChild().asText().trim(), "Item 12." );
+        p = (HtmlParagraph) elementIterator.next();
+        assertNotNull( p );
+        assertEquals( p.getFirstChild().asText().trim(), "Item 12." );
         li = (HtmlListItem) elementIterator.next();
         assertNotNull( li );
         assertEquals( li.getFirstChild().asText().trim(), "Item 13." );
@@ -505,7 +507,10 @@
 
         li = (HtmlListItem) elementIterator.next();
         assertNotNull( li );
-        assertEquals( li.getFirstChild().asText().trim(), "list1" );
+
+        p = (HtmlParagraph) elementIterator.next();
+        assertNotNull( p );
+        assertEquals( p.getFirstChild().asText().trim(), "list1" );
 
         assertFalse( elementIterator.hasNext() );
     }

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=583579&r1=583578&r2=583579&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
 Wed Oct 10 12:07:38 2007
@@ -56,8 +56,6 @@
 
     private boolean headFlag;
 
-    private boolean itemFlag;
-
     private boolean verbatimFlag;
 
     private int cellCount;
@@ -131,7 +129,6 @@
     {
         headFlag = false;
         resetBuffer();
-        itemFlag = false;
         verbatimFlag = false;
         cellCount = 0;
     }
@@ -471,7 +468,6 @@
     public void list_()
     {
         writeEndTag( Tag.UL );
-        itemFlag = false;
     }
 
     /**
@@ -481,8 +477,6 @@
     public void listItem()
     {
         writeStartTag( Tag.LI );
-        itemFlag = true;
-        // What follows is at least a paragraph.
     }
 
     /**
@@ -533,7 +527,6 @@
     public void numberedList_()
     {
         writeEndTag( Tag.OL );
-        itemFlag = false;
     }
 
     /**
@@ -543,8 +536,6 @@
     public void numberedListItem()
     {
         writeStartTag( Tag.LI );
-        itemFlag = true;
-        // What follows is at least a paragraph.
     }
 
     /**
@@ -572,7 +563,6 @@
     public void definitionList_()
     {
         writeEndTag( Tag.DL );
-        itemFlag = false;
     }
 
     /**
@@ -600,8 +590,6 @@
     public void definition()
     {
         writeStartTag( Tag.DD );
-        itemFlag = true;
-        // What follows is at least a paragraph.
     }
 
     /**
@@ -653,10 +641,7 @@
      */
     public void paragraph()
     {
-        if ( !itemFlag )
-        {
-            writeStartTag( Tag.P );
-        }
+        writeStartTag( Tag.P );
     }
 
     /**
@@ -665,14 +650,7 @@
      */
     public void paragraph_()
     {
-        if ( itemFlag )
-        {
-            itemFlag = false;
-        }
-        else
-        {
-            writeEndTag( Tag.P );
-        }
+        writeEndTag( Tag.P );
     }
 
     /**