PR:

Obtained from:
Submitted by:
Reviewed by:
Start of work to move FOText from extending FObj to extending FONode instead.

All work is done except for changing FObj's parent from FObj to
FONode.  The RTF library works fine with the switch, but simple.fo and
franklin_alt.fo (among others I guess) will not work properly when FOText's
parent is switched.  (Layout problems occur--lines don't break properly
with the switch.)

Switch to super() constructor (instead of super(fobj) one) within
within TextLayoutManager, as it is not needed for this subclass, also to
facilitate the change above.


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

1 files changed, 4 insertions, 3 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index 9d04eb4a4..d8a624e1d 100644
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -19,6 +19,7 @@
 package org.apache.fop.layoutmgr;
 
 import org.apache.fop.fo.FObj;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Resolveable;
@@ -413,9 +414,9 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
         List newLMs = new ArrayList(size);
         while (fobjIter.hasNext() && newLMs.size() < size ) {
             Object theobj = fobjIter.next();
-            if (theobj instanceof FObj) {
-                FObj fobj = (FObj) theobj;
-                fobj.addLayoutManager(newLMs);
+            if (theobj instanceof FONode) {
+                FONode foNode = (FONode) theobj;
+                foNode.addLayoutManager(newLMs);
             }
         }
         return newLMs;