pbwest 2002/11/05 06:28:53
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
Log:
Removed event field. N.B. Important that this not be restored
without ensuring subclasses handle it correctly.
Removed foTree and parent fields. Rely on underlying tree and parent fields.
Revision Changes Path
No revision
No revision
1.19.2.22 +7 -18 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.21
retrieving revision 1.19.2.22
diff -u -r1.19.2.21 -r1.19.2.22
--- FONode.java 4 Nov 2002 14:54:56 -0000 1.19.2.21
+++ FONode.java 5 Nov 2002 14:28:53 -0000 1.19.2.22
@@ -52,12 +52,6 @@
private static final String tag = "$Name$";
private static final String revision = "$Revision$";
- /** The <tt>FOTree</tt> of which this node is a member. */
- protected FOTree foTree;
- /** The parent <tt>FONode</tt> of this node. */
- protected FONode parent;
- /** The <tt>XMLEvent</tt> which triggered this node. */
- protected FoXMLEvent event;
/** The buffer from which parser events are drawn. */
protected SyncedFoXmlEventsBuffer xmlevents;
/** The namespaces object associated with <i>xmlevents</i>. */
@@ -139,17 +133,12 @@
throws TreeException, FOPException, PropertyException
{
super(foTree, parent);
- this.foTree = foTree;
this.type = type;
- this.parent = parent;
- this.event = event;
this.attrSet = attrSet;
this.sparsePropsMap = sparsePropsMap;
this.sparseIndices = sparseIndices;
this.numProps = numProps;
attrBitSet = FOPropertySets.getAttrROBitSet(attrSet);
- //inheritedBitSet = FOPropertySets.getInheritedROBitSet(attrSet);
- //nonInheritedBitSet = FOPropertySets.getNonInheritedROBitSet(attrSet);
xmlevents = foTree.xmlevents;
namespaces = xmlevents.getNamespaces();
exprParser = foTree.exprParser;
@@ -240,7 +229,7 @@
* @return the <tt>FOTree</tt>.
*/
public FOTree getFOTree() {
- return foTree;
+ return (FOTree)tree;
}
/**
@@ -283,7 +272,7 @@
{
if (parent != null)
return IndirectValue.adjustedPropertyValue
- (parent.getNearestSpecifiedValue(sourceProperty));
+ (((FONode)parent).getNearestSpecifiedValue(sourceProperty));
else // root
return IndirectValue.adjustedPropertyValue
(PropertyConsts.pconsts.getInitialValue(sourceProperty));
@@ -312,7 +301,7 @@
return IndirectValue.adjustedPropertyValue(propertySet[property]);
if (parent != null)
return IndirectValue.adjustedPropertyValue
- (parent.getNearestSpecifiedValue(property));
+ (((FONode)parent).getNearestSpecifiedValue(property));
else // root
return IndirectValue.adjustedPropertyValue
(PropertyConsts.pconsts.getInitialValue(property));
@@ -354,7 +343,7 @@
{
if (parent != null)
return IndirectValue.adjustedPropertyValue
- (parent.getPropertyValue(sourceProperty));
+ (((FONode)parent).getPropertyValue(sourceProperty));
else // root
return IndirectValue.adjustedPropertyValue
(PropertyConsts.pconsts.getInitialValue(sourceProperty));
@@ -397,7 +386,7 @@
if (parent != null && PropertyConsts.pconsts.isInherited(property))
return (propertySet[property] =
IndirectValue.adjustedPropertyValue
- (parent.getPropertyValue(property)));
+ (((FONode)parent).getPropertyValue(property)));
else // root
return (propertySet[property] =
IndirectValue.adjustedPropertyValue
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
