Last of string->int conversions (more structural improvements still can be

done in PropertyList from Finn's patch, however).  Made Constants values
inherent to CompoundDatatype class.


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

2 files changed, 5 insertions, 8 deletions

diff --git a/src/java/org/apache/fop/fo/Property.java b/src/java/org/apache/fop/fo/Property.java
index 0fd2ba732..febf164a0 100644
--- a/src/java/org/apache/fop/fo/Property.java
+++ b/src/java/org/apache/fop/fo/Property.java
@@ -155,7 +155,7 @@ public class Property {
          * property.
          * @param p A property value for a compound property type such as
          * SpaceProperty.
-         * @param subprop The name of the component whose value is to be
+         * @param subprop The Constants ID of the component whose value is to be
          * returned.
          * NOTE: this is only to ease porting when calls are made to
          * PropertyList.get() using a component name of a compound property,
@@ -165,7 +165,7 @@ public class Property {
          * compound properties.
          * @return the Property containing the subproperty
          */
-        public Property getSubpropValue(Property p, String subprop) {
+        public Property getSubpropValue(Property p, int subpropId) {
             return null;
         }
 
diff --git a/src/java/org/apache/fop/fo/PropertyList.java b/src/java/org/apache/fop/fo/PropertyList.java
index cfb8396c4..8c69f0e88 100644
--- a/src/java/org/apache/fop/fo/PropertyList.java
+++ b/src/java/org/apache/fop/fo/PropertyList.java
@@ -521,8 +521,8 @@ public class PropertyList extends HashMap {
         /* If the baseProperty has already been created, return it
          * e.g. <fo:leader xxxx="120pt" xxxx.maximum="200pt"... />
          */
-        int propId = FOPropertyMapping.getPropertyId(basePropName);
-        Property baseProperty = getExplicitBaseProp(propId);
+
+        Property baseProperty = (Property) super.get(basePropName);
 
         if (baseProperty != null) {
             return baseProperty;
@@ -588,13 +588,10 @@ public class PropertyList extends HashMap {
      */
     private Property getSubpropValue(Property p, int propId) {
 
-        String subpropName = FOPropertyMapping.getPropertyName(propId &
-            Constants.COMPOUND_MASK);
-
         Property.Maker maker = findMaker(propId & Constants.PROPERTY_MASK);
 
         if (maker != null) {
-            return maker.getSubpropValue(p, subpropName);
+            return maker.getSubpropValue(p, propId & Constants.COMPOUND_MASK);
         } else {
             return null;
         }