Removed get/setUserAgent() initializations from the LayoutManagers. (Infrequently

called, and already obtainable through AbstractLayoutManager's FObj member
variable.)

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

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index e34fbc69a143fab908fd54393609fd174dfeb1f8..b4b7a08f17cb2d1f6551d17ae3e507c36e118661 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -68,7 +68,6 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
      */
     public AbstractLayoutManager(FObj fo) {
         setFObj(fo);
-        setUserAgent(fo.getUserAgent());
     }
 
     /**
@@ -101,24 +100,6 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
     protected void initProperties() {
     }
 
-    /**
-     * Set the user agent.
-     *
-     * @param ua the user agent
-     */
-    public void setUserAgent(FOUserAgent ua) {
-        userAgent = ua;
-    }
-
-    /**
-     * Get the user agent.
-     *
-     * @see org.apache.fop.layoutmgr.LayoutManager#getUserAgent()
-     */
-    public FOUserAgent getUserAgent() {
-        return userAgent;
-    }
-
     public void setParent(LayoutManager lm) {
         this.parentLM = lm;
     }
@@ -185,7 +166,6 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
         }
         while (childLMiter.hasNext()) {
             curChildLM = (LayoutManager) childLMiter.next();
-            curChildLM.setUserAgent(getUserAgent());
             curChildLM.setParent(this);
             curChildLM.initialize();
             return curChildLM;

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManager.java b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
index 54ade889a5b5dccfda088be9e22c2b4e15926740..102c89978d9799196c74f5aa0a65b2486e527252 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
@@ -42,20 +42,6 @@ public interface LayoutManager {
      */
     void setFObj(FObj obj);
 
-    /**
-     * Set the user agent. For resolving user agent values.
-     *
-     * @param ua the user agent
-     */
-    void setUserAgent(FOUserAgent ua);
-
-    /**
-     * Get the user agent.
-     *
-     * @return the user agent
-     */
-    FOUserAgent getUserAgent();
-    
     /**
      * Set the parent layout manager.
      * The parent layout manager is required for adding areas.

diff --git a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
index 34f9d18913d3fcc5bbccffee6dabd85ff6f244c5..4c4015521aacb8be65a77dcaaa402981ab2555ec 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
@@ -465,7 +465,6 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
             log.error("no region viewport: shouldn't happen");
         }
         StaticContentLayoutManager lm = getStaticContentLayoutManager(flow);
-        lm.setUserAgent(getUserAgent());
         lm.initialize();
         lm.setRegionReference(reg.getRegion());
         lm.setParent(this);
@@ -894,7 +893,6 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
             return lm;
         }
         lm = new StaticContentLayoutManager();
-        lm.setUserAgent(getUserAgent());
         lm.setFObj(sc);
         staticContentLMs.put(sc.getFlowName(), lm);
         return lm;

diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
index 8c58514bc779bec2441ed0244ffe6745ff789ea3..0af9e7b45564d64d7fe74490e37151df6766da0a 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
@@ -106,9 +106,6 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager {
         // currently active LM
         Item curLM;
 
-        label.setUserAgent(getUserAgent());
-        body.setUserAgent(getUserAgent());
-
         BreakPoss lastPos = null;
         List breakList = new ArrayList();
 

diff --git a/src/java/org/apache/fop/layoutmgr/table/Row.java b/src/java/org/apache/fop/layoutmgr/table/Row.java
index e0c9cf3fc6b1d5d7ecc190f011f6107061ce9e6f..efb3dba8006c4ed513eee6a8afe41a9d518fa751 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/Row.java
+++ b/src/java/org/apache/fop/layoutmgr/table/Row.java
@@ -94,7 +94,6 @@ public class Row extends BlockStackingLayoutManager {
         // add cells to list
         while (childLMiter.hasNext()) {
             curChildLM = (LayoutManager) childLMiter.next();
-            curChildLM.setUserAgent(getUserAgent());
             curChildLM.setParent(this);
             curChildLM.initialize();
             cellList.add(curChildLM);

diff --git a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
index c11fd90d71b2aab11199d3ce18226797cd748abc..a0e966f32385752626121ed913af42c4ee8a6996 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
@@ -162,7 +162,6 @@ public class TableLayoutManager extends BlockStackingLayoutManager {
         }
         MinOptMax headerSize = null;
         if (tableHeader != null) {
-            tableHeader.setUserAgent(getUserAgent());
             tableHeader.resetPosition(null);
             headerBreak = getHeight(tableHeader, context);
             headerSize = headerBreak.getStackingSize();
@@ -171,7 +170,6 @@ public class TableLayoutManager extends BlockStackingLayoutManager {
 
         MinOptMax footerSize = null;
         if (tableFooter != null) {
-            tableFooter.setUserAgent(getUserAgent());
             tableFooter.resetPosition(null);
             footerBreak = getHeight(tableFooter, context);
             footerSize = footerBreak.getStackingSize();