Bugfix: Fixed two causes for ClassCastExceptions in BlockContainerLayoutManager.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@376235 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
index 658a92e0d7422d0a04dc61d51c9e832bc8cfcb57..33c1bdbae922dd333570552e6126cb65d6a101bb 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -276,7 +276,7 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager
                 // get elements from curLM
                 returnedList = curLM.getNextKnuthElements(childLC, alignment);
                 if (returnedList.size() == 1
-                        && ((KnuthElement)returnedList.getFirst()).isForcedBreak()) {
+                        && ((ListElement)returnedList.getFirst()).isForcedBreak()) {
                     // a descendant of this block has break-before
                     /*
                     if (returnList.size() == 0) {
@@ -306,15 +306,10 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager
                             // blocks
                             contentList.add(new BreakElement(
                                     new Position(this), KnuthElement.INFINITE, context));
-                            //contentList.add(new KnuthPenalty(0,
-                            //        KnuthElement.INFINITE, false,
-                            //        new Position(this), false));
-                        } else if (!((KnuthElement) contentList.getLast()).isGlue()) {
+                        } else if (!((ListElement) contentList.getLast()).isGlue()) {
                             // add a null penalty to allow a break between blocks
                             contentList.add(new BreakElement(
                                     new Position(this), 0, context));
-                            //contentList.add(new KnuthPenalty(0, 0, false,
-                            //        new Position(this), false));
                         } else {
                             // the last element in contentList is a glue;
                             // it is a feasible breakpoint, there is no need to add

diff --git a/status.xml b/status.xml
index 89aa4492cc9ab701d14b2fd20bd16e6197a311ee..22beced41ab4796f1c04c30913d602487aeace09 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -27,6 +27,9 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="JM" type="fix">
+        Bugfix: Fixed two causes for ClassCastExceptions in BlockContainerLayoutManager.
+      </action>
       <action context="Code" dev="JM" type="fix">
         Bugfix: padding-top and padding-bottom on list-items could lead to wrong page
         break decisions and thus to overlapping text.

diff --git a/test/layoutengine/standard-testcases/block-container_element-list-handling-bug.xml b/test/layoutengine/standard-testcases/block-container_element-list-handling-bug.xml
new file mode 100644 (file)
index 0000000..b34ef9a
--- /dev/null
+++ b/test/layoutengine/standard-testcases/block-container_element-list-handling-bug.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test is a regression test for a bug in block-container which causes a ClassCastException because
+      BCLM checked for KnuthElements instead of ListElements.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body" orphans="0" widows="0">
+          <fo:block-container>
+            <fo:block padding-top="5pt" padding-after="5pt">nested content</fo:block>
+            <fo:block padding-top="5pt" padding-after="5pt">nested content</fo:block>
+          </fo:block-container>
+          <fo:block-container>
+            <fo:block break-before="page">nested content</fo:block>
+          </fo:block-container>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2" xpath="count(//pageViewport)"/> <!-- we're just interested in having no exceptions throws here. -->
+  </checks>
+</testcase>