pbwest 2002/12/01 06:44:55
Modified: src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoSimplePageMaster.java
Log:
Used pool.surrenderEvent().
Revision Changes Path
No revision
No revision
1.1.2.18 +4 -4
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.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- FoLayoutMasterSet.java 29 Nov 2002 17:11:54 -0000 1.1.2.17
+++ FoLayoutMasterSet.java 1 Dec 2002 14:44:55 -0000 1.1.2.18
@@ -172,7 +172,7 @@
throw new FOPException
("Aargh! expectStartElement(events, list)");
// Flush the master event
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
pool.surrenderEvent(ev);
} while (true);
} catch (NoSuchElementException e) {
1.1.2.16 +5 -4
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.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- FoPageSequenceMaster.java 29 Nov 2002 17:11:54 -0000 1.1.2.15
+++ FoPageSequenceMaster.java 1 Dec 2002 14:44:55 -0000 1.1.2.16
@@ -214,7 +214,7 @@
} else
throw new FOPException
("Aargh! expectStartElement(events, list)");
- xmlevents.getEndElement(ev);
+ ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
pool.surrenderEvent(ev);
} while (true);
} catch (NoSuchElementException e) {
@@ -304,7 +304,8 @@
//System.out.println
// ("Found conditional-page-master-reference");
new FoConditionalPageMasterReference(foTree, this, ev);
- this.xmlevents.getEndElement(ev);
+ ev = this.xmlevents.getEndElement
+ (this.xmlevents.DISCARD_EV, ev);
this.pool.surrenderEvent(ev);
} while (true);
} catch (NoSuchElementException e) {
1.1.2.13 +11 -7
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.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoSimplePageMaster.java 29 Nov 2002 17:11:54 -0000 1.1.2.12
+++ FoSimplePageMaster.java 1 Dec 2002 14:44:55 -0000 1.1.2.13
@@ -103,7 +103,7 @@
+ getMasterName());
// Process region-body
regionBody = new FoRegionBody(foTree, this, regionEv);
- xmlevents.getEndElement(regionEv);
+ regionEv = xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
pool.surrenderEvent(regionEv);
// Remaining regions are optional
@@ -112,7 +112,8 @@
!= null)
{
regionBefore = new FoRegionBefore(foTree, this, regionEv);
- xmlevents.getEndElement(regionEv);
+ regionEv =
+ xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
pool.surrenderEvent(regionEv);
}
@@ -121,7 +122,8 @@
!= null)
{
regionAfter = new FoRegionAfter(foTree, this, regionEv);
- xmlevents.getEndElement(regionEv);
+ regionEv =
+ xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
pool.surrenderEvent(regionEv);
}
@@ -130,7 +132,8 @@
!= null)
{
regionStart = new FoRegionStart(foTree, this, regionEv);
- xmlevents.getEndElement(regionEv);
+ regionEv =
+ xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
pool.surrenderEvent(regionEv);
}
@@ -139,7 +142,8 @@
!= null)
{
regionEnd = new FoRegionEnd(foTree, this, regionEv);
- xmlevents.getEndElement(regionEv);
+ regionEv =
+ xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
pool.surrenderEvent(regionEv);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
