pbwest 2002/10/18 20:31:06
Modified: src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
Numeric.java
Log:
PropertyConsts now instantiated.
PropertyConsts data is accessed through a singleton object.
getPropertyIndex() moved to PropNames.
Properties split into properties.Property and properties.<property>.
Revision Changes Path
No revision
No revision
1.1.2.10 +9 -9 xml-fop/src/org/apache/fop/datatypes/Attic/Numeric.java
Index: Numeric.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Numeric.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- Numeric.java 19 Oct 2002 02:04:19 -0000 1.1.2.9
+++ Numeric.java 19 Oct 2002 03:31:06 -0000 1.1.2.10
@@ -16,7 +16,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.*;
import org.apache.fop.datatypes.PropertyValue;
@@ -196,7 +196,7 @@
int power, int unit)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName),
+ this(PropNames.getPropertyIndex(propertyName),
value, baseunit, power, unit);
}
@@ -209,7 +209,7 @@
public Numeric(String propertyName, double value)
throws PropertyException
{
- this(PropertyConsts.getPropertyIndex(propertyName), value);
+ this(PropNames.getPropertyIndex(propertyName), value);
}
/**
@@ -321,17 +321,17 @@
throw new PropertyException
("Attempt to validate Numeric with unit power of "
+ power);
- super.validate(Properties.NUMBER);
+ super.validate(Property.NUMBER);
break;
case PERCENTAGE:
if (power != 0)
throw new PropertyException
("Attempt to validate Percentage with unit power of "
+ power);
- super.validate(Properties.PERCENTAGE);
+ super.validate(Property.PERCENTAGE);
break;
case MILLIPOINTS:
- super.validate(Properties.LENGTH);
+ super.validate(Property.LENGTH);
if (power != 1)
throw new PropertyException
("Length with unit power " + power);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
