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

diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java
index 24e345a00883d3457d1814202f9ad5d5deef094b..1c0867f99ac5538d3b8e4159dedbb61c5197ad28 100644 (file)
--- a/src/java/org/apache/fop/fo/FONode.java
+++ b/src/java/org/apache/fop/fo/FONode.java
@@ -19,6 +19,7 @@
 package org.apache.fop.fo;
 
 // Java
+import java.util.List;
 import java.util.ListIterator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -134,13 +135,6 @@ public abstract class FONode {
         // ignore
     }
 
-    /**
-     *
-     */
-    protected void start() {
-        // do nothing by default
-    }
-
     /**
      *
      */
@@ -328,6 +322,14 @@ public abstract class FONode {
         }
     }
 
+    /**
+     * Return a LayoutManager responsible for laying out this FObj's content.
+     * Must override in subclasses if their content can be laid out.
+     * @param list the list to which the layout manager(s) should be added
+     */
+    public void addLayoutManager(List list) {
+    }
+
     /**
      * Returns the name of the node
      * @return the name of this node

diff --git a/src/java/org/apache/fop/fo/FOText.java b/src/java/org/apache/fop/fo/FOText.java
index 080ed72c6c7cca51c380cb62708c55899d4bb44d..3ccc2a93428298a977af11ab677f22268760f128 100644 (file)
--- a/src/java/org/apache/fop/fo/FOText.java
+++ b/src/java/org/apache/fop/fo/FOText.java
@@ -131,7 +131,7 @@ public class FOText extends FObj {
      * @return true if this will create an area in the output
      */
     public boolean willCreateArea() {
-        if (textInfo.whiteSpaceCollapse == WhiteSpaceCollapse.FALSE
+        if (textInfo.whiteSpaceCollapse == Constants.WhiteSpaceCollapse.FALSE
                 && endIndex - startIndex > 0) {
             return true;
         }
@@ -194,7 +194,7 @@ public class FOText extends FObj {
      * text-transform property.
      */
     private void textTransform() {
-        if (textInfo.textTransform == TextTransform.NONE) {
+        if (textInfo.textTransform == Constants.TextTransform.NONE) {
             return;
         }
         for (int i = 0; i < endIndex; i++) {
@@ -323,13 +323,13 @@ public class FOText extends FObj {
     private char charTransform(int i) {
         switch (textInfo.textTransform) {
         /* put NONE first, as this is probably the common case */
-        case TextTransform.NONE:
+        case Constants.TextTransform.NONE:
             return ca[i];
-        case TextTransform.UPPERCASE:
+        case Constants.TextTransform.UPPERCASE:
             return Character.toUpperCase(ca[i]);
-        case TextTransform.LOWERCASE:
+        case Constants.TextTransform.LOWERCASE:
             return Character.toLowerCase(ca[i]);
-        case TextTransform.CAPITALIZE:
+        case Constants.TextTransform.CAPITALIZE:
             if (isStartOfWord(i)) {
                 /*
                  Use toTitleCase here. Apparently, some languages use
@@ -497,7 +497,7 @@ public class FOText extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         if (endIndex - startIndex > 0) {

diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java
index 2e3e4e49dec3226777ca443ae5ae269b7ec56c27..86d171792c56e8d06fac0b9120393e718c9b371b 100644 (file)
--- a/src/java/org/apache/fop/fo/FObj.java
+++ b/src/java/org/apache/fop/fo/FObj.java
@@ -21,7 +21,6 @@ package org.apache.fop.fo;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
@@ -459,14 +458,6 @@ public class FObj extends FONode implements Constants {
         return markers;
     }
 
-    /**
-     * Return a LayoutManager responsible for laying out this FObj's content.
-     * Must override in subclasses if their content can be laid out.
-     * @param list the list to which the layout manager(s) should be added
-     */
-    public void addLayoutManager(List list) {
-    }
-
     /*
      * Return a string representation of the fo element.
      * Deactivated in order to see precise ID of each fo element created

diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java
index 210397adef8420a4eb059d8faaa64ebc1a21155d..5c72cbc6bdada1378691012fe3c853acef582dab 100644 (file)
--- a/src/java/org/apache/fop/fo/FObjMixed.java
+++ b/src/java/org/apache/fop/fo/FObjMixed.java
@@ -69,7 +69,7 @@ public class FObjMixed extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {    
         if (getChildNodes() != null) {

diff --git a/src/java/org/apache/fop/fo/flow/BasicLink.java b/src/java/org/apache/fop/fo/flow/BasicLink.java
index 74d8624f1c877d85a5381d546bd73be60da35a5b..101d0ccfa9174ba826837469b448b8acda8fe290 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/BasicLink.java
+++ b/src/java/org/apache/fop/fo/flow/BasicLink.java
@@ -106,7 +106,7 @@ public class BasicLink extends Inline {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {    
         BasicLinkLayoutManager lm = new BasicLinkLayoutManager(this);

diff --git a/src/java/org/apache/fop/fo/flow/BidiOverride.java b/src/java/org/apache/fop/fo/flow/BidiOverride.java
index 0bb664e63ba1484b15f998b9aa8cdd513bd6382e..73f8118e780bdf5ef16e49e5f9abfcf2d406a97b 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/BidiOverride.java
+++ b/src/java/org/apache/fop/fo/flow/BidiOverride.java
@@ -109,7 +109,7 @@ public class BidiOverride extends FObjMixed {
     }
     
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      * @todo see if can/should move the child iteration logic 
      *      to BidiLayoutManager
      */

diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java
index 29b3bf1e51367254e51244655d7eb609a45f3379..203a916e78b1f541a98be41ea4b6e57cdc97a440 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Block.java
+++ b/src/java/org/apache/fop/fo/flow/Block.java
@@ -342,7 +342,7 @@ public class Block extends FObjMixed {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {    
         BlockLayoutManager blm = new BlockLayoutManager(this);

diff --git a/src/java/org/apache/fop/fo/flow/BlockContainer.java b/src/java/org/apache/fop/fo/flow/BlockContainer.java
index 11e530e20b6350a5dece5be307ee9fcc8752b70c..af9079c23f039e76febd59b63f68d633f09f62dc 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/BlockContainer.java
+++ b/src/java/org/apache/fop/fo/flow/BlockContainer.java
@@ -91,7 +91,7 @@ public class BlockContainer extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {    
         BlockContainerLayoutManager blm = new BlockContainerLayoutManager(this);

diff --git a/src/java/org/apache/fop/fo/flow/Character.java b/src/java/org/apache/fop/fo/flow/Character.java
index 19fc2f62c0f76bbf36297621b114300bbdd3b840..f1b185826aededb0719dfbb88c91305d712fe44b 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Character.java
+++ b/src/java/org/apache/fop/fo/flow/Character.java
@@ -89,7 +89,7 @@ public class Character extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         String str = getPropString(PR_CHARACTER);

diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
index 0bb8bd5cbad4651b713019f2206357df27de5b6e..241d5ebaeb1c40782f30dcbb4e1c71abcad2f31c 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
+++ b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
@@ -66,7 +66,7 @@ public class ExternalGraphic extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         if (getPropString(PR_SRC) != null) {

diff --git a/src/java/org/apache/fop/fo/flow/Footnote.java b/src/java/org/apache/fop/fo/flow/Footnote.java
index 2d2940c3055a5e1bae1b7e38644ef5fb6d0253ba..f44c2950a150ae5555bcf6a7ac5020e8c9d2e23c 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Footnote.java
+++ b/src/java/org/apache/fop/fo/flow/Footnote.java
@@ -112,7 +112,7 @@ public class Footnote extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         if (getInlineFO() == null) {

diff --git a/src/java/org/apache/fop/fo/flow/InlineContainer.java b/src/java/org/apache/fop/fo/flow/InlineContainer.java
index 76fa472a0518d7e23879441f404b040662751aaf..4d375827a278305b2f52393cbe80851c9ff2bd73 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/InlineContainer.java
+++ b/src/java/org/apache/fop/fo/flow/InlineContainer.java
@@ -53,7 +53,7 @@ public class InlineContainer extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         ArrayList childList = new ArrayList();

diff --git a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
index 9de8bf20bbebddca56a9949cbaccadefb7bc43a3..952afe133239d920ee5bc9a5a5862a0ffe1fe46b 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
+++ b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
@@ -109,7 +109,7 @@ public class InstreamForeignObject extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         InstreamForeignObjectLM lm = new InstreamForeignObjectLM(this);

diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java
index 91fafb0b33bedb9becf6f36dd95478a9e14ac319..b18d2e17d3a9d6b812cef64dc99b65f1a96f4a5c 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Leader.java
+++ b/src/java/org/apache/fop/fo/flow/Leader.java
@@ -125,7 +125,7 @@ public class Leader extends FObjMixed {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         setup();

diff --git a/src/java/org/apache/fop/fo/flow/ListBlock.java b/src/java/org/apache/fop/fo/flow/ListBlock.java
index 315e1cf39d6bddcc0be6416c2c702020a02b936b..952e9d044ef0d0eaf6d784ed69c510604ab464ae 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/ListBlock.java
+++ b/src/java/org/apache/fop/fo/flow/ListBlock.java
@@ -84,7 +84,7 @@ public class ListBlock extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         ListBlockLayoutManager lm = new ListBlockLayoutManager(this);

diff --git a/src/java/org/apache/fop/fo/flow/ListItem.java b/src/java/org/apache/fop/fo/flow/ListItem.java
index abd218d5e28d75ee4609542684aeac8e483e9112..3a46abe35ef7dfcac41f905a30f0160e6c631422 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/ListItem.java
+++ b/src/java/org/apache/fop/fo/flow/ListItem.java
@@ -109,7 +109,7 @@ public class ListItem extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         ListItemLayoutManager blm = new ListItemLayoutManager(this);

diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java
index 4fa497b1c333cf5c0da85d86def8daebaf0561c9..022d8dcf224da297304bac07e0592636515f9dac 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/PageNumber.java
+++ b/src/java/org/apache/fop/fo/flow/PageNumber.java
@@ -91,7 +91,7 @@ public class PageNumber extends FObj {
     }
     
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         PageNumberLayoutManager lm = new PageNumberLayoutManager(this);

diff --git a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
index af5253b63a67c527597448aee72c7372d06ae6cd..c256cec7566d146410557596b7456ac8129052b6 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
+++ b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
@@ -67,7 +67,7 @@ public class PageNumberCitation extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         PageNumberCitationLayoutManager lm = 

diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
index e3c3221118a217ba06d7683965448bf72509bd08..c983f6b5be3c06341f688411cfae46b21d6fb4bd 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
+++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
@@ -84,7 +84,7 @@ public class RetrieveMarker extends FObjMixed {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         RetrieveMarkerLayoutManager lm = new RetrieveMarkerLayoutManager(this);

diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java
index e3e830f04159398eb6b4a2598d18a7cb8f37d755..2ccc2c00c6d15cc38744c3d59ff88598c7627ad1 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Table.java
+++ b/src/java/org/apache/fop/fo/flow/Table.java
@@ -132,7 +132,7 @@ public class Table extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      * @todo see if can/should move much of this logic into TableLayoutManager
      *      and/or TableBody and TableColumn FO subclasses.
      */

diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java
index 931c161810915ff383a5ef0f414b1f220dac622e..fedd5032130aaf6dca4e65c1324ea4d462260b59 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/TableBody.java
+++ b/src/java/org/apache/fop/fo/flow/TableBody.java
@@ -65,7 +65,7 @@ public class TableBody extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         Body blm = new Body(this);

diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/TableCell.java
index 5524d9dcf4bbd044ba993198aaac6bc68c217b70..84e226f793bfa4eeaf3a84e75f2473da558eb2e5 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/TableCell.java
+++ b/src/java/org/apache/fop/fo/flow/TableCell.java
@@ -325,7 +325,7 @@ public class TableCell extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         Cell clm = new Cell(this);

diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java
index e5deda18cbaf87f2ca18402eb71f0eeebc7be959..ecae89376528bce0cd6f8aa59a2af176fd9735c7 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/TableRow.java
+++ b/src/java/org/apache/fop/fo/flow/TableRow.java
@@ -128,7 +128,7 @@ public class TableRow extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         Row rlm = new Row(this);

diff --git a/src/java/org/apache/fop/fo/flow/Wrapper.java b/src/java/org/apache/fop/fo/flow/Wrapper.java
index 5f01c7fa9ca24f84f8f3c9b5fe49dd7a886957d1..6935b79984a1444a51b822a21a90938218f62a6b 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Wrapper.java
+++ b/src/java/org/apache/fop/fo/flow/Wrapper.java
@@ -46,7 +46,7 @@ public class Wrapper extends FObjMixed {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      * @todo remove null check when vCN() & endOfNode() implemented
      */
     public void addLayoutManager(List list) {

diff --git a/src/java/org/apache/fop/fo/pagination/Flow.java b/src/java/org/apache/fop/fo/pagination/Flow.java
index defb9cb9d7219fc6e1915eec931d92ee982dd009..aa751a9a64b1c47729a47274f0e6c378569aa5a9 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/Flow.java
+++ b/src/java/org/apache/fop/fo/pagination/Flow.java
@@ -126,7 +126,7 @@ public class Flow extends FObj {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager(List)
+     * @see org.apache.fop.fo.FONode#addLayoutManager(List)
      */
     public void addLayoutManager(List list) {
         FlowLayoutManager lm = new FlowLayoutManager(this);

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index 9d04eb4a42932bf8f983bc0dcdc1f87f67c01c48..d8a624e1d502889eb1553a06b14d24b22217977d 100644 (file)
--- 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;

diff --git a/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java b/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java
index 2813faa6546ad277151ce1eaa190b8bce53092d7..28e05f3ea8dad970065d47a5fbe0cd11a1c5f439 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java
@@ -121,7 +121,8 @@ public class TextLayoutManager extends AbstractLayoutManager {
      * @param node The FOText object to be rendered
      */
     public TextLayoutManager(FOText node) {
-        super(node);
+        super();
+
         foText = node;
         textArray = new char[node.endIndex - node.startIndex];
         System.arraycopy(node.ca, node.startIndex, textArray, 0,

diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java
index 18aeee17c4f26390cef1081964152cbd5d6f175e..25044eccdd8335434324f11c50669637dce5b093 100644 (file)
--- a/src/java/org/apache/fop/render/rtf/RTFHandler.java
+++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java
@@ -30,6 +30,7 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fo.FOEventHandler;
 import org.apache.fop.fo.FObj;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.flow.BasicLink;
 import org.apache.fop.fo.flow.Block;
 import org.apache.fop.fo.flow.BlockContainer;
@@ -367,7 +368,7 @@ public class RTFHandler extends FOEventHandler {
             bDefer = false;
             
             bDeferredExecution=true;
-            recurseFObj(bl);
+            recurseFONode(bl);
             bDeferredExecution=false;
             
             //exit function, because the code has already beed executed while 
@@ -1225,115 +1226,115 @@ public class RTFHandler extends FOEventHandler {
     /**
      * Calls the appropriate event handler for the passed FObj. 
      *
-     * @param fobj FO-object whose event is to be called
+     * @param foNode FO node whose event is to be called
      * @param bStart TRUE calls the start handler, FALSE the end handler 
      */
-    private void invokeDeferredEvent(FObj fobj, boolean bStart) {
-        if (fobj instanceof Block) {
+    private void invokeDeferredEvent(FONode foNode, boolean bStart) {
+        if (foNode instanceof Block) {
             if (bStart) {
-                startBlock( (Block) fobj);
+                startBlock( (Block) foNode);
             } else {
-                endBlock( (Block) fobj);
+                endBlock( (Block) foNode);
             }
-        } else if (fobj instanceof Inline) {
+        } else if (foNode instanceof Inline) {
             if (bStart) {
-                startInline( (Inline) fobj);
+                startInline( (Inline) foNode);
             } else {
-                endInline( (Inline) fobj);
+                endInline( (Inline) foNode);
             }
-        } else if (fobj instanceof FOText) {
+        } else if (foNode instanceof FOText) {
             if (bStart) {
-                FOText text = (FOText) fobj;
+                FOText text = (FOText) foNode;
                 characters(text.ca, text.startIndex, text.endIndex);
             }
-        } else if (fobj instanceof Character) {
+        } else if (foNode instanceof Character) {
             if (bStart) {
-                Character c = (Character) fobj;
+                Character c = (Character) foNode;
                 character(c);
             }
-        } else if (fobj instanceof BasicLink) {
+        } else if (foNode instanceof BasicLink) {
             if (bStart) {
-                startLink( (BasicLink) fobj);
+                startLink( (BasicLink) foNode);
             } else {
                 endLink();
             }
-        } else if (fobj instanceof PageNumber) {
+        } else if (foNode instanceof PageNumber) {
             if (bStart) {
-                startPageNumber( (PageNumber) fobj);
+                startPageNumber( (PageNumber) foNode);
             } else {
-                endPageNumber( (PageNumber) fobj);
+                endPageNumber( (PageNumber) foNode);
             }
-        } else if (fobj instanceof Footnote) {
+        } else if (foNode instanceof Footnote) {
             if (bStart) {
-                startFootnote( (Footnote) fobj);
+                startFootnote( (Footnote) foNode);
             } else {
-                endFootnote( (Footnote) fobj);
+                endFootnote( (Footnote) foNode);
             }
-        } else if (fobj instanceof FootnoteBody) {
+        } else if (foNode instanceof FootnoteBody) {
             if (bStart) {
-                startFootnoteBody( (FootnoteBody) fobj);
+                startFootnoteBody( (FootnoteBody) foNode);
             } else {
-                endFootnoteBody( (FootnoteBody) fobj);
+                endFootnoteBody( (FootnoteBody) foNode);
             }
-        } else if (fobj instanceof ListBlock) {
+        } else if (foNode instanceof ListBlock) {
             if (bStart) {
-                startList( (ListBlock) fobj);
+                startList( (ListBlock) foNode);
             } else {
-                endList( (ListBlock) fobj);
+                endList( (ListBlock) foNode);
             }
-        } else if (fobj instanceof ListItem) {
+        } else if (foNode instanceof ListItem) {
             if (bStart) {
-                startListItem( (ListItem) fobj);
+                startListItem( (ListItem) foNode);
             } else {
-                endListItem( (ListItem) fobj);
+                endListItem( (ListItem) foNode);
             }
-        } else if (fobj instanceof ListItemLabel) {
+        } else if (foNode instanceof ListItemLabel) {
             if (bStart) {
                 startListLabel();
             } else {
                 endListLabel();
             }
-        } else if (fobj instanceof Table) {
+        } else if (foNode instanceof Table) {
             if (bStart) {
-                startTable( (Table) fobj);
+                startTable( (Table) foNode);
             } else {
-                endTable( (Table) fobj);
+                endTable( (Table) foNode);
             }
-        } else if (fobj instanceof TableColumn) {
+        } else if (foNode instanceof TableColumn) {
             if (bStart) {
-                startColumn( (TableColumn) fobj);
+                startColumn( (TableColumn) foNode);
             } else {
-                endColumn( (TableColumn) fobj);
+                endColumn( (TableColumn) foNode);
             }
-        } else if (fobj instanceof TableRow) {
+        } else if (foNode instanceof TableRow) {
             if (bStart) {
-                startRow( (TableRow) fobj);
+                startRow( (TableRow) foNode);
             } else {
-                endRow( (TableRow) fobj);
+                endRow( (TableRow) foNode);
             }
-        } else if (fobj instanceof TableCell) {
+        } else if (foNode instanceof TableCell) {
             if (bStart) {
-                startCell( (TableCell) fobj);
+                startCell( (TableCell) foNode);
             } else {
-                endCell( (TableCell) fobj);
+                endCell( (TableCell) foNode);
             }
         }
     }
     
     /**
-     * Calls the event handlers for the passed FObj and all its elements. 
+     * Calls the event handlers for the passed FONode and all its elements. 
      *
-     * @param fobj FO-object which shall be recursed
+     * @param foNode FONode object which shall be recursed
      */
-    private void recurseFObj(FObj fobj) {
-        invokeDeferredEvent(fobj, true);
+    private void recurseFONode(FONode foNode) {
+        invokeDeferredEvent(foNode, true);
         
-        if (fobj.childNodes != null) {
-            for(Iterator it=fobj.childNodes.iterator();it.hasNext();) {
-                recurseFObj( (FObj) it.next() );
+        if (foNode.getChildNodes() != null) {
+            for(Iterator it = foNode.getChildNodes(); it.hasNext() ; ) {
+                recurseFONode( (FONode) it.next() );
             }
         }
         
-        invokeDeferredEvent(fobj, false);
+        invokeDeferredEvent(foNode, false);
     }
 }