Removed getPropertyList() method from PropertyManager, as that method

is already available on the FObj (which owns both the PropertyList and the
PropertyManager.)

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

diff --git a/src/java/org/apache/fop/fo/PropertyManager.java b/src/java/org/apache/fop/fo/PropertyManager.java
index a5b1e83332e02cdbed264c95328a060318af5604..d84564d46f8201bb4521b695c085f7a9f2358844 100644 (file)
--- a/src/java/org/apache/fop/fo/PropertyManager.java
+++ b/src/java/org/apache/fop/fo/PropertyManager.java
@@ -69,14 +69,6 @@ public class PropertyManager implements Constants {
         propertyList = propList;
     }
 
-    /**
-     * Returns the property list that is used for lookup.
-     * @return the property list
-     */
-    public PropertyList getPropertyList() {
-        return propertyList;
-    }
-
     /**
      * Sets the Document object telling the property manager which fonts are
      * available.

diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
index 0bfae0d3e04219cb47779d9cbc66daeffb45fc67..d3d42ac0195ea442b9c283c6d42101a39e7737c3 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -85,9 +85,9 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager {
         
         marginProps = propManager.getMarginProps();
         borderProps = propManager.getBorderAndPadding();
-        height = propManager.getPropertyList().get(
+        height = fobj.getPropertyList().get(
             PR_BLOCK_PROGRESSION_DIMENSION | CP_OPTIMUM).getLength();
-        width = propManager.getPropertyList().get(
+        width = fobj.getPropertyList().get(
             PR_INLINE_PROGRESSION_DIMENSION | CP_OPTIMUM).getLength();
     }