More String->int conversion.

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

diff --git a/src/java/org/apache/fop/fo/Property.java b/src/java/org/apache/fop/fo/Property.java
index 6559ffe6d7cd85104cf4ea486212384c21ecd648..11c12205a15bf4904cab7167d5237846d0f6b260 100644 (file)
--- a/src/java/org/apache/fop/fo/Property.java
+++ b/src/java/org/apache/fop/fo/Property.java
@@ -174,7 +174,8 @@ public class Property {
          * value is already partially initialized, this method will modify it.
          * @param baseProp The Property object representing the compound property,
          * for example: SpaceProperty.
-         * @param partName The name of the component whose value is specified.
+         * @param subpropId The Constants ID of the subproperty (component)
+         *        whose value is specified.
          * @param propertyList The propertyList being built.
          * @param fo The FO whose properties are being set.
          * @param value the value of the
@@ -182,18 +183,19 @@ public class Property {
          * the new subproperty added
          * @throws FOPException for invalid or inconsistent FO input
          */
-        public Property make(Property baseProp, String partName,
+        public Property make(Property baseProp, int subpropId,
                              PropertyList propertyList, String value,
                              FObj fo) throws FOPException {
             if (baseProp == null) {
                 baseProp = makeCompound(propertyList, fo);
             }
-            int partId = FOPropertyMapping.getSubPropertyId(partName);
-            Maker spMaker = getSubpropMaker(partId);
+
+            Maker spMaker = getSubpropMaker(subpropId);
+
             if (spMaker != null) {
                 Property p = spMaker.make(propertyList, value, fo);
                 if (p != null) {
-                    return setSubprop(baseProp, partId, p);
+                    return setSubprop(baseProp, subpropId, p);
                 }
             } else {
                 //getLogger().error("compound property component "

diff --git a/src/java/org/apache/fop/fo/PropertyList.java b/src/java/org/apache/fop/fo/PropertyList.java
index 8c69f0e880bef3fb9f7adc17437ee44f7b281dbb..0bfbf69eaa0ea68171bc63d57b704f51c8ae6d5e 100644 (file)
--- a/src/java/org/apache/fop/fo/PropertyList.java
+++ b/src/java/org/apache/fop/fo/PropertyList.java
@@ -500,7 +500,8 @@ public class PropertyList extends HashMap {
             } else { // e.g. "leader-length.maximum"
                 Property baseProperty = findBaseProperty(attributes,
                         parentFO, basePropertyName, propertyMaker);
-                prop = propertyMaker.make(baseProperty, subPropertyName,
+                int subpropId = FOPropertyMapping.getSubPropertyId(subPropertyName);
+                prop = propertyMaker.make(baseProperty, subpropId,
                         this, attributeValue, parentFO);
             }
             if (prop != null) {