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/15 04:10:58 UTC
cvs commit: xml-fop/src/java/org/apache/fop/fo FObjects.java FoRoot.java
pbwest 2004/01/14 19:10:58
Modified: src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoMultiCase.java FoRetrieveMarker.java
FoTableBody.java FoTableColumn.java
FoMultiPropertySet.java FoListItem.java
FoStaticContent.java FoTitle.java FoBasicLink.java
FoBidiOverride.java FoTableCell.java
FoMultiToggle.java FoTableRow.java
FoMultiSwitch.java FoWrapper.java FoPageNumber.java
FoListItemBody.java FoBlock.java FoCharacter.java
FoExternalGraphic.java FoNoFo.java
FoTableCaption.java FoInlineContainer.java
FoFootnote.java FoListBlock.java FoTable.java
FoPageSequence.java FoFloat.java
FoInstreamForeignObject.java FoFlow.java
FoInitialPropertySet.java FoLeader.java
FoBlockContainer.java FoPageNumberCitation.java
FoMultiProperties.java FoMarker.java
FoTableAndCaption.java FoListItemLabel.java
FoTableHeader.java FoFootnoteBody.java
FoInline.java FoTableFooter.java
src/java/org/apache/fop/fo/pagination Tag:
FOP_0-20-0_Alt-Design FoRegionBody.java
src/java/org/apache/fop/fo/declarations Tag:
FOP_0-20-0_Alt-Design FoColorProfile.java
src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXmlSerialHandler.java Namespaces.java
src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FObjects.java FoRoot.java
Added: src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXmlEvent.java
Log:
FoXMLEvent renamed to FoXmlEvent
Revision Changes Path
No revision
No revision
1.1.2.5 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java
Index: FoMultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoMultiCase.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoMultiCase.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -67,7 +67,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -135,7 +135,7 @@
* attribute set information.
*/
public FoMultiCase
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.MULTI_CASE, parent, event,
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java
Index: FoRetrieveMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoRetrieveMarker.java 14 Jan 2004 16:34:21 -0000 1.1.2.2
+++ FoRetrieveMarker.java 15 Jan 2004 03:10:57 -0000 1.1.2.3
@@ -64,7 +64,7 @@
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
/**
* Implements the fo:retrieve-marker flow object.
@@ -123,7 +123,7 @@
* attribute set information.
*/
public FoRetrieveMarker
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.RETRIEVE_MARKER, parent, event,
1.1.2.5 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java
Index: FoTableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoTableBody.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoTableBody.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,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.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -153,7 +153,7 @@
* attribute set information.
*/
public FoTableBody
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.TABLE_BODY, parent, event,
@@ -165,7 +165,7 @@
while ((ev = xmlevents.expectStartElement
(FObjectNames.MARKER, XmlEvent.DISCARD_W_SPACE))
!= null) {
- new FoMarker(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numMarkers++;
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -176,7 +176,7 @@
while ((ev = xmlevents.expectStartElement
(FObjectNames.TABLE_ROW, XmlEvent.DISCARD_W_SPACE))
!= null) {
- new FoTableRow(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoTableRow(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numRows++;
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
@@ -192,7 +192,7 @@
(FObjectNames.TABLE_CELL, XmlEvent.DISCARD_W_SPACE))
!= null) {
new FoTableCell(
- getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numCells++;
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableColumn.java
Index: FoTableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableColumn.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoTableColumn.java 14 Jan 2004 16:34:21 -0000 1.1.2.2
+++ FoTableColumn.java 15 Jan 2004 03:10:57 -0000 1.1.2.3
@@ -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.FoXmlEvent;
/**
* Implements the fo:table-column flow object.
@@ -132,7 +132,7 @@
* attribute set information.
*/
public FoTableColumn
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.TABLE_COLUMN, parent, event,
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java
Index: FoMultiPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoMultiPropertySet.java 14 Jan 2004 16:34:21 -0000 1.1.2.2
+++ FoMultiPropertySet.java 15 Jan 2004 03:10:57 -0000 1.1.2.3
@@ -64,7 +64,7 @@
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
/**
* Implements the fo:multi-property-set flow object.
@@ -122,7 +122,7 @@
* attribute set information.
*/
public FoMultiPropertySet
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.MULTI_PROPERTY_SET, parent, event,
1.1.2.5 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItem.java
Index: FoListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItem.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoListItem.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoListItem.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,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.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -144,7 +144,7 @@
* attribute set information.
*/
public FoListItem
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.LIST_ITEM, parent, event,
@@ -156,7 +156,7 @@
while ((ev = xmlevents.expectStartElement
(FObjectNames.MARKER, XmlEvent.DISCARD_W_SPACE))
!= null) {
- new FoMarker(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numMarkers++;
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -170,7 +170,7 @@
throw new FOPException
("No list-item-label in list-item.");
new FoListItemLabel(
- getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ getFOTree(), this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -181,7 +181,7 @@
== null)
throw new FOPException
("No list-item-body in list-item.");
- new FoListItemBody(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoListItemBody(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java
Index: FoStaticContent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoStaticContent.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoStaticContent.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -65,7 +65,7 @@
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -118,7 +118,7 @@
* @param event the <tt>XmlEvent</tt> that triggered the creation of
* this node
*/
- public FoStaticContent(FOTree foTree, FONode parent, FoXMLEvent event)
+ public FoStaticContent(FOTree foTree, FONode parent, FoXmlEvent event)
throws TreeException, FOPException
{
super(foTree, FObjectNames.STATIC_CONTENT, parent, event,
@@ -132,7 +132,7 @@
// Generate the flow object
//System.out.println("Generating first block for static-content.");
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, FONode.STATIC_SET);
+ foTree, this, (FoXmlEvent)ev, FONode.STATIC_SET);
// Clear the blockage
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -142,7 +142,7 @@
//System.out.println
//("Generating subsequent block for static-content.");
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, FONode.STATIC_SET);
+ foTree, this, (FoXmlEvent)ev, FONode.STATIC_SET);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
}
1.1.2.5 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java
Index: FoTitle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoTitle.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoTitle.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -67,7 +67,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -137,7 +137,7 @@
* @param event the <tt>XmlEvent</tt> that triggered the creation of
* this node
*/
- public FoTitle(FOTree foTree, FONode parent, FoXMLEvent event)
+ public FoTitle(FOTree foTree, FONode parent, FoXmlEvent event)
throws TreeException, FOPException
{
super(foTree, FObjectNames.TITLE, parent, event,
1.1.2.5 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoBasicLink.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoBasicLink.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -67,7 +67,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -152,7 +152,7 @@
* attribute set information.
*/
public FoBasicLink
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.BASIC_LINK, parent, event,
1.1.2.5 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoBidiOverride.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoBidiOverride.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -67,7 +67,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -139,7 +139,7 @@
* attribute set information.
*/
public FoBidiOverride
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.BIDI_OVERRIDE, parent, event,
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCell.java
Index: FoTableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCell.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoTableCell.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoTableCell.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,7 @@
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -149,7 +149,7 @@
* attribute set information.
*/
public FoTableCell
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.TABLE_CELL, parent, event,
@@ -166,7 +166,7 @@
("%block; not found in fo:table-cell");
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
// Clear the blockage
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -179,7 +179,7 @@
if (ev != null) {
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
}
1.1.2.5 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiToggle.java
Index: FoMultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiToggle.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoMultiToggle.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoMultiToggle.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -67,7 +67,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -132,7 +132,7 @@
* attribute set information.
*/
public FoMultiToggle
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.MULTI_TOGGLE, parent, event,
1.1.2.5 +5 -5 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableRow.java
Index: FoTableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableRow.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoTableRow.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoTableRow.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,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.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -149,7 +149,7 @@
* attribute set information.
*/
public FoTableRow
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.TABLE_ROW, parent, event,
@@ -163,7 +163,7 @@
(FObjectNames.TABLE_CELL, XmlEvent.DISCARD_W_SPACE))
!= null) {
new FoTableCell(
- getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numCells++;
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
1.1.2.5 +5 -5 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java
Index: FoMultiSwitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoMultiSwitch.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoMultiSwitch.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,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.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -132,7 +132,7 @@
* attribute set information.
*/
public FoMultiSwitch
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.MULTI_SWITCH, parent, event,
@@ -144,7 +144,7 @@
(FObjectNames.MULTI_CASE, XmlEvent.DISCARD_W_SPACE))
!= null) {
new FoMultiCase(
- getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numCases++;
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
1.1.2.5 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoWrapper.java
Index: FoWrapper.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoWrapper.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoWrapper.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoWrapper.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,7 @@
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.PropNames;
import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -120,7 +120,7 @@
* attribute set information.
*/
public FoWrapper
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.WRAPPER, parent, event,
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageNumber.java
Index: FoPageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageNumber.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoPageNumber.java 14 Jan 2004 16:34:21 -0000 1.1.2.2
+++ FoPageNumber.java 15 Jan 2004 03:10:57 -0000 1.1.2.3
@@ -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.FoXmlEvent;
/**
* Implements the fo:page-number flow object.
@@ -148,7 +148,7 @@
* attribute set information.
*/
public FoPageNumber
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.PAGE_NUMBER, parent, event,
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemBody.java
Index: FoListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemBody.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoListItemBody.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoListItemBody.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,7 @@
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -130,7 +130,7 @@
* attribute set information.
*/
public FoListItemBody
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.LIST_ITEM_BODY, parent, event,
@@ -147,7 +147,7 @@
("%block; not found in fo:list-item-body");
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
// Clear the blockage
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -160,7 +160,7 @@
if (ev != null) {
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
}
1.1.2.5 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlock.java
Index: FoBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlock.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoBlock.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoBlock.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -67,7 +67,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -164,7 +164,7 @@
* attribute set information.
*/
public FoBlock
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.BLOCK, parent, event,
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoCharacter.java
Index: FoCharacter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoCharacter.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoCharacter.java 14 Jan 2004 16:34:21 -0000 1.1.2.2
+++ FoCharacter.java 15 Jan 2004 03:10:57 -0000 1.1.2.3
@@ -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.FoXmlEvent;
/**
* Implements the fo:character flow object.
@@ -151,7 +151,7 @@
* attribute set information.
*/
public FoCharacter
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.CHARACTER, parent, event,
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoExternalGraphic.java
Index: FoExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoExternalGraphic.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoExternalGraphic.java 14 Jan 2004 16:34:21 -0000 1.1.2.2
+++ FoExternalGraphic.java 15 Jan 2004 03:10:57 -0000 1.1.2.3
@@ -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.FoXmlEvent;
/**
* Implements the fo:external-graphic flow object.
@@ -150,7 +150,7 @@
* attribute set information.
*/
public FoExternalGraphic
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.EXTERNAL_GRAPHIC, parent, event,
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoNoFo.java
Index: FoNoFo.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoNoFo.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoNoFo.java 14 Jan 2004 16:34:21 -0000 1.1.2.2
+++ FoNoFo.java 15 Jan 2004 03:10:57 -0000 1.1.2.3
@@ -58,7 +58,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTree;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
/**
* Implements the fo:no-fo flow object.
@@ -112,7 +112,7 @@
* @throws FOPException, without exception.
*/
public FoNoFo
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws FOPException
{
throw new FOPException("No such flow object as fo:no-fo.");
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCaption.java
Index: FoTableCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCaption.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoTableCaption.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoTableCaption.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,7 @@
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -140,7 +140,7 @@
* attribute set information.
*/
public FoTableCaption
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.TABLE_CAPTION, parent, event,
@@ -157,7 +157,7 @@
("%block; not found in fo:table-caption");
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
// Clear the blockage
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -170,7 +170,7 @@
if (ev != null) {
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInlineContainer.java
Index: FoInlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInlineContainer.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoInlineContainer.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoInlineContainer.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,7 @@
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -150,7 +150,7 @@
* attribute set information.
*/
public FoInlineContainer
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.INLINE_CONTAINER, parent, event,
@@ -167,7 +167,7 @@
("%block; not found in fo:inline-container");
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
// Clear the blockage
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
@@ -181,7 +181,7 @@
if (ev != null) {
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnote.java
Index: FoFootnote.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnote.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoFootnote.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoFootnote.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,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.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -137,7 +137,7 @@
* attribute set information.
*/
public FoFootnote
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.FOOTNOTE, parent, event,
@@ -153,7 +153,7 @@
== null)
throw new FOPException("No inline in footnote.");
new FoInline(
- getFOTree(), this, (FoXMLEvent)ev,
+ getFOTree(), this, (FoXmlEvent)ev,
stateFlags | FONode.MC_FOOTNOTE);
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
@@ -165,7 +165,7 @@
== null)
throw new FOPException("No footnote-body in footnote.");
new FoFootnoteBody(
- getFOTree(), this, (FoXMLEvent)ev,
+ getFOTree(), this, (FoXmlEvent)ev,
stateFlags | FONode.MC_FOOTNOTE);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListBlock.java
Index: FoListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListBlock.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoListBlock.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoListBlock.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,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.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -150,7 +150,7 @@
* attribute set information.
*/
public FoListBlock
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.LIST_BLOCK, parent, event,
@@ -162,7 +162,7 @@
while ((ev = xmlevents.expectStartElement
(FObjectNames.MARKER, XmlEvent.DISCARD_W_SPACE))
!= null) {
- new FoMarker(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numMarkers++;
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
@@ -174,7 +174,7 @@
while ((ev = xmlevents.expectStartElement
(FObjectNames.LIST_ITEM, XmlEvent.DISCARD_W_SPACE))
!= null) {
- new FoListItem(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoListItem(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numItems++;
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
1.1.2.5 +10 -10 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTable.java
Index: FoTable.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTable.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoTable.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoTable.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,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.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -172,7 +172,7 @@
* attribute set information.
*/
public FoTable
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.TABLE, parent, event,
@@ -184,7 +184,7 @@
while ((ev = xmlevents.expectStartElement
(FObjectNames.MARKER, XmlEvent.DISCARD_W_SPACE))
!= null) {
- new FoMarker(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numMarkers++;
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -196,7 +196,7 @@
(FObjectNames.TABLE_COLUMN, XmlEvent.DISCARD_W_SPACE))
!= null) {
new FoTableColumn(
- getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numColumns++;
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
@@ -210,7 +210,7 @@
!= null) {
headerOffset = numChildren();
new FoTableHeader(
- getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ getFOTree(), this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -223,7 +223,7 @@
!= null) {
footerOffset = numChildren();
new FoTableFooter(
- getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ getFOTree(), this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -237,7 +237,7 @@
if (ev == null)
throw new FOPException("No table-body found.");
firstBodyOffset = numChildren();
- new FoTableBody(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoTableBody(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numBodies++;
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -246,7 +246,7 @@
!= null) {
// Loop over remaining fo:table-body's
new FoTableBody(
- getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numBodies++;
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
1.1.2.5 +8 -8 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java
Index: FoPageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoPageSequence.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoPageSequence.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,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.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -137,7 +137,7 @@
* @param event the <tt>XmlEvent</tt> that triggered the creation of
* this node
*/
- public FoPageSequence(FOTree foTree, FONode parent, FoXMLEvent event)
+ public FoPageSequence(FOTree foTree, FONode parent, FoXmlEvent event)
throws TreeException, FOPException
{
super(foTree, FObjectNames.PAGE_SEQUENCE, parent, event,
@@ -151,7 +151,7 @@
if (ev != null) {
// process the title
title = numChildren();
- new FoTitle(getFOTree(), this, (FoXMLEvent)ev);
+ new FoTitle(getFOTree(), this, (FoXmlEvent)ev);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
} // else ignore
@@ -164,7 +164,7 @@
// Loop over remaining fo:static-content
if (firstStaticContent != -1)
firstStaticContent = numChildren();
- new FoStaticContent(getFOTree(), this, (FoXMLEvent)ev);
+ new FoStaticContent(getFOTree(), this, (FoXmlEvent)ev);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
}
@@ -177,14 +177,14 @@
if (ev == null)
throw new FOPException("No flow found.");
firstFlow = numChildren();
- new FoFlow(getFOTree(), this, (FoXMLEvent)ev);
+ new FoFlow(getFOTree(), this, (FoXmlEvent)ev);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
while ((ev = xmlevents.expectStartElement
(FObjectNames.FLOW, XmlEvent.DISCARD_W_SPACE))
!= null) {
// Loop over remaining fo:page-sequences
- new FoFlow(getFOTree(), this, (FoXMLEvent)ev);
+ new FoFlow(getFOTree(), this, (FoXmlEvent)ev);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
}
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFloat.java
Index: FoFloat.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFloat.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoFloat.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoFloat.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -65,7 +65,7 @@
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -127,7 +127,7 @@
* attribute set information.
*/
public FoFloat
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.FLOAT, parent, event,
@@ -147,7 +147,7 @@
("%block; not found in fo:float");
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev,
+ foTree, this, (FoXmlEvent)ev,
stateFlags | FONode.MC_FLOAT);
// Clear the blockage
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
@@ -161,7 +161,7 @@
if (ev != null) {
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev,
+ foTree, this, (FoXmlEvent)ev,
stateFlags | FONode.MC_FLOAT);
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java
Index: FoInstreamForeignObject.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoInstreamForeignObject.java 14 Jan 2004 16:34:21 -0000 1.1.2.2
+++ FoInstreamForeignObject.java 15 Jan 2004 03:10:57 -0000 1.1.2.3
@@ -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.FoXmlEvent;
/**
* Implements the fo:instream-foreign-object flow object.
@@ -150,7 +150,7 @@
* attribute set information.
*/
public FoInstreamForeignObject
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.INSTREAM_FOREIGN_OBJECT, parent, event,
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFlow.java
Index: FoFlow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFlow.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoFlow.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoFlow.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -65,7 +65,7 @@
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -117,7 +117,7 @@
* @param event the <tt>XmlEvent</tt> that triggered the creation of
* this node
*/
- public FoFlow(FOTree foTree, FONode parent, FoXMLEvent event)
+ public FoFlow(FOTree foTree, FONode parent, FoXmlEvent event)
throws TreeException, FOPException
{
super(foTree, FObjectNames.FLOW, parent, event,
@@ -130,7 +130,7 @@
// Generate the flow object
//System.out.println("Generating first block for flow.");
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, FONode.FLOW_SET);
+ foTree, this, (FoXmlEvent)ev, FONode.FLOW_SET);
// Clear the blockage
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -142,7 +142,7 @@
//System.out.println
//("Generating subsequent block for flow.");
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, FONode.FLOW_SET);
+ foTree, this, (FoXmlEvent)ev, FONode.FLOW_SET);
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInitialPropertySet.java
Index: FoInitialPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInitialPropertySet.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoInitialPropertySet.java 14 Jan 2004 16:34:21 -0000 1.1.2.2
+++ FoInitialPropertySet.java 15 Jan 2004 03:10:57 -0000 1.1.2.3
@@ -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.FoXmlEvent;
/**
* Implements the fo:initial-property-set flow object.
@@ -136,7 +136,7 @@
* attribute set information.
*/
public FoInitialPropertySet
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.INITIAL_PROPERTY_SET, parent, event,
1.1.2.5 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoLeader.java
Index: FoLeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoLeader.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoLeader.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoLeader.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -67,7 +67,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -156,7 +156,7 @@
* attribute set information.
*/
public FoLeader
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.LEADER, parent, event,
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlockContainer.java
Index: FoBlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoBlockContainer.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoBlockContainer.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,7 @@
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -150,7 +150,7 @@
* attribute set information.
*/
public FoBlockContainer
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.BLOCK_CONTAINER, parent, event,
@@ -171,7 +171,7 @@
("%block; not found in fo:block-container");
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
// Clear the blockage
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -184,7 +184,7 @@
if (ev != null) {
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageNumberCitation.java
Index: FoPageNumberCitation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageNumberCitation.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoPageNumberCitation.java 14 Jan 2004 16:34:21 -0000 1.1.2.2
+++ FoPageNumberCitation.java 15 Jan 2004 03:10:57 -0000 1.1.2.3
@@ -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.FoXmlEvent;
/**
* Implements the fo:page-number-citation flow object.
@@ -149,7 +149,7 @@
* attribute set information.
*/
public FoPageNumberCitation
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.PAGE_NUMBER_CITATION, parent, event,
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiProperties.java
Index: FoMultiProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiProperties.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoMultiProperties.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoMultiProperties.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,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.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -131,7 +131,7 @@
* attribute set information.
*/
public FoMultiProperties
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.MULTI_PROPERTIES, parent, event,
@@ -144,7 +144,7 @@
XmlEvent.DISCARD_W_SPACE))
!= null) {
new FoMultiPropertySet(
- getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numSets++;
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
@@ -161,7 +161,7 @@
== null)
throw new FOPException
("No wrapper in multi-properties.");
- new FoWrapper(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoWrapper(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
1.1.2.5 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMarker.java
Index: FoMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMarker.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoMarker.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoMarker.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,7 @@
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.PropNames;
import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -120,7 +120,7 @@
* attribute set information.
*/
public FoMarker
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.MARKER, parent, event,
1.1.2.5 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java
Index: FoTableAndCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoTableAndCaption.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoTableAndCaption.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,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.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -152,7 +152,7 @@
* attribute set information.
*/
public FoTableAndCaption
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.TABLE_AND_CAPTION, parent, event,
@@ -164,7 +164,7 @@
while ((ev = xmlevents.expectStartElement
(FObjectNames.MARKER, XmlEvent.DISCARD_W_SPACE))
!= null) {
- new FoMarker(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numMarkers++;
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
@@ -177,7 +177,7 @@
(FObjectNames.TABLE_CAPTION, XmlEvent.DISCARD_W_SPACE))
!= null) {
new FoTableCaption(
- getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ getFOTree(), this, (FoXmlEvent)ev, stateFlags);
captionOffset = numMarkers;
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -190,7 +190,7 @@
if (ev == null)
throw new FOPException("No table found.");
tableOffset = numChildren();
- new FoTable(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoTable(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemLabel.java
Index: FoListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItemLabel.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoListItemLabel.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoListItemLabel.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,7 @@
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -130,7 +130,7 @@
* attribute set information.
*/
public FoListItemLabel
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.LIST_ITEM_LABEL, parent, event,
@@ -147,7 +147,7 @@
("%block; not found in fo:list-item-label");
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
// Clear the blockage
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -160,7 +160,7 @@
if (ev != null) {
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
}
1.1.2.5 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableHeader.java
Index: FoTableHeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableHeader.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoTableHeader.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoTableHeader.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,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.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -153,7 +153,7 @@
* attribute set information.
*/
public FoTableHeader
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.TABLE_HEADER, parent, event,
@@ -165,7 +165,7 @@
while ((ev = xmlevents.expectStartElement
(FObjectNames.MARKER, XmlEvent.DISCARD_W_SPACE))
!= null) {
- new FoMarker(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numMarkers++;
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -176,7 +176,7 @@
while ((ev = xmlevents.expectStartElement
(FObjectNames.TABLE_ROW, XmlEvent.DISCARD_W_SPACE))
!= null) {
- new FoTableRow(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoTableRow(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numRows++;
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -191,7 +191,7 @@
(FObjectNames.TABLE_CELL, XmlEvent.DISCARD_W_SPACE))
!= null) {
new FoTableCell(
- getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numCells++;
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java
Index: FoFootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoFootnoteBody.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoFootnoteBody.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,7 @@
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -128,7 +128,7 @@
* attribute set information.
*/
public FoFootnoteBody
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.FOOTNOTE_BODY, parent, event,
@@ -145,7 +145,7 @@
("%block; not found in fo:footnote-body");
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
// Clear the blockage
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -158,7 +158,7 @@
if (ev != null) {
// Generate the flow object
FObjects.fobjects.makeFlowObject(
- foTree, this, (FoXMLEvent)ev, stateFlags);
+ foTree, this, (FoXmlEvent)ev, stateFlags);
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
1.1.2.5 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInline.java
Index: FoInline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInline.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoInline.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoInline.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -67,7 +67,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.UnexpectedStartElementException;
@@ -153,7 +153,7 @@
* attribute set information.
*/
public FoInline
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.INLINE, parent, event,
1.1.2.5 +7 -7 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableFooter.java
Index: FoTableFooter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableFooter.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FoTableFooter.java 15 Jan 2004 03:01:52 -0000 1.1.2.4
+++ FoTableFooter.java 15 Jan 2004 03:10:57 -0000 1.1.2.5
@@ -66,7 +66,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.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
@@ -153,7 +153,7 @@
* attribute set information.
*/
public FoTableFooter
- (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
+ (FOTree foTree, FONode parent, FoXmlEvent event, int stateFlags)
throws TreeException, FOPException
{
super(foTree, FObjectNames.TABLE_FOOTER, parent, event,
@@ -165,7 +165,7 @@
while ((ev = xmlevents.expectStartElement
(FObjectNames.MARKER, XmlEvent.DISCARD_W_SPACE))
!= null) {
- new FoMarker(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoMarker(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numMarkers++;
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -176,7 +176,7 @@
while ((ev = xmlevents.expectStartElement
(FObjectNames.TABLE_ROW, XmlEvent.DISCARD_W_SPACE))
!= null) {
- new FoTableRow(getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ new FoTableRow(getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numRows++;
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
@@ -191,7 +191,7 @@
(FObjectNames.TABLE_CELL, XmlEvent.DISCARD_W_SPACE))
!= null) {
new FoTableCell(
- getFOTree(), this, (FoXMLEvent)ev, stateFlags);
+ getFOTree(), this, (FoXmlEvent)ev, stateFlags);
numCells++;
ev = xmlevents.getEndElement(
SyncedXmlEventsBuffer.DISCARD_EV, ev);
No revision
No revision
1.1.2.4 +3 -3 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoRegionBody.java 15 Jan 2004 03:01:53 -0000 1.1.2.3
+++ FoRegionBody.java 15 Jan 2004 03:10:58 -0000 1.1.2.4
@@ -125,7 +125,7 @@
/**
* @param foTree the FO tree being built
* @param parent the parent FONode of this node
- * @param event the <tt>FoXMLEvent</tt> that triggered the creation of
+ * @param event the <tt>FoXmlEvent</tt> that triggered the creation of
* this node
*/
public FoRegionBody(FOTree foTree, FONode parent, XmlEvent event)
No revision
No revision
1.1.2.4 +3 -3 xml-fop/src/java/org/apache/fop/fo/declarations/Attic/FoColorProfile.java
Index: FoColorProfile.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/declarations/Attic/FoColorProfile.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoColorProfile.java 15 Jan 2004 03:01:53 -0000 1.1.2.3
+++ FoColorProfile.java 15 Jan 2004 03:10:58 -0000 1.1.2.4
@@ -115,7 +115,7 @@
/**
* @param foTree the FO tree being built
* @param parent the parent FONode of this node
- * @param event the <tt>FoXMLEvent</tt> that triggered the creation of
+ * @param event the <tt>FoXmlEvent</tt> that triggered the creation of
* this node
*/
public FoColorProfile(FOTree foTree, FONode parent, XmlEvent event)
No revision
No revision
1.1.2.4 +4 -4 xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java
Index: FoXmlSerialHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoXmlSerialHandler.java 15 Jan 2004 03:01:53 -0000 1.1.2.3
+++ FoXmlSerialHandler.java 15 Jan 2004 03:10:58 -0000 1.1.2.4
@@ -277,7 +277,7 @@
event.type = XmlEvent.CHARACTERS;
event.chars = new String(ch, start, length);
// Can't setFoType, because this event is now an XmlEvent,
- // not an FoXMLEvent
+ // not an FoXmlEvent
//event.setFoType(FObjectNames.PCDATA);
//System.out.println("SerialHandler: " + event);
putEvent(event);
1.1.2.3 +6 -6 xml-fop/src/java/org/apache/fop/xml/Attic/Namespaces.java
Index: Namespaces.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/Namespaces.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Namespaces.java 15 Jan 2004 03:01:53 -0000 1.1.2.2
+++ Namespaces.java 15 Jan 2004 03:10:58 -0000 1.1.2.3
@@ -292,7 +292,7 @@
* @return an appropriate <code>XmlEvent</code>
*/
private XmlEvent newXMLEvent(int nsIndex) {
- // The only currently known subclass of XmlEvent is FoXMLEvent
+ // The only currently known subclass of XmlEvent is FoXmlEvent
switch (nsIndex) {
case DefAttrNSIndex :
// Produce an XmlEvent, e.g. for START_DOCUMENT and, more
@@ -303,11 +303,11 @@
return new XmlEvent(this, nsSequences[nsIndex], nsIndex);
}
case XSLNSpaceIndex :
- // Make an FoXMLEvent
+ // Make an FoXmlEvent
synchronized (nsSequences) {
nsSequences[nsIndex] =
++nsSequences[nsIndex] & nsSeqMasks[nsIndex];
- return new FoXMLEvent(this, nsSequences[nsIndex], nsIndex);
+ return new FoXmlEvent(this, nsSequences[nsIndex], nsIndex);
}
case FOXNSpaceIndex :
// No FoxXMLEvent defined - don't break, but fall through
No revision
Index: Namespaces.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/Namespaces.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Namespaces.java 15 Jan 2004 03:01:53 -0000 1.1.2.2
+++ Namespaces.java 15 Jan 2004 03:10:58 -0000 1.1.2.3
@@ -292,7 +292,7 @@
* @return an appropriate <code>XmlEvent</code>
*/
private XmlEvent newXMLEvent(int nsIndex) {
- // The only currently known subclass of XmlEvent is FoXMLEvent
+ // The only currently known subclass of XmlEvent is FoXmlEvent
switch (nsIndex) {
case DefAttrNSIndex :
// Produce an XmlEvent, e.g. for START_DOCUMENT and, more
@@ -303,11 +303,11 @@
return new XmlEvent(this, nsSequences[nsIndex], nsIndex);
}
case XSLNSpaceIndex :
- // Make an FoXMLEvent
+ // Make an FoXmlEvent
synchronized (nsSequences) {
nsSequences[nsIndex] =
++nsSequences[nsIndex] & nsSeqMasks[nsIndex];
- return new FoXMLEvent(this, nsSequences[nsIndex], nsIndex);
+ return new FoXmlEvent(this, nsSequences[nsIndex], nsIndex);
}
case FOXNSpaceIndex :
// No FoxXMLEvent defined - don't break, but fall through
No revision
Index: Namespaces.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/Namespaces.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Namespaces.java 15 Jan 2004 03:01:53 -0000 1.1.2.2
+++ Namespaces.java 15 Jan 2004 03:10:58 -0000 1.1.2.3
@@ -292,7 +292,7 @@
* @return an appropriate <code>XmlEvent</code>
*/
private XmlEvent newXMLEvent(int nsIndex) {
- // The only currently known subclass of XmlEvent is FoXMLEvent
+ // The only currently known subclass of XmlEvent is FoXmlEvent
switch (nsIndex) {
case DefAttrNSIndex :
// Produce an XmlEvent, e.g. for START_DOCUMENT and, more
@@ -303,11 +303,11 @@
return new XmlEvent(this, nsSequences[nsIndex], nsIndex);
}
case XSLNSpaceIndex :
- // Make an FoXMLEvent
+ // Make an FoXmlEvent
synchronized (nsSequences) {
nsSequences[nsIndex] =
++nsSequences[nsIndex] & nsSeqMasks[nsIndex];
- return new FoXMLEvent(this, nsSequences[nsIndex], nsIndex);
+ return new FoXmlEvent(this, nsSequences[nsIndex], nsIndex);
}
case FOXNSpaceIndex :
// No FoxXMLEvent defined - don't break, but fall through
1.1.2.1 +193 -0 xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlEvent.java
No revision
No revision
1.1.2.7 +10 -10 xml-fop/src/java/org/apache/fop/fo/Attic/FObjects.java
Index: FObjects.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FObjects.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FObjects.java 15 Jan 2004 03:01:54 -0000 1.1.2.6
+++ FObjects.java 15 Jan 2004 03:10:58 -0000 1.1.2.7
@@ -63,7 +63,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.Ints;
import org.apache.fop.fo.flow.FoPcdata;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.FoXmlEvent;
import org.apache.fop.xml.XmlEvent;
/**
@@ -150,7 +150,7 @@
new Class[] {
FOTree.class
,FONode.class
- ,FoXMLEvent.class
+ ,FoXmlEvent.class
,int.class
};
@@ -238,14 +238,14 @@
* known that no CHARACTERS event will be passed.
* @param foTree
* @param parent
- * @param event the <code>FoXMLEvent</code> event that triggered the
+ * @param event the <code>FoXmlEvent</code> event that triggered the
* generation of this FO
* @param stateFlags
* @return the new FO node
* @throws FOPException
*/
public Object makeFlowObject(FOTree foTree,
- FONode parent, FoXMLEvent event, int stateFlags)
+ FONode parent, FoXmlEvent event, int stateFlags)
throws FOPException
{
Class foclass;
@@ -282,7 +282,7 @@
/**
* This method generates generates new FO objects, including FoPcdata
* objects. It is more general in this sense than the overloaded
- * version which takes the <code>FoXMLEvent event</code> parameter.
+ * version which takes the <code>FoXmlEvent event</code> parameter.
* objects, which require an XmlEvent argument.
* @param foTree
* @param parent
@@ -296,9 +296,9 @@
FONode parent, XmlEvent event, int stateFlags)
throws FOPException
{
- if (event instanceof FoXMLEvent) {
+ if (event instanceof FoXmlEvent) {
return makeFlowObject(
- foTree, parent, (FoXMLEvent)event, stateFlags);
+ foTree, parent, (FoXmlEvent)event, stateFlags);
}
if (event.getType() != XmlEvent.CHARACTERS) {
throw new FOPException(
1.1.2.6 +6 -6 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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoRoot.java 15 Jan 2004 03:01:54 -0000 1.1.2.5
+++ FoRoot.java 15 Jan 2004 03:10:58 -0000 1.1.2.6
@@ -65,7 +65,7 @@
import org.apache.fop.fo.expr.PropertyException;
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.FoXmlEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.XmlEvent;
import org.apache.fop.xml.Namespaces;
@@ -199,14 +199,14 @@
if (ev == null)
throw new FOPException("No page-sequence found.");
firstPageSeq = numChildren();
- new FoPageSequence(getFOTree(), this, (FoXMLEvent)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, (FoXMLEvent)ev);
+ new FoPageSequence(getFOTree(), this, (FoXmlEvent)ev);
ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org