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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/java/org/apache/fop/fo/pagination/Region.java b/src/java/org/apache/fop/fo/pagination/Region.java
index ab7c49e66..d477b220e 100644
--- a/src/java/org/apache/fop/fo/pagination/Region.java
+++ b/src/java/org/apache/fop/fo/pagination/Region.java
@@ -111,12 +111,12 @@ public abstract class Region extends FObj {
         super.handleAttrs(attlist);
 
         // regions may have name, or default
-        if (null == this.properties.get(PROP_REGION_NAME)) {
+        if (null == this.propertyList.get(PROP_REGION_NAME)) {
             setRegionName(getDefaultRegionName());
-        } else if (this.properties.get(PROP_REGION_NAME).getString().equals("")) {
+        } else if (this.propertyList.get(PROP_REGION_NAME).getString().equals("")) {
             setRegionName(getDefaultRegionName());
         } else {
-            setRegionName(this.properties.get(PROP_REGION_NAME).getString());
+            setRegionName(this.propertyList.get(PROP_REGION_NAME).getString());
             // check that name is OK. Not very pretty.
             if (isReserved(getRegionName())
                     && !getRegionName().equals(getDefaultRegionName())) {
@@ -133,11 +133,11 @@ public abstract class Region extends FObj {
                     + "of simple-page-master, not "
                     + parent.getName());
         }
-        this.wm = this.properties.get("writing-mode").getEnum();
+        this.wm = this.propertyList.get("writing-mode").getEnum();
 
-        // this.properties.get("clip");
-        // this.properties.get("display-align");
-        this.overflow = this.properties.get("overflow").getEnum();
+        // this.propertyList.get("clip");
+        // this.propertyList.get("display-align");
+        this.overflow = this.propertyList.get("overflow").getEnum();
     }
 
     public abstract Rectangle getViewportRectangle(FODimension pageRefRect);