1. Remove fo/FOTreeExternal and layoutmgr/LMFOTreeExternal (in favor of Visitor concept, see item 2)

2. Add fo/FOTreeVisitor and layoutmgr/AddLMVisitor
3. Remove all occurrences of addLayoutManager in fo/FObj subclasses, replacing them with equivalent methods in AddLMVisitor


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

1 files changed, 6 insertions, 13 deletions

diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java
index ad7872dcb..7019889e6 100644
--- a/src/java/org/apache/fop/fo/flow/Block.java
+++ b/src/java/org/apache/fop/fo/flow/Block.java
@@ -65,6 +65,7 @@ import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.RecursiveCharIterator;
 import org.apache.fop.fo.TextInfo;
+import org.apache.fop.fo.FOTreeVisitor;
 import org.apache.fop.fo.properties.Constants;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
@@ -244,18 +245,6 @@ public class Block extends FObjMixed {
     }
 
     /**
-     * @see org.apache.fop.fo.FObj#addLayoutManager
-     */
-    public void addLayoutManager(List list) {
-        BlockLayoutManager blm = new BlockLayoutManager();
-        blm.setUserAgent(getUserAgent());
-        blm.setFObj(this);
-        TextInfo ti = propMgr.getTextLayoutProps(fontInfo);
-        blm.setBlockTextInfo(ti);
-        list.add(blm);
-    }
-
-    /**
      * @return false (Block cannot generate inline areas)
      */
     public boolean generatesInlineAreas() {
@@ -408,5 +397,9 @@ public class Block extends FObjMixed {
             bNextIsLF = false;
         }
     }
-}
 
+    public void acceptVisitor(FOTreeVisitor fotv) {
+        fotv.serveVisitor(this);
+    }
+
+}