1. Moved static element and property structures from PropertyList (previously in former PropertyListBuilder) to FObj

2. Renamed FObj "properties" instance variable to "propertyList" (reduces
confusion on the type of object holding FO property information in the code)

3. Unneeded imports removed (Finn Bock's patch, Bug #25582).


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

2 files changed, 2 insertions, 2 deletions

diff --git a/src/java/org/apache/fop/fo/expr/BodyStartFunction.java b/src/java/org/apache/fop/fo/expr/BodyStartFunction.java
index c6cada8ae..989211458 100644
--- a/src/java/org/apache/fop/fo/expr/BodyStartFunction.java
+++ b/src/java/org/apache/fop/fo/expr/BodyStartFunction.java
@@ -88,7 +88,7 @@ public class BodyStartFunction extends FunctionBase {
         }
 
         Numeric startIndent =
-            ((ListItem)item).properties.get("start-indent").getNumeric();
+            ((ListItem)item).propertyList.get("start-indent").getNumeric();
 
         return new NumericProperty(distance.add(startIndent));
     }
diff --git a/src/java/org/apache/fop/fo/expr/LabelEndFunction.java b/src/java/org/apache/fop/fo/expr/LabelEndFunction.java
index ba129c1ba..7856d05f7 100644
--- a/src/java/org/apache/fop/fo/expr/LabelEndFunction.java
+++ b/src/java/org/apache/fop/fo/expr/LabelEndFunction.java
@@ -95,7 +95,7 @@ public class LabelEndFunction extends FunctionBase {
         if (item == null) {
             throw new PropertyException("label-end() called from outside an fo:list-item");
         }
-        Length startIndent = ((ListItem)item).properties.get("start-indent").getLength();
+        Length startIndent = ((ListItem)item).propertyList.get("start-indent").getLength();
 
         LinearCombinationLength labelEnd = new LinearCombinationLength();