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

11 files changed, 37 insertions, 37 deletions

diff --git a/src/java/org/apache/fop/fo/pagination/ColorProfile.java b/src/java/org/apache/fop/fo/pagination/ColorProfile.java
index a700bd027..6f6476933 100644
--- a/src/java/org/apache/fop/fo/pagination/ColorProfile.java
+++ b/src/java/org/apache/fop/fo/pagination/ColorProfile.java
@@ -86,10 +86,10 @@ public class ColorProfile extends FObj {
      * object.
      */
     public void end() {
-        src = this.properties.get("src").getString();
-        profileName = this.properties.get("color-profile-name").getString();
-        intent = this.properties.get("rendering-intent").getEnum();
-        this.properties = null;
+        src = this.propertyList.get("src").getString();
+        profileName = this.propertyList.get("color-profile-name").getString();
+        intent = this.propertyList.get("rendering-intent").getEnum();
+        this.propertyList = null;
     }
 
     /**
diff --git a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
index e0b69a42e..db52a0f84 100644
--- a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
+++ b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
@@ -98,9 +98,9 @@ public class ConditionalPageMasterReference extends FObj {
 
         validateParent(parent);
 
-        this.pagePosition = this.properties.get("page-position").getEnum();
-        this.oddOrEven = this.properties.get("odd-or-even").getEnum();
-        this.blankOrNotBlank = this.properties.get("blank-or-not-blank").getEnum();
+        this.pagePosition = this.propertyList.get("page-position").getEnum();
+        this.oddOrEven = this.propertyList.get("odd-or-even").getEnum();
+        this.blankOrNotBlank = this.propertyList.get("blank-or-not-blank").getEnum();
     }
 
     /**
diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java
index a0c5f017f..0192382da 100644
--- a/src/java/org/apache/fop/fo/pagination/PageSequence.java
+++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java
@@ -189,7 +189,7 @@ public class PageSequence extends FObj {
 
         // we are now on the first page of the page sequence
         thisIsFirstPage = true;
-        ipnValue = this.properties.get("initial-page-number").getString();
+        ipnValue = this.propertyList.get("initial-page-number").getString();
 
         if (ipnValue.equals("auto")) {
             pageNumberType = AUTO;
@@ -209,7 +209,7 @@ public class PageSequence extends FObj {
         }
 
 
-        String masterName = this.properties.get("master-reference").getString();
+        String masterName = this.propertyList.get("master-reference").getString();
         this.simplePageMaster =
                 this.layoutMasterSet.getSimplePageMaster(masterName);
         if (this.simplePageMaster == null) {
@@ -224,17 +224,17 @@ public class PageSequence extends FObj {
 
         // get the 'format' properties
         this.pageNumberGenerator =
-            new PageNumberGenerator(this.properties.get("format").getString(),
-                                    this.properties.get("grouping-separator").getCharacter(),
-                                    this.properties.get("grouping-size").getNumber().intValue(),
-                                    this.properties.get("letter-value").getEnum());
+            new PageNumberGenerator(this.propertyList.get("format").getString(),
+                                    this.propertyList.get("grouping-separator").getCharacter(),
+                                    this.propertyList.get("grouping-size").getNumber().intValue(),
+                                    this.propertyList.get("letter-value").getEnum());
         this.pageNumberGenerator.enableLogging(getLogger());
 
         this.forcePageCount =
-            this.properties.get("force-page-count").getEnum();
+            this.propertyList.get("force-page-count").getEnum();
 
-        // this.properties.get("country");
-        // this.properties.get("language");
+        // this.propertyList.get("country");
+        // this.propertyList.get("language");
         setupID();
 
         //call startStructuredPageSequence to ensure, that startPageSequence is called
diff --git a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
index 98d654fcf..d3f2bc5c8 100644
--- a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
+++ b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
@@ -99,7 +99,7 @@ public class PageSequenceMaster extends FObj {
 
         if (parent.getName().equals("fo:layout-master-set")) {
             this.layoutMasterSet = (LayoutMasterSet)parent;
-            String pm = this.properties.get("master-name").getString();
+            String pm = this.propertyList.get("master-name").getString();
             if (pm == null) {
                 getLogger().warn("page-sequence-master does not have "
                                        + "a master-name and so is being ignored");
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);
diff --git a/src/java/org/apache/fop/fo/pagination/RegionBA.java b/src/java/org/apache/fop/fo/pagination/RegionBA.java
index c2e236cf4..fd795cd9f 100644
--- a/src/java/org/apache/fop/fo/pagination/RegionBA.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBA.java
@@ -86,7 +86,7 @@ public abstract class RegionBA extends RegionBASE {
     public void end() {
         super.end();
         bPrecedence =
-            (this.properties.get("precedence").getEnum() == Precedence.TRUE);
+            (this.propertyList.get("precedence").getEnum() == Precedence.TRUE);
     }
 
     /**
diff --git a/src/java/org/apache/fop/fo/pagination/RegionBASE.java b/src/java/org/apache/fop/fo/pagination/RegionBASE.java
index 0fbc87b43..425df2b39 100644
--- a/src/java/org/apache/fop/fo/pagination/RegionBASE.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBASE.java
@@ -74,7 +74,7 @@ public abstract class RegionBASE extends Region {
     public void end() {
         // The problem with this is that it might not be known yet....
         // Supposing extent is calculated in terms of percentage
-        this.extent = this.properties.get("extent").getLength().getValue();
+        this.extent = this.propertyList.get("extent").getLength().getValue();
     }
 
     /**
diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java
index 2e9880ec5..0ead97981 100644
--- a/src/java/org/apache/fop/fo/pagination/RegionBody.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java
@@ -111,10 +111,10 @@ public class RegionBody extends Region {
     private int getRelMargin(int reldir, String sRelPropName) {
         FObj parent = (FObj) getParent();
         String sPropName = "margin-"
-                + parent.properties.wmRelToAbs(reldir);
-        Property prop = properties.getExplicitBaseProp(sPropName);
+                + parent.propertyList.wmRelToAbs(reldir);
+        Property prop = propertyList.getExplicitBaseProp(sPropName);
         if (prop == null) {
-            prop = properties.getExplicitBaseProp(sRelPropName);
+            prop = propertyList.getExplicitBaseProp(sRelPropName);
         }
         return ((prop != null) ? prop.getLength().getValue() : 0);
     }
diff --git a/src/java/org/apache/fop/fo/pagination/Root.java b/src/java/org/apache/fop/fo/pagination/Root.java
index 9eec1bd43..5c83fceb5 100644
--- a/src/java/org/apache/fop/fo/pagination/Root.java
+++ b/src/java/org/apache/fop/fo/pagination/Root.java
@@ -78,7 +78,7 @@ public class Root extends FObj {
      */
     public Root(FONode parent) {
         super(parent);
-        // this.properties.get("media-usage");
+        // this.propertyList.get("media-usage");
         pageSequences = new java.util.ArrayList();
         if (parent != null) {
             //throw new FOPException("root must be root element");
diff --git a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
index 29c279c23..ae16402a4 100644
--- a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
+++ b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
@@ -92,7 +92,7 @@ public class SimplePageMaster extends FObj {
 
         if (parent.getName().equals("fo:layout-master-set")) {
             LayoutMasterSet layoutMasterSet = (LayoutMasterSet)parent;
-            masterName = this.properties.get("master-name").getString();
+            masterName = this.propertyList.get("master-name").getString();
             if (masterName == null) {
                 getLogger().warn("simple-page-master does not have "
                         + "a master-name and so is being ignored");
diff --git a/src/java/org/apache/fop/fo/pagination/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java
index 059377b0d..2b7bab983 100644
--- a/src/java/org/apache/fop/fo/pagination/Title.java
+++ b/src/java/org/apache/fop/fo/pagination/Title.java
@@ -97,18 +97,18 @@ public class Title extends FObjMixed {
         CommonMarginInline mProps = propMgr.getMarginInlineProps();
 
         Property prop;
-        prop = this.properties.get("baseline-shift");
+        prop = this.propertyList.get("baseline-shift");
         if (prop instanceof LengthProperty) {
             Length bShift = prop.getLength();
         } else if (prop instanceof EnumProperty) {
             int bShift = prop.getEnum();
         }
-        ColorType col = this.properties.get("color").getColorType();
-        Length lHeight = this.properties.get("line-height").getLength();
-        int lShiftAdj = this.properties.get(
+        ColorType col = this.propertyList.get("color").getColorType();
+        Length lHeight = this.propertyList.get("line-height").getLength();
+        int lShiftAdj = this.propertyList.get(
                           "line-height-shift-adjustment").getEnum();
-        int vis = this.properties.get("visibility").getEnum();
-        Length zIndex = this.properties.get("z-index").getLength();
+        int vis = this.propertyList.get("visibility").getEnum();
+        Length zIndex = this.propertyList.get("z-index").getLength();
 
     }