svn commit: r637075 - in /xmlgraphics/fop/branches/fop-0_95: ./ src/java/org/apache/fop/layoutmgr/ test/layoutengine/standard-testcases/

[vhennebert]

Author: vhennebert
Date: Fri Mar 14 05:19:45 2008
New Revision: 637075

URL: http://svn.apache.org/viewvc?rev=637075&view=rev
Log:
Bugzilla #44412:
Bugfix: When there was a forced break after a block with (conditional) borders 
the border-after wasn't painted.
Changes made by Jeremias

Added:
    
xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/block-level_break-after_bug44412.xml
      - copied unchanged from r637057, 
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-level_break-after_bug44412.xml
Modified:
    
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
    
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
    
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/LayoutContext.java
    xmlgraphics/fop/branches/fop-0_95/status.xml

Modified: 
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=637075&r1=637074&r2=637075&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
 (original)
+++ 
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
 Fri Mar 14 05:19:45 2008
@@ -386,6 +386,9 @@
         }
         addKnuthElementsForBorderPaddingAfter(returnList, true);
         addKnuthElementsForSpaceAfter(returnList, alignment);
+
+        //All child content is processed. Only break-after can occur now, 
so...        
+        context.clearPendingMarks();
         addKnuthElementsForBreakAfter(returnList, context);
 
         setFinished(true);

Modified: 
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java?rev=637075&r1=637074&r2=637075&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
 (original)
+++ 
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
 Fri Mar 14 05:19:45 2008
@@ -393,6 +393,9 @@
 
         addKnuthElementsForBorderPaddingAfter(returnList, true);
         addKnuthElementsForSpaceAfter(returnList, alignment);
+        
+        //All child content is processed. Only break-after can occur now, 
so...        
+        context.clearPendingMarks();
         if (forcedBreakAfterLast == null) {
             addKnuthElementsForBreakAfter(returnList, context);
         }

Modified: 
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/LayoutContext.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/LayoutContext.java?rev=637075&r1=637074&r2=637075&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/LayoutContext.java
 (original)
+++ 
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/LayoutContext.java
 Fri Mar 14 05:19:45 2008
@@ -285,12 +285,8 @@
      * Clears all pending marks on the LayoutContext.
      */
     public void clearPendingMarks() {
-        if (this.pendingBeforeMarks != null) {
-            this.pendingBeforeMarks.clear();
-        }
-        if (this.pendingAfterMarks != null) {
-            this.pendingAfterMarks.clear();
-        }
+        this.pendingBeforeMarks = null;
+        this.pendingAfterMarks = null;
     }
     
     /**

Modified: xmlgraphics/fop/branches/fop-0_95/status.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/status.xml?rev=637075&r1=637074&r2=637075&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_95/status.xml (original)
+++ xmlgraphics/fop/branches/fop-0_95/status.xml Fri Mar 14 05:19:45 2008
@@ -116,6 +116,10 @@
           </p>
         </section>
       </notes>
+      <action context="Layout" dev="JM" type="fix" fixes-bug="44412">
+        Bugfix: When there was a forced break after a block with (conditional) 
borders the
+        border-after wasn't painted.
+      </action>
       <action context="Layout" dev="VH" type="fix">
         Bugfix: a forced break inside a cell was ignored when occurring before 
the minimum height
         set on the enclosing row was set.



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]