start of structure handler concept and adjusted the layout

handling appropriately


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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/org/apache/fop/fo/FObj.java b/src/org/apache/fop/fo/FObj.java
index 6e4219223..7be9fb522 100644
--- a/src/org/apache/fop/fo/FObj.java
+++ b/src/org/apache/fop/fo/FObj.java
@@ -11,7 +11,7 @@ package org.apache.fop.fo;
 import org.apache.fop.layout.Area;
 import org.apache.fop.layout.AreaClass;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.StreamRenderer;
+import org.apache.fop.apps.StructureHandler;
 import org.apache.fop.layoutmgr.LayoutManager;
 import org.apache.fop.fo.properties.FOPropertyMapping;
 import org.apache.fop.layout.Area;
@@ -34,7 +34,7 @@ import java.util.HashSet;
  * base class for representation of formatting objects and their processing
  */
 public class FObj extends FONode {
-    protected StreamRenderer streamRenderer;
+    protected StructureHandler structHandler;
     public PropertyList properties;
     protected PropertyManager propMgr;
     protected String areaClass = AreaClass.UNASSIGNED;
@@ -135,8 +135,8 @@ public class FObj extends FONode {
         children.add(child);
     }
 
-    public void setStreamRenderer(StreamRenderer st) {
-        streamRenderer = st;
+    public void setStructHandler(StructureHandler st) {
+        structHandler = st;
     }
 
     /**
@@ -154,7 +154,7 @@ public class FObj extends FONode {
         if(prop != null) {
             String str = prop.getString();
             if(str != null && !str.equals("")) {
-                HashSet idrefs = streamRenderer.getIDReferences();
+                HashSet idrefs = structHandler.getIDReferences();
                 if(!idrefs.contains(str)) {
                     id = str;
                     idrefs.add(id);