pbwest 2004/01/14 07:19:25
Modified: src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FoRoot.java
Log:
SyncedFoXmlEventsBuffer renamed to SyncedXmlEventsBuffer
Some instances of FoXMLEvent changed to XMLEvent
Changes to signatures of FO constructors reflected here
Revision Changes Path
No revision
No revision
1.1.2.3 +14 -14 xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java
Index: FoRoot.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/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 10 Jan 2004 06:29:50 -0000 1.1.2.2
+++ FoRoot.java 14 Jan 2004 15:19:25 -0000 1.1.2.3
@@ -66,7 +66,7 @@
import org.apache.fop.fo.flow.FoPageSequence;
import org.apache.fop.fo.pagination.FoLayoutMasterSet;
import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.xml.XMLNamespaces;
@@ -125,11 +125,11 @@
/**
* @param foTree the FO tree being built
- * @param event the <tt>FoXMLEvent</tt> that triggered the creation of this
+ * @param event the <tt>XMLEvent</tt> that triggered the creation of this
* node
*/
public FoRoot
- (FOTree foTree, FoXMLEvent event)
+ (FOTree foTree, XMLEvent event)
throws TreeException, FOPException, PropertyException
{
// This is the root node of the tree; hence the null argument
@@ -162,7 +162,7 @@
* in the page-sequence-sequence.
*/
public void buildFoTree() throws FOPException{
- FoXMLEvent ev;
+ XMLEvent ev;
String nowProcessing;
//System.out.println("buildFoTree: " + event);
nowProcessing = "layout-master-set";
@@ -175,7 +175,7 @@
new FoLayoutMasterSet(getFOTree(), this, ev);
// Clean up the fo:layout-master-set event
pageSequenceMasters = layoutMasters.getPageSequenceMasters();
- ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
+ ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
layoutMasters.deleteSubTree();
@@ -187,7 +187,7 @@
// process the declarations
declarations = numChildren();
new FoDeclarations(getFOTree(), this, ev);
- ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV,
ev);
+ ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
}
@@ -199,15 +199,15 @@
if (ev == null)
throw new FOPException("No page-sequence found.");
firstPageSeq = numChildren();
- new FoPageSequence(getFOTree(), this, ev);
- ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
+ new FoPageSequence(getFOTree(), this, (FoXMLEvent)ev);
+ ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.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);
- ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV,
ev);
+ new FoPageSequence(getFOTree(), this, (FoXMLEvent)ev);
+ ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
}
} catch (NoSuchElementException e) {
@@ -224,7 +224,7 @@
for (int i = 0; i <= XMLNamespaces.LAST_NS_INDEX; i++) {
System.out.println("Namespace " + namespaces.getIndexURI(i));
System.out.println("Size of event pool: " +
- namespaces.getPoolSize(i));
+ namespaces.getNSPoolSize(i));
System.out.println("Next event id : " +
namespaces.getSequenceValue(i));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
