You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2007/01/22 23:33:43 UTC
svn commit: r498835 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java status.xml
test/layoutengine/disabled-testcases.xml
test/layoutengine/standard-testcases/wrapper_block_id.xml
Author: jeremias
Date: Mon Jan 22 14:33:42 2007
New Revision: 498835
URL: http://svn.apache.org/viewvc?view=rev&rev=498835
Log:
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>
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/wrapper_block_id.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
xmlgraphics/fop/trunk/status.xml
xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java?view=diff&rev=498835&r1=498834&r2=498835
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java Mon Jan 22 14:33:42 2007
@@ -69,11 +69,11 @@
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);
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?view=diff&rev=498835&r1=498834&r2=498835
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Mon Jan 22 14:33:42 2007
@@ -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>
Modified: xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml?view=diff&rev=498835&r1=498834&r2=498835
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml Mon Jan 22 14:33:42 2007
@@ -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>
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/wrapper_block_id.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/wrapper_block_id.xml?view=auto&rev=498835
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/wrapper_block_id.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/wrapper_block_id.xml Mon Jan 22 14:33:42 2007
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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 checks fo:wrapper surrounding block-level content with an ID.
+ </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">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:wrapper color="red" id="id1">
+ <fo:block>block content.</fo:block>
+ </fo:wrapper>
+ <fo:wrapper id="id2"/>
+ <fo:block id="id3"/>
+ <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>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <true xpath="boolean(//*[@prod-id='id3'])" fail-msg="ID 'id3' must have been produced to the area tree"/>
+ <true xpath="boolean(//*[@prod-id='id2'])" fail-msg="ID 'id2' must have been produced to the area tree"/>
+ <true xpath="boolean(//*[@prod-id='id1'])" fail-msg="ID 'id1' must have been produced to the area tree"/>
+ </checks>
+</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org