You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pb...@apache.org on 2004/01/14 17:32:04 UTC
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination FoSimplePageMaster.java FoRegionEnd.java FoPageSequenceMaster.java FoLayoutMasterSet.java FoRegionBody.java FoRegionStartEnd.java FoRegionStart.java FoRegionAfter.java FoRegionBeforeAfter.java FoRegionBefore.java
pbwest 2004/01/14 08:32:04
Modified: src/java/org/apache/fop/fo/pagination Tag:
FOP_0-20-0_Alt-Design FoSimplePageMaster.java
FoRegionEnd.java FoPageSequenceMaster.java
FoLayoutMasterSet.java FoRegionBody.java
FoRegionStartEnd.java FoRegionStart.java
FoRegionAfter.java FoRegionBeforeAfter.java
FoRegionBefore.java
Log:
Constructor modifiactions to discriminate situations requiring an
FoXMLEvent arg and those requiring XMLEvent
Revision Changes Path
No revision
No revision
1.1.2.3 +10 -11 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
Index: FoSimplePageMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoSimplePageMaster.java 10 Jan 2004 06:29:49 -0000 1.1.2.2
+++ FoSimplePageMaster.java 14 Jan 2004 16:32:03 -0000 1.1.2.3
@@ -67,8 +67,7 @@
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 @@
* @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 @@
// 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 @@
{
regionBefore = new FoRegionBefore(foTree, this, regionEv);
regionEv = xmlevents.getEndElement
- (SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+ (SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
namespaces.surrenderEvent(regionEv);
}
@@ -167,7 +166,7 @@
{
regionAfter = new FoRegionAfter(foTree, this, regionEv);
regionEv = xmlevents.getEndElement
- (SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+ (SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
namespaces.surrenderEvent(regionEv);
}
@@ -177,7 +176,7 @@
{
regionStart = new FoRegionStart(foTree, this, regionEv);
regionEv = xmlevents.getEndElement
- (SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+ (SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
namespaces.surrenderEvent(regionEv);
}
@@ -187,7 +186,7 @@
{
regionEnd = new FoRegionEnd(foTree, this, regionEv);
regionEv = xmlevents.getEndElement
- (SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+ (SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
namespaces.surrenderEvent(regionEv);
}
1.1.2.2 +4 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionEnd.java
Index: FoRegionEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionEnd.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoRegionEnd.java 5 Jul 2003 19:16:49 -0000 1.1.2.1
+++ FoRegionEnd.java 14 Jan 2004 16:32:03 -0000 1.1.2.2
@@ -60,7 +60,7 @@
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 @@
* @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);
1.1.2.4 +12 -13 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
Index: FoPageSequenceMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoPageSequenceMaster.java 10 Jan 2004 06:29:49 -0000 1.1.2.3
+++ FoPageSequenceMaster.java 14 Jan 2004 16:32:03 -0000 1.1.2.4
@@ -67,8 +67,7 @@
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 @@
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 @@
// 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 @@
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 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 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 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 @@
// 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 @@
// ("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 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,
1.1.2.4 +9 -10 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
Index: FoLayoutMasterSet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoLayoutMasterSet.java 10 Jan 2004 06:29:49 -0000 1.1.2.3
+++ FoLayoutMasterSet.java 14 Jan 2004 16:32:03 -0000 1.1.2.4
@@ -67,8 +67,7 @@
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 @@
* 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 @@
* @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 @@
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 @@
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) {
1.1.2.2 +4 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionBody.java
Index: FoRegionBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionBody.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoRegionBody.java 5 Jul 2003 19:16:49 -0000 1.1.2.1
+++ FoRegionBody.java 14 Jan 2004 16:32:03 -0000 1.1.2.2
@@ -65,7 +65,7 @@
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 @@
* @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,
1.1.2.2 +4 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionStartEnd.java
Index: FoRegionStartEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionStartEnd.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoRegionStartEnd.java 5 Jul 2003 19:16:49 -0000 1.1.2.1
+++ FoRegionStartEnd.java 14 Jan 2004 16:32:03 -0000 1.1.2.2
@@ -64,7 +64,7 @@
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 @@
* 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,
1.1.2.2 +4 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionStart.java
Index: FoRegionStart.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionStart.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoRegionStart.java 5 Jul 2003 19:16:49 -0000 1.1.2.1
+++ FoRegionStart.java 14 Jan 2004 16:32:03 -0000 1.1.2.2
@@ -60,7 +60,7 @@
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 @@
* @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);
1.1.2.2 +4 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionAfter.java
Index: FoRegionAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionAfter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoRegionAfter.java 5 Jul 2003 19:16:49 -0000 1.1.2.1
+++ FoRegionAfter.java 14 Jan 2004 16:32:03 -0000 1.1.2.2
@@ -60,7 +60,7 @@
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 @@
* @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);
1.1.2.2 +4 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionBeforeAfter.java
Index: FoRegionBeforeAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionBeforeAfter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoRegionBeforeAfter.java 5 Jul 2003 19:16:49 -0000 1.1.2.1
+++ FoRegionBeforeAfter.java 14 Jan 2004 16:32:03 -0000 1.1.2.2
@@ -64,7 +64,7 @@
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 @@
* 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,
1.1.2.2 +4 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionBefore.java
Index: FoRegionBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionBefore.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoRegionBefore.java 5 Jul 2003 19:16:49 -0000 1.1.2.1
+++ FoRegionBefore.java 14 Jan 2004 16:32:03 -0000 1.1.2.2
@@ -60,7 +60,7 @@
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 @@
* @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);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org