Constructor modifiactions to discriminate situations requiring an

FoXMLEvent arg and those requiring XMLEvent

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

diff --git a/src/java/org/apache/fop/fo/pagination/FoLayoutMasterSet.java b/src/java/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
index bdd468e787285cc5e7b1fce00125da60c56d38b2..6a1686c193f98d5ab98791298c734d8d94939626 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
+++ b/src/java/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
@@ -67,8 +67,7 @@ import org.apache.fop.fo.FOTree;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.SyncedXmlEventsBuffer;
 import org.apache.fop.xml.XMLEvent;
 
 /**
@@ -143,7 +142,7 @@ public class FoLayoutMasterSet extends FONode {
      * this node
      */
     public FoLayoutMasterSet
-        (FOTree foTree, FONode parent, FoXMLEvent event)
+        (FOTree foTree, FONode parent, XMLEvent event)
         throws TreeException, FOPException, PropertyException
     {
         super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event,
@@ -161,7 +160,7 @@ public class FoLayoutMasterSet extends FONode {
      * @param event - the layout page-master-set STARTELEMENT event.
      * @throws FOPException
      */
-    public void setupPageMasters(FoXMLEvent event)
+    public void setupPageMasters(XMLEvent event)
             throws FOPException, PropertyException
     {
         FoSimplePageMaster simple;
@@ -170,7 +169,7 @@ public class FoLayoutMasterSet extends FONode {
         FoPageSequenceMaster foPageSeq;
         try {
             do {
-                FoXMLEvent ev =
+                XMLEvent ev =
                     xmlevents.expectStartElement
                         (simpleOrSequenceMaster, XMLEvent.DISCARD_W_SPACE);
                 if (ev == null) break; // No instance of these elements found
@@ -213,9 +212,9 @@ public class FoLayoutMasterSet extends FONode {
                     System.out.println("page-sequence-master ok");
                 } else
                     throw new FOPException
-                            ("Aargh! expectStartElement(events, list)");
+                            ("Error seeking page-masters");
                 // Flush the master event
-                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
                 namespaces.surrenderEvent(ev);
             } while (true);
         } catch (NoSuchElementException e) {

diff --git a/src/java/org/apache/fop/fo/pagination/FoPageSequenceMaster.java b/src/java/org/apache/fop/fo/pagination/FoPageSequenceMaster.java
index 925642c6ad8bfcc80529a2e23206005976f712af..7cbf509220ce0cda44d9d63c5c2e031934ed92f4 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/FoPageSequenceMaster.java
+++ b/src/java/org/apache/fop/fo/pagination/FoPageSequenceMaster.java
@@ -67,8 +67,7 @@ import org.apache.fop.fo.FOTree;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.SyncedXmlEventsBuffer;
 import org.apache.fop.xml.XMLEvent;
 
 /**
@@ -224,7 +223,7 @@ public class FoPageSequenceMaster extends FONode {
         FObjectNames.REPEATABLE_PAGE_MASTER_ALTERNATIVES
     };
 
-    public FoPageSequenceMaster(FOTree foTree, FONode parent, FoXMLEvent event)
+    public FoPageSequenceMaster(FOTree foTree, FONode parent, XMLEvent event)
         throws TreeException, FOPException, PropertyException
     {
         super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event,
@@ -232,7 +231,7 @@ public class FoPageSequenceMaster extends FONode {
         // Process sequence members here
         try {
             do {
-                FoXMLEvent ev = xmlevents.expectStartElement
+                XMLEvent ev = xmlevents.expectStartElement
                     (singleOrRepeatableMasterRefs, XMLEvent.DISCARD_W_SPACE);
                 if (ev == null) break;  // page-sequence-masters exhausted
                 int foType = ev.getFoType();
@@ -253,7 +252,7 @@ public class FoPageSequenceMaster extends FONode {
                     throw new FOPException
                             ("Aargh! expectStartElement(events, list)");
                 ev = xmlevents.getEndElement
-                                    (SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
+                                    (SyncedXmlEventsBuffer.DISCARD_EV, ev);
                 namespaces.surrenderEvent(ev);
             } while (true);
         } catch (NoSuchElementException e) {
@@ -278,7 +277,7 @@ public class FoPageSequenceMaster extends FONode {
     public class FoSinglePageMasterReference extends FONode {
 
         public FoSinglePageMasterReference
-                            (FOTree foTree, FONode parent, FoXMLEvent event)
+                            (FOTree foTree, FONode parent, XMLEvent event)
             throws TreeException, FOPException, PropertyException
         {
             super(foTree, FObjectNames.SINGLE_PAGE_MASTER_REFERENCE, parent,
@@ -300,7 +299,7 @@ public class FoPageSequenceMaster extends FONode {
     public class FoRepeatablePageMasterReference extends FONode {
 
         public FoRepeatablePageMasterReference
-                            (FOTree foTree, FONode parent, FoXMLEvent event)
+                            (FOTree foTree, FONode parent, XMLEvent event)
             throws TreeException, FOPException, PropertyException
         {
             super(foTree, FObjectNames.REPEATABLE_PAGE_MASTER_REFERENCE,
@@ -326,7 +325,7 @@ public class FoPageSequenceMaster extends FONode {
     public class FoRepeatablePageMasterAlternatives extends FONode {
 
         public FoRepeatablePageMasterAlternatives
-                            (FOTree foTree, FONode parent, FoXMLEvent event)
+                            (FOTree foTree, FONode parent, XMLEvent event)
             throws TreeException, FOPException, PropertyException
         {
             super(foTree, FObjectNames.REPEATABLE_PAGE_MASTER_ALTERNATIVES,
@@ -336,7 +335,7 @@ public class FoPageSequenceMaster extends FONode {
             // Process conditional-page-master-references here
             try {
                 do {
-                    FoXMLEvent ev = this.xmlevents.expectStartElement
+                    XMLEvent ev = this.xmlevents.expectStartElement
                             (FObjectNames.CONDITIONAL_PAGE_MASTER_REFERENCE,
                                                     XMLEvent.DISCARD_W_SPACE);
                     if (ev == null) break; // Sub-sequences exhausted
@@ -344,7 +343,7 @@ public class FoPageSequenceMaster extends FONode {
                     //    ("Found conditional-page-master-reference");
                     new FoConditionalPageMasterReference(foTree, this, ev);
                     ev = this.xmlevents.getEndElement
-                                    (SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
+                                    (SyncedXmlEventsBuffer.DISCARD_EV, ev);
                     this.namespaces.surrenderEvent(ev);
                 } while (true);
             } catch (NoSuchElementException e) {
@@ -361,7 +360,7 @@ public class FoPageSequenceMaster extends FONode {
         public class FoConditionalPageMasterReference extends FONode {
 
             public FoConditionalPageMasterReference
-                            (FOTree foTree, FONode parent, FoXMLEvent event)
+                            (FOTree foTree, FONode parent, XMLEvent event)
             throws TreeException, FOPException, PropertyException
             {
                 super(foTree, FObjectNames.CONDITIONAL_PAGE_MASTER_REFERENCE,

diff --git a/src/java/org/apache/fop/fo/pagination/FoRegionAfter.java b/src/java/org/apache/fop/fo/pagination/FoRegionAfter.java
index 9887fef0b2097719ea9f0fe9a0ed33892a92df5e..d6dae52c79db27ef7b7efc91634d2266385afbeb 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/FoRegionAfter.java
+++ b/src/java/org/apache/fop/fo/pagination/FoRegionAfter.java
@@ -60,7 +60,7 @@ import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
 import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:simple-page-master flow object
@@ -76,7 +76,7 @@ public class FoRegionAfter extends FoRegionBeforeAfter {
      * @param event the <tt>XMLEvent</tt> that triggered the creation of
      * this node
      */
-    public FoRegionAfter(FOTree foTree, FONode parent, FoXMLEvent event)
+    public FoRegionAfter(FOTree foTree, FONode parent, XMLEvent event)
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.REGION_AFTER, parent, event);

diff --git a/src/java/org/apache/fop/fo/pagination/FoRegionBefore.java b/src/java/org/apache/fop/fo/pagination/FoRegionBefore.java
index 316efa92acbe3e75570c08b3b1788feaccf8e000..8853c09c3bbac8f0c61a02b88e1236487ec8985e 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/FoRegionBefore.java
+++ b/src/java/org/apache/fop/fo/pagination/FoRegionBefore.java
@@ -60,7 +60,7 @@ import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
 import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:simple-page-master flow object
@@ -76,7 +76,7 @@ public class FoRegionBefore extends FoRegionBeforeAfter {
      * @param event the <tt>XMLEvent</tt> that triggered the creation of
      * this node
      */
-    public FoRegionBefore(FOTree foTree, FONode parent, FoXMLEvent event)
+    public FoRegionBefore(FOTree foTree, FONode parent, XMLEvent event)
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.REGION_BEFORE, parent, event);

diff --git a/src/java/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java b/src/java/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java
index c9e40fd442cf7fbae345da1b006f1ac21064c712..050d1bc3fbb13dc2fdb10026fb39edd10e940295 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java
+++ b/src/java/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java
@@ -64,7 +64,7 @@ import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertySets;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:simple-page-master flow object
@@ -127,7 +127,7 @@ public class FoRegionBeforeAfter extends FONode {
      * this node
      */
     public FoRegionBeforeAfter
-                (FOTree foTree, int foType, FONode parent, FoXMLEvent event)
+                (FOTree foTree, int foType, FONode parent, XMLEvent event)
         throws TreeException, FOPException
     {
         super(foTree, foType, parent, event, FONode.LAYOUT_SET,

diff --git a/src/java/org/apache/fop/fo/pagination/FoRegionBody.java b/src/java/org/apache/fop/fo/pagination/FoRegionBody.java
index 93c2e37b0a0df55e01bd454d1e4f79401701b4dc..d5af4f06237692b2879c87bc62a560f51d50cd0e 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/FoRegionBody.java
+++ b/src/java/org/apache/fop/fo/pagination/FoRegionBody.java
@@ -65,7 +65,7 @@ import org.apache.fop.fo.FOTree;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertySets;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:simple-page-master flow object
@@ -128,7 +128,7 @@ public class FoRegionBody extends FONode {
      * @param event the <tt>FoXMLEvent</tt> that triggered the creation of
      * this node
      */
-    public FoRegionBody(FOTree foTree, FONode parent, FoXMLEvent event)
+    public FoRegionBody(FOTree foTree, FONode parent, XMLEvent event)
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.REGION_BODY, parent, event,

diff --git a/src/java/org/apache/fop/fo/pagination/FoRegionEnd.java b/src/java/org/apache/fop/fo/pagination/FoRegionEnd.java
index 6364c78b46a8cdc17add35d18453234b316e3a64..912628ea759691e328ee4e8f751c49854c2deaad 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/FoRegionEnd.java
+++ b/src/java/org/apache/fop/fo/pagination/FoRegionEnd.java
@@ -60,7 +60,7 @@ import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
 import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.XMLEvent;
 
 
 /**
@@ -77,7 +77,7 @@ public class FoRegionEnd extends FoRegionStartEnd {
      * @param event the <tt>XMLEvent</tt> that triggered the creation of
      * this node
      */
-    public FoRegionEnd(FOTree foTree, FONode parent, FoXMLEvent event)
+    public FoRegionEnd(FOTree foTree, FONode parent, XMLEvent event)
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.REGION_END, parent, event);

diff --git a/src/java/org/apache/fop/fo/pagination/FoRegionStart.java b/src/java/org/apache/fop/fo/pagination/FoRegionStart.java
index 0ba7a75a0b121a8ed5d7185f60ceccea5e097950..5d2e552e445cb5d4b5315e2f4a7a3a0a40597b7f 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/FoRegionStart.java
+++ b/src/java/org/apache/fop/fo/pagination/FoRegionStart.java
@@ -60,7 +60,7 @@ import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
 import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:simple-page-master flow object
@@ -76,7 +76,7 @@ public class FoRegionStart extends FoRegionStartEnd {
      * @param event the <tt>XMLEvent</tt> that triggered the creation of
      * this node
      */
-    public FoRegionStart(FOTree foTree, FONode parent, FoXMLEvent event)
+    public FoRegionStart(FOTree foTree, FONode parent, XMLEvent event)
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.REGION_START, parent, event);

diff --git a/src/java/org/apache/fop/fo/pagination/FoRegionStartEnd.java b/src/java/org/apache/fop/fo/pagination/FoRegionStartEnd.java
index 90d651fd053642834aafe4bb8f34621dffb0ae1f..0a4c12a8388570879d8fe49d7038861103157a5a 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/FoRegionStartEnd.java
+++ b/src/java/org/apache/fop/fo/pagination/FoRegionStartEnd.java
@@ -64,7 +64,7 @@ import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertySets;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:simple-page-master flow object
@@ -126,7 +126,7 @@ public class FoRegionStartEnd extends FONode {
      * this node
      */
     public FoRegionStartEnd
-                (FOTree foTree, int foType, FONode parent, FoXMLEvent event)
+                (FOTree foTree, int foType, FONode parent, XMLEvent event)
         throws TreeException, FOPException
     {
         super(foTree, foType, parent, event, FONode.LAYOUT_SET,

diff --git a/src/java/org/apache/fop/fo/pagination/FoSimplePageMaster.java b/src/java/org/apache/fop/fo/pagination/FoSimplePageMaster.java
index 7864051de965b805d2f5f095613f8af4020b47c4..1bc7609552eb1f94d8d93d0c2c3f14088148745e 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/FoSimplePageMaster.java
+++ b/src/java/org/apache/fop/fo/pagination/FoSimplePageMaster.java
@@ -67,8 +67,7 @@ import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.SyncedXmlEventsBuffer;
 import org.apache.fop.xml.XMLEvent;
 
 /**
@@ -132,13 +131,13 @@ public class FoSimplePageMaster extends FONode {
      * @param event the <tt>XMLEvent</tt> that triggered the creation of
      * this node
      */
-    public FoSimplePageMaster(FOTree foTree, FONode parent, FoXMLEvent event)
+    public FoSimplePageMaster(FOTree foTree, FONode parent, XMLEvent event)
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.SIMPLE_PAGE_MASTER, parent, event,
               FONode.LAYOUT_SET, sparsePropsMap, sparseIndices);
         // Process regions here
-        FoXMLEvent regionEv;
+        XMLEvent regionEv;
         if ((regionEv = xmlevents.expectStartElement
                 (FObjectNames.REGION_BODY, XMLEvent.DISCARD_W_SPACE)) == null)
             throw new FOPException
@@ -147,7 +146,7 @@ public class FoSimplePageMaster extends FONode {
         // Process region-body
         regionBody = new FoRegionBody(foTree, this, regionEv);
         regionEv = xmlevents.getEndElement
-                                (SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+                                (SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
         namespaces.surrenderEvent(regionEv);
 
         // Remaining regions are optional
@@ -157,7 +156,7 @@ public class FoSimplePageMaster extends FONode {
         {
             regionBefore = new FoRegionBefore(foTree, this, regionEv);
             regionEv = xmlevents.getEndElement
-                                (SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+                                (SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
             namespaces.surrenderEvent(regionEv);
         }
 
@@ -167,7 +166,7 @@ public class FoSimplePageMaster extends FONode {
         {
             regionAfter = new FoRegionAfter(foTree, this, regionEv);
             regionEv = xmlevents.getEndElement
-                            (SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+                            (SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
             namespaces.surrenderEvent(regionEv);
         }
 
@@ -177,7 +176,7 @@ public class FoSimplePageMaster extends FONode {
         {
             regionStart = new FoRegionStart(foTree, this, regionEv);
             regionEv = xmlevents.getEndElement
-                            (SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+                            (SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
             namespaces.surrenderEvent(regionEv);
         }
 
@@ -187,7 +186,7 @@ public class FoSimplePageMaster extends FONode {
         {
             regionEnd = new FoRegionEnd(foTree, this, regionEv);
             regionEv = xmlevents.getEndElement
-                            (SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+                            (SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
             namespaces.surrenderEvent(regionEv);
         }