pbwest 2002/11/11 08:52:47
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropertyConsts.java
Log:
Removed redundant setupProperty() call.
Added FONode argument to getMappedNumeric() function.
Added FONode argument to getMappedLength() calls.
Revision Changes Path
No revision
No revision
1.1.2.17 +8 -8 xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java
Index: PropertyConsts.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- PropertyConsts.java 21 Oct 2002 16:02:25 -0000 1.1.2.16
+++ PropertyConsts.java 11 Nov 2002 16:52:46 -0000 1.1.2.17
@@ -210,9 +210,8 @@
{
if (initialValues[propindex] != null)
return initialValues[propindex];
- Property property = setupProperty(propindex);
- //System.out.println("PropertyConts.getInitialValue(" + propindex
- //+ ") " + property.getClass().getName());
+ System.out.println("PropertyConts.getInitialValue(" + propindex
+ + ") " + PropNames.getPropertyName(propindex));
return
(initialValues[propindex] =
setupProperty(propindex).getInitialValue(propindex));
@@ -256,17 +255,18 @@
/**
* Get the <tt>Numeric</tt> value corresponding to an enumerated value.
+ * @param foNode the <tt>FONode</tt> being built
* @param propindex int index of the FO property
* @param enum - the integer equivalent of the enumeration keyword.
* @return the <tt>Numeric</tt> result.
* @throws PropertyException.
*/
- public Numeric getMappedNumeric(int propindex, int enum)
+ public Numeric getMappedNumeric(FONode foNode, int propindex, int enum)
throws PropertyException
{
Property property = setupProperty(propindex);
if ((datatypes[propindex] & Property.MAPPED_LENGTH) != 0)
- return property.getMappedLength(enum);
+ return property.getMappedLength(foNode, enum);
else
throw new PropertyException
("MAPPED_LENGTH not valid in "
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
