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 ma...@apache.org on 2005/12/28 04:21:15 UTC
svn commit: r359368 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java status.xml
test/layoutengine/disabled-testcases.xml
Author: manuel
Date: Tue Dec 27 19:21:08 2005
New Revision: 359368
URL: http://svn.apache.org/viewcvs?rev=359368&view=rev
Log:
Fix for bug 37743 and part of 38053
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/trunk/status.xml
xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=359368&r1=359367&r2=359368&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Tue Dec 27 19:21:08 2005
@@ -1777,7 +1777,7 @@
&& (!context.isLastArea() || parentIter.hasNext())) {
lineArea.setBPD(lineArea.getBPD() + context.getSpaceAfter());
}
- lineArea.finalize();
+ lineArea.finalise();
parentLM.addChildArea(lineArea);
} else if (pos instanceof NonLeafPosition) {
// Nested block-level content;
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/status.xml?rev=359368&r1=359367&r2=359368&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Tue Dec 27 19:21:08 2005
@@ -27,6 +27,14 @@
<changes>
<release version="FOP Trunk">
+ <action context="Code" dev="MM" type="fix" fixes-bug="37743">
+ Bugfix: ClassCastException on certain fo:inline with border combinations.
+ </action>
+ <action context="Code" dev="MM" type="fix">
+ Changed a method name in LineArea from finalize to finalise because it was
+ never intended for the method to be an override of the Java Object finalize
+ method. If invoked by the Java garbage collector it may cause a NPE.
+ </action>
</release>
<release version="0.91beta" date="23 Dec 2005">
<action context="Code" dev="JM" type="update">
Modified: xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml?rev=359368&r1=359367&r2=359368&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml Tue Dec 27 19:21:08 2005
@@ -142,13 +142,6 @@
NullPointerException.</description>
</testcase>
<testcase>
- <name>ClassCastException caused by inline border</name>
- <file>inline_border_bug37743.xml</file>
- <description>A ClassCastException occurs during element list creation when an
- inline with a border is directly followed by character data.</description>
- <reference>http://issues.apache.org/bugzilla/show_bug.cgi?id=37743</reference>
- </testcase>
- <testcase>
<name>inline-container is not implemented, yet.</name>
<file>inline-container_block_nested.xml</file>
<description>inline-container is not implemented, yet. Content of an
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
Re: svn commit: r359368 - in /xmlgraphics/fop/trunk: src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java status.xml test/layoutengine/disabled-testcases.xml
Posted by Clay Leeds <we...@mac.com>.
On Dec 27, 2005, at 8:23 PM, Manuel Mall wrote:
> On Wed, 28 Dec 2005 11:21 am, manuel@apache.org wrote:
>> Author: manuel
>> Date: Tue Dec 27 19:21:08 2005
>> New Revision: 359368
>>
>> URL: http://svn.apache.org/viewcvs?rev=359368&view=rev
>> Log:
>> Fix for bug 37743 and part of 38053
>>
> Sorry, I committed some of the files in the wrong order. This patch
> and
> the previous commit
> ( http://svn.apache.org/viewcvs?rev=359364&view=rev) go together and
> cannot be looked at in isolation.
>
> Manuel
You might want to post a comment to both BUGs...
Happy holidays, and thanks for all the hard work!
Web Maestro Clay
Re: svn commit: r359368 - in /xmlgraphics/fop/trunk: src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java status.xml test/layoutengine/disabled-testcases.xml
Posted by Manuel Mall <mm...@arcus.com.au>.
On Wed, 28 Dec 2005 11:21 am, manuel@apache.org wrote:
> Author: manuel
> Date: Tue Dec 27 19:21:08 2005
> New Revision: 359368
>
> URL: http://svn.apache.org/viewcvs?rev=359368&view=rev
> Log:
> Fix for bug 37743 and part of 38053
>
Sorry, I committed some of the files in the wrong order. This patch and
the previous commit
( http://svn.apache.org/viewcvs?rev=359364&view=rev) go together and
cannot be looked at in isolation.
Manuel