pbwest 2002/11/29 09:11:54
Modified: src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoSimplePageMaster.java
Log:
Added surrenderEvent() calls.
Revision Changes Path
No revision
No revision
1.1.2.17 +4 -6
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
Index: FoLayoutMasterSet.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- FoLayoutMasterSet.java 21 Nov 2002 08:11:50 -0000 1.1.2.16
+++ FoLayoutMasterSet.java 29 Nov 2002 17:11:54 -0000 1.1.2.17
@@ -108,9 +108,6 @@
setupPageMasters(event);
// No need to clean up the build tree, because the whole subtree
// will be deleted.
- // This is problematical: while Node is obliged to belong to a Tree,
- // any remaining references to elements of the subtree will keep the
- // whole subtree from being GCed.
makeSparsePropsSet();
}
@@ -176,6 +173,7 @@
("Aargh! expectStartElement(events, list)");
// Flush the master event
xmlevents.getEndElement(ev);
+ pool.surrenderEvent(ev);
} while (true);
} catch (NoSuchElementException e) {
// Unexpected end of file
1.1.2.15 +4 -2
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
Index: FoPageSequenceMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- FoPageSequenceMaster.java 13 Nov 2002 04:15:19 -0000 1.1.2.14
+++ FoPageSequenceMaster.java 29 Nov 2002 17:11:54 -0000 1.1.2.15
@@ -215,6 +215,7 @@
throw new FOPException
("Aargh! expectStartElement(events, list)");
xmlevents.getEndElement(ev);
+ pool.surrenderEvent(ev);
} while (true);
} catch (NoSuchElementException e) {
throw new FOPException("Unexpected EOF in page-sequence-master.");
@@ -304,6 +305,7 @@
// ("Found conditional-page-master-reference");
new FoConditionalPageMasterReference(foTree, this, ev);
this.xmlevents.getEndElement(ev);
+ this.pool.surrenderEvent(ev);
} while (true);
} catch (NoSuchElementException e) {
// End of file reached
1.1.2.12 +7 -2
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
Index: FoSimplePageMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoSimplePageMaster.java 13 Nov 2002 04:15:19 -0000 1.1.2.11
+++ FoSimplePageMaster.java 29 Nov 2002 17:11:54 -0000 1.1.2.12
@@ -104,6 +104,7 @@
// Process region-body
regionBody = new FoRegionBody(foTree, this, regionEv);
xmlevents.getEndElement(regionEv);
+ pool.surrenderEvent(regionEv);
// Remaining regions are optional
if ((regionEv = xmlevents.expectStartElement
@@ -112,6 +113,7 @@
{
regionBefore = new FoRegionBefore(foTree, this, regionEv);
xmlevents.getEndElement(regionEv);
+ pool.surrenderEvent(regionEv);
}
if ((regionEv = xmlevents.expectStartElement
@@ -120,6 +122,7 @@
{
regionAfter = new FoRegionAfter(foTree, this, regionEv);
xmlevents.getEndElement(regionEv);
+ pool.surrenderEvent(regionEv);
}
if ((regionEv = xmlevents.expectStartElement
@@ -128,6 +131,7 @@
{
regionStart = new FoRegionStart(foTree, this, regionEv);
xmlevents.getEndElement(regionEv);
+ pool.surrenderEvent(regionEv);
}
if ((regionEv = xmlevents.expectStartElement
@@ -136,6 +140,7 @@
{
regionEnd = new FoRegionEnd(foTree, this, regionEv);
xmlevents.getEndElement(regionEv);
+ pool.surrenderEvent(regionEv);
}
// Clean up the build environment
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
