pbwest 2002/11/11 17:30:04
Modified: src/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design
Property.java
Log:
FONode arg added to getMappedLength calls.
FONode arg added, FOTree arg removed from MappedNumeric constructor.
Revision Changes Path
No revision
No revision
1.1.2.4 +9 -10 xml-fop/src/org/apache/fop/fo/properties/Attic/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Property.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Property.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
+++ Property.java 12 Nov 2002 01:30:04 -0000 1.1.2.4
@@ -393,8 +393,7 @@
return new EnumType(property, ncname);
if ((dataTypes & MAPPED_LENGTH) != 0)
return (new MappedNumeric
- (property, ncname, foNode.getFOTree()))
- .getMappedNumValue();
+ (foNode, property, ncname)).getMappedNumValue();
throw new PropertyException
("NCName value invalid for " + propName);
case PropertyValue.LITERAL:
@@ -618,7 +617,7 @@
* @return a <tt>Numeric</tt>. This implementation never returns.
* @throws <tt>PropertyException</tt>.
*/
- public Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
{
throw new PropertyException
@@ -640,12 +639,13 @@
{
int initialValueType =
PropertyConsts.pconsts.getInitialValueType(property);
- //System.out.println("In Property getInitialValue property "
- //+ property);
+ System.out.println("In Property getInitialValue property "
+ + property);
if ((initialValueType & Property.USE_GET_IT_FUNCTION) != 0)
throw new PropertyException
("Property.getInitialValue() called for property with "
+ "initial value type in USE_GET_IT_FUNCTION : "
+ + property + " "
+ PropNames.getPropertyName(property));
switch (initialValueType) {
case NOTYPE_IT:
@@ -787,8 +787,7 @@
try {
widthFound =
(new MappedNumeric
- (widthProp, ncname, foNode.getFOTree()))
- .getMappedNumValue();
+ (foNode, widthProp, ncname)).getMappedNumValue();
} catch (PropertyException e) {}
if (widthFound != null) {
if (width != null) MessageHandler.log(propName +
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
