pbwest 2002/12/01 06:56:26
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FoRoot.java
Log:
Added pool operations to XML event handling.
Revision Changes Path
No revision
No revision
1.1.2.19 +12 -9 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.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- FoRoot.java 29 Nov 2002 16:02:58 -0000 1.1.2.18
+++ FoRoot.java 1 Dec 2002 14:56:26 -0000 1.1.2.19
@@ -134,8 +134,7 @@
new FoLayoutMasterSet(getFOTree(), this, ev);
// Clean up the fo:layout-master-set event
pageSequenceMasters = layoutMasters.getPageSequenceMasters();
- xmlevents.getEndElement(ev);
- //System.out.println("Surrendering layout-master-set ev");
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
pool.surrenderEvent(ev);
layoutMasters.deleteSubTree();
@@ -147,8 +146,7 @@
// process the declarations
declarations = numChildren();
new FoDeclarations(getFOTree(), this, ev);
- xmlevents.getEndElement(ev);
- //System.out.println("Surrendering declarations ev");
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
pool.surrenderEvent(ev);
}
@@ -161,13 +159,14 @@
throw new FOPException("No page-sequence found.");
firstPageSeq = numChildren();
new FoPageSequence(getFOTree(), this, ev);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+ pool.surrenderEvent(ev);
while ((ev = xmlevents.expectStartElement
(FObjectNames.PAGE_SEQUENCE, XMLEvent.DISCARD_W_SPACE))
!= null) {
// Loop over remaining fo:page-sequences
new FoPageSequence(getFOTree(), this, ev);
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
pool.surrenderEvent(ev);
}
} catch (NoSuchElementException e) {
@@ -180,5 +179,9 @@
}
// Clean up root's FO tree build environment
makeSparsePropsSet();
+ // Provide some stats
+ System.out.println("Size of event pool: " + pool.getPoolSize());
+ System.out.println("Next event id : " +
+ xmlevents.getNamespaces().getSequence());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
