SyncedFoXmlEventsBuffer renamed to SyncedXmlEventsBuffer

Changed constructor signature to take XMLEvent instead of FoXMLEvent
Moved defaultConstructorArgs to FObjects

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197166 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java
index 86cfc73bf6dd974e09ddf378ee8b559e4d45c7f9..d7b9ace11db310f215db86c94a3796cf1bfe6451 100644 (file)
--- a/src/java/org/apache/fop/fo/FONode.java
+++ b/src/java/org/apache/fop/fo/FONode.java
@@ -73,8 +73,8 @@ import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.expr.PropertyParser;
 import org.apache.fop.fo.properties.Property;
 import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
+import org.apache.fop.xml.SyncedXmlEventsBuffer;
 import org.apache.fop.xml.XMLNamespaces;
 
 /**
@@ -139,7 +139,7 @@ public class FONode extends Node{
         PAGESEQ | FLOW | STATIC | TITLE | MC_MARKER;
 
     /** The buffer from which parser events are drawn. */
-    protected final SyncedFoXmlEventsBuffer xmlevents;
+    protected final SyncedXmlEventsBuffer xmlevents;
 
     /** The namespaces object associated with <i>xmlevents</i>. */
     protected XMLNamespaces namespaces;
@@ -207,24 +207,6 @@ public class FONode extends Node{
     /** Ancestor reference area of this FONode. */
     protected FONode ancestorRefArea = null;
 
-    /**
-     * The default constructor arguments for an FObject. <b>N.B.</b> not
-     * all subclasses of <tt>FONode</tt> use this constructor; e.g.
-     * <tt>FoRoot</tt>, <tt>FoPageSequence</tt> &amp; <tt>FoFlow</tt>.
-     * Generally these FObjects are not invoked through reflection.  If such
-     * invocation becomes necessary for a particular class, a contructor of
-     * this kind must be added to the class.
-     * <p>At present, the only difference is in the addition of the
-     * <tt>int.class</tt> constructor argument.
-     */
-    protected static final Class[] defaultConstructorArgs =
-        new Class[] {
-            FOTree.class
-            ,FONode.class
-            ,FoXMLEvent.class
-            ,int.class
-        };
-
     /**
      * @param foTree an <tt>FOTree</tt> to which this node belongs
      * @param type the fo type of this FONode.
@@ -244,7 +226,7 @@ public class FONode extends Node{
      * properties.
      */
     public FONode
-        (FOTree foTree, int type, FONode parent, FoXMLEvent event,
+        (FOTree foTree, int type, FONode parent, XMLEvent event,
              int stateFlags, int[] sparsePropsMap, int[] sparseIndices)
         throws TreeException, FOPException, PropertyException
     {