pbwest 2002/10/18 20:28:52
Modified: src/org/apache/fop/datatypes/indirect Tag:
FOP_0-20-0_Alt-Design FromNearestSpecified.java
FromParent.java IndirectValue.java
InheritedValue.java Inherit.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.4 +5 -5
xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromNearestSpecified.java
Index: FromNearestSpecified.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromNearestSpecified.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FromNearestSpecified.java 3 Oct 2002 12:10:17 -0000 1.1.2.3
+++ FromNearestSpecified.java 19 Oct 2002 03:28:52 -0000 1.1.2.4
@@ -3,7 +3,7 @@
import org.apache.fop.datatypes.indirect.IndirectValue;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.Property;
import org.apache.fop.fo.FONode;
/*
@@ -100,7 +100,7 @@
* property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.SHORTHAND);
+ super.validate(Property.SHORTHAND);
}
}
1.1.2.3 +5 -5
xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromParent.java
Index: FromParent.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromParent.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FromParent.java 18 Sep 2002 15:31:14 -0000 1.1.2.2
+++ FromParent.java 19 Oct 2002 03:28:52 -0000 1.1.2.3
@@ -3,7 +3,7 @@
import org.apache.fop.datatypes.indirect.IndirectValue;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.Property;
/*
* $Id$
@@ -79,7 +79,7 @@
* validate the <i>FromParent</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(Properties.SHORTHAND);
+ super.validate(Property.SHORTHAND);
}
}
1.1.2.5 +6 -6
xml-fop/src/org/apache/fop/datatypes/indirect/Attic/IndirectValue.java
Index: IndirectValue.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/IndirectValue.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- IndirectValue.java 5 Oct 2002 02:40:31 -0000 1.1.2.4
+++ IndirectValue.java 19 Oct 2002 03:28:52 -0000 1.1.2.5
@@ -4,8 +4,8 @@
import org.apache.fop.datatypes.AbstractPropertyValue;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.Properties;
-import org.apache.fop.fo.PropertyConsts;
+import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.FONode;
/*
@@ -92,7 +92,7 @@
throws PropertyException
{
super(propertyName, type);
- sourceProperty = PropertyConsts.getPropertyIndex(sourcePropertyName);
+ sourceProperty = PropNames.getPropertyIndex(sourcePropertyName);
}
/**
1.1.2.5 +9 -9
xml-fop/src/org/apache/fop/datatypes/indirect/Attic/InheritedValue.java
Index: InheritedValue.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/InheritedValue.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- InheritedValue.java 5 Oct 2002 02:42:21 -0000 1.1.2.4
+++ InheritedValue.java 19 Oct 2002 03:28:52 -0000 1.1.2.5
@@ -2,7 +2,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.Property;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.datatypes.indirect.IndirectValue;
@@ -50,7 +50,7 @@
throws PropertyException
{
super(property, PropertyValue.INHERIT, sourceProperty);
- if (PropertyConsts.nonInheritedProps.get(sourceProperty))
+ if ( ! propertyConsts.isInherited(sourceProperty))
throw new PropertyException
("Non-inherited property "
+ PropNames.getPropertyName(sourceProperty));
@@ -78,8 +78,8 @@
throws PropertyException
{
super(propertyName, PropertyValue.INHERIT, sourcePropertyName);
- if (PropertyConsts.nonInheritedProps.get(
- PropertyConsts.getPropertyIndex(sourcePropertyName)))
+ if ( ! propertyConsts.isInherited(
+ PropNames.getPropertyIndex(sourcePropertyName)))
throw new PropertyException
("Non-inherited property " + sourcePropertyName);
}
@@ -105,7 +105,7 @@
String propStr = "Unknown";
String spropStr = "Unknown";
// Property must be inheritable
- if (PropertyConsts.inheritance(sourceProperty) == Properties.NO) {
+ if (! propertyConsts.isInherited(sourceProperty)) {
try {
propStr = PropNames.getPropertyName(property);
spropStr = PropNames.getPropertyName(sourceProperty);
@@ -121,7 +121,7 @@
* validate the <i>InheritedValue</i> against the <i>source</i> property.
*/
public void validate() throws PropertyException {
- validate(Properties.ANY_TYPE);
+ validate(Property.ANY_TYPE);
}
}
1.1.2.4 +5 -5 xml-fop/src/org/apache/fop/datatypes/indirect/Attic/Inherit.java
Index: Inherit.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/Inherit.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Inherit.java 3 Oct 2002 12:02:25 -0000 1.1.2.3
+++ Inherit.java 19 Oct 2002 03:28:52 -0000 1.1.2.4
@@ -2,7 +2,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.Property;
import org.apache.fop.fo.FONode;
import org.apache.fop.datatypes.indirect.IndirectValue;
@@ -85,7 +85,7 @@
* validate the <i>Inherit</i> against the associated property.
*/
public void validate() throws PropertyException {
- super.validate(getSourceProperty(), Properties.INHERIT);
+ super.validate(getSourceProperty(), Property.INHERIT);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
