pbwest 2002/10/24 07:51:53
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
FOTree.java
Log:
Changed XMLEvent to FoXMLEvent throughout.
Revision Changes Path
No revision
No revision
1.19.2.19 +7 -7 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.18
retrieving revision 1.19.2.19
diff -u -r1.19.2.18 -r1.19.2.19
--- FONode.java 21 Oct 2002 15:43:26 -0000 1.19.2.18
+++ FONode.java 24 Oct 2002 14:51:52 -0000 1.19.2.19
@@ -16,8 +16,8 @@
import org.apache.fop.datastructs.Tree;
import org.apache.fop.datastructs.ROBitSet;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.xml.XMLEvent;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
import org.apache.fop.xml.XMLNamespaces;
import org.apache.fop.messaging.MessageHandler;
@@ -55,9 +55,9 @@
/** The parent <tt>FONode</tt> of this node. */
protected FONode parent;
/** The <tt>XMLEvent</tt> which triggered this node. */
- protected XMLEvent event;
+ protected FoXMLEvent event;
/** The buffer from which parser events are drawn. */
- protected SyncedXmlEventsBuffer xmlevents;
+ protected SyncedFoXmlEventsBuffer xmlevents;
/** The namespaces object associated with <i>xmlevents</i>. */
protected XMLNamespaces namespaces;
/** The FO type. */
@@ -101,7 +101,7 @@
* node
*/
public FONode
- (FOTree foTree, int type, FONode parent, XMLEvent event, int attrSet)
+ (FOTree foTree, int type, FONode parent, FoXMLEvent event, int attrSet)
throws Tree.TreeException, FOPException, PropertyException
{
foTree.super(parent);
1.1.2.20 +7 -7 xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- FOTree.java 21 Oct 2002 15:45:30 -0000 1.1.2.19
+++ FOTree.java 24 Oct 2002 14:51:53 -0000 1.1.2.20
@@ -4,9 +4,9 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.xml.XMLEvent;
+import org.apache.fop.xml.FoXMLEvent;
import org.apache.fop.xml.XMLNamespaces;
-import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
import org.apache.fop.apps.Driver;
import org.apache.fop.apps.FOPException;
import org.apache.fop.configuration.Configuration;
@@ -50,7 +50,7 @@
* The buffer from which the <tt>XMLEvent</tt>s from the parser will
* be read. <tt>protected</tt> so that FONode can access it.
*/
- SyncedXmlEventsBuffer xmlevents;
+ SyncedFoXmlEventsBuffer xmlevents;
private Thread parserThread;
private boolean errorDump;
@@ -65,7 +65,7 @@
* @param xmlevents the buffer from which <tt>XMLEvent</tt>s from the
* parser are read.
*/
- public FOTree(SyncedXmlEventsBuffer xmlevents)
+ public FOTree(SyncedFoXmlEventsBuffer xmlevents)
throws PropertyException
{
super();
@@ -112,7 +112,7 @@
*/
public void run() {
FoRoot foRoot;
- XMLEvent event;
+ FoXMLEvent event;
try {
// Dummy only - check the language and country setup
System.out.println((String)Configuration.getHashMapEntry
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
