Bugzilla #41426:

Fix for ClassCastException when fo:wrapper was used as direct child of fo:flow.
Note: "id" attributes are still not handled properly on fo:wrapper!
Submitted by: Adrian Cumiskey <fop-dev.at.cumiskey.com>

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

diff --git a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
index 8314238380681872a197db03a63431818a633b6d..e8f635311ace37c131f0cb3bb5b93f31c6b1b1f7 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
@@ -69,11 +69,11 @@ public class FlowLayoutManager extends BlockStackingLayoutManager
         int flowBPD = (int) getCurrentPV().getBodyRegion().getBPD();
 
         // currently active LM
-        BlockLevelLayoutManager curLM;
+        LayoutManager curLM;
         LinkedList returnedList;
         LinkedList returnList = new LinkedList();
 
-        while ((curLM = ((BlockLevelLayoutManager) getChildLM())) != null) {
+        while ((curLM = getChildLM()) != null) {
             if (curLM instanceof InlineLevelLayoutManager) {
                 log.error("inline area not allowed under flow - ignoring");
                 curLM.setFinished(true);

diff --git a/status.xml b/status.xml
index b91fbc1f414790a1b9ff4f2821b09f7de8be1603..1527275c11d43a52aff14fcf6ef7a6aabef494f1 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -28,6 +28,10 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="JM" type="fix" fixes-bug="41426" due-to="Adrian Cumiskey">
+        Fix for ClassCastException when fo:wrapper was used as direct child of fo:flow.
+        Note: "id" attributes are still not handled properly on fo:wrapper!
+      </action>
       <action context="Code" dev="MM" type="add">
         Added support for the soft hyphen (SHY) character.
       </action>

diff --git a/test/layoutengine/disabled-testcases.xml b/test/layoutengine/disabled-testcases.xml
index 748f04f76a8d3c81a795da513d23be007be62f55..9767533d220adfaca24ad41701fc33e27f8155ac 100644 (file)
--- a/test/layoutengine/disabled-testcases.xml
+++ b/test/layoutengine/disabled-testcases.xml
@@ -312,11 +312,10 @@
     case should be revisited.</description>
   </testcase>
   <testcase>
-    <name>fo:wrapper around block-level content</name>
-    <file>wrapper_block.xml</file>
-    <description>A ClassCastException occurs when fo:wrapper directly surrounds a 
-    block-level element because its layout manager is written to handle only 
-    inline content.</description>
+    <name>fo:wrapper around block-level content (with id)</name>
+    <file>wrapper_block_id.xml</file>
+    <description>"id" attributes on fo:wrapper around block-level content don't get
+    added to the area tree.</description>
   </testcase>
   <testcase>
     <name>Bugzilla #40230: invalid extra page break</name>

diff --git a/test/layoutengine/standard-testcases/wrapper_block_id.xml b/test/layoutengine/standard-testcases/wrapper_block_id.xml
new file mode 100644 (file)
index 0000000..6b1d2ae
--- /dev/null
+++ b/test/layoutengine/standard-testcases/wrapper_block_id.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--\r
+  Licensed to the Apache Software Foundation (ASF) under one or more\r
+  contributor license agreements.  See the NOTICE file distributed with\r
+  this work for additional information regarding copyright ownership.\r
+  The ASF licenses this file to You under the Apache License, Version 2.0\r
+  (the "License"); you may not use this file except in compliance with\r
+  the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+  Unless required by applicable law or agreed to in writing, software\r
+  distributed under the License is distributed on an "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+  See the License for the specific language governing permissions and\r
+  limitations under the License.\r
+-->\r
+<!-- $Id$ -->\r
+<testcase>\r
+  <info>\r
+    <p>\r
+      This test checks fo:wrapper surrounding block-level content with an ID.\r
+    </p>\r
+  </info>\r
+  <fo>\r
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">\r
+      <fo:layout-master-set>\r
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">\r
+          <fo:region-body/>\r
+        </fo:simple-page-master>\r
+      </fo:layout-master-set>\r
+      <fo:page-sequence master-reference="normal">\r
+        <fo:flow flow-name="xsl-region-body">\r
+          <fo:wrapper color="red" id="id1">\r
+            <fo:block>block content.</fo:block>\r
+          </fo:wrapper>\r
+          <fo:wrapper id="id2"/>\r
+          <fo:block id="id3"/>\r
+          <fo:block><fo:page-number-citation ref-id="id1"/>-<fo:page-number-citation ref-id="id2"/>-<fo:page-number-citation ref-id="id3"/></fo:block>\r
+        </fo:flow>\r
+      </fo:page-sequence>\r
+    </fo:root>\r
+  </fo>\r
+  <checks>\r
+    <true xpath="boolean(//*[@prod-id='id3'])" fail-msg="ID 'id3' must have been produced to the area tree"/>\r
+    <true xpath="boolean(//*[@prod-id='id2'])" fail-msg="ID 'id2' must have been produced to the area tree"/>\r
+    <true xpath="boolean(//*[@prod-id='id1'])" fail-msg="ID 'id1' must have been produced to the area tree"/>\r
+  </checks>\r
+</testcase>\r