gmazza 2004/01/07 14:50:51
Modified: src/java/org/apache/fop/fo Property.java PropertyList.java
Log:
More String->int conversion.
Revision Changes Path
1.13 +7 -5 xml-fop/src/java/org/apache/fop/fo/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Property.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Property.java 7 Jan 2004 22:25:43 -0000 1.12
+++ Property.java 7 Jan 2004 22:50:51 -0000 1.13
@@ -174,7 +174,8 @@
* 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 @@
* 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 "
1.23 +2 -1 xml-fop/src/java/org/apache/fop/fo/PropertyList.java
Index: PropertyList.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyList.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- PropertyList.java 7 Jan 2004 21:10:38 -0000 1.22
+++ PropertyList.java 7 Jan 2004 22:50:51 -0000 1.23
@@ -500,7 +500,8 @@
} 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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
