You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pb...@apache.org on 2002/09/03 05:28:42 UTC
cvs commit: xml-fop/src/org/apache/fop/fo FONode.java FoRoot.java
pbwest 2002/09/02 20:28:42
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
FoRoot.java
Log:
Added FO type field handling
Revision Changes Path
No revision
No revision
1.19.2.4 +12 -3 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.3
retrieving revision 1.19.2.4
diff -u -r1.19.2.3 -r1.19.2.4
--- FONode.java 30 Aug 2002 17:26:06 -0000 1.19.2.3
+++ FONode.java 3 Sep 2002 03:28:41 -0000 1.19.2.4
@@ -58,6 +58,8 @@
protected XMLEvent event;
/** The buffer from which parser events are drawn. */
protected SyncedCircularBuffer xmlevents;
+ /** The FO type. */
+ public final int type;
/** The node identifier obtained from <tt>foTree</tt>. */
public final int id;
/** The array of property value stacks */
@@ -68,19 +70,26 @@
public HashMap foProperties = null;
/** The property expression parser in the FOTree. */
protected PropertyParser exprParser;
+ /** Ancestor reference area of this FONode. */
+ protected FONode ancestorRefArea = null;
/**
* @param foTree an <tt>FOTree</tt> to which this node belongs
+ * @param type the fo type of this FONode.
* @param parent an <tt>FONode</tt>, the parent node of this node in
* <i>foTree</i>
* @param event the <tt>XMLEvent</tt> that triggered the creation of this
+ * @param attrSet the set of attributes relevant at this point in the
+ * tree.
* node
*/
- public FONode (FOTree foTree, FONode parent, XMLEvent event, int attrSet)
+ public FONode
+ (FOTree foTree, int type, FONode parent, XMLEvent event, int attrSet)
throws Tree.TreeException, FOPException, PropertyException
{
foTree.super(parent);
this.foTree = foTree;
+ this.type = type;
this.event = event;
xmlevents = foTree.xmlevents;
propertyStacks = foTree.propertyStacks;
1.1.2.3 +5 -4 xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java
Index: FoRoot.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoRoot.java 27 Jun 2002 12:55:18 -0000 1.1.2.2
+++ FoRoot.java 3 Sep 2002 03:28:42 -0000 1.1.2.3
@@ -12,6 +12,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.FObjectNames;
import org.apache.fop.datastructs.SyncedCircularBuffer;
import org.apache.fop.datastructs.Tree;
import org.apache.fop.fo.FOTree;
@@ -51,7 +52,7 @@
throws Tree.TreeException, FOPException, PropertyException
{
// This is the root node of the tree; hence the null argument
- super(foTree, null, event, FONode.ROOT);
+ super(foTree, FObjectNames.ROOT, null, event, FONode.ROOT);
}
/** <p>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org