pbwest 2004/01/14 07:23:30
Modified: src/java/org/apache/fop/fo/declarations Tag:
FOP_0-20-0_Alt-Design FoDeclarations.java
Log:
SyncedFoXmlEventsBuffer renamed to SyncedXmlEventsBuffer
Constructor signature change
Some instances of FoXMLEvent changed to XMLEvent
Changes to signatures of FO constructors reflected here
Revision Changes Path
No revision
No revision
1.1.2.3 +8 -9
xml-fop/src/java/org/apache/fop/fo/declarations/Attic/FoDeclarations.java
Index: FoDeclarations.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/declarations/Attic/FoDeclarations.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoDeclarations.java 10 Jan 2004 06:29:50 -0000 1.1.2.2
+++ FoDeclarations.java 14 Jan 2004 15:23:30 -0000 1.1.2.3
@@ -64,8 +64,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;
/**
@@ -111,20 +110,20 @@
* this node
*/
public FoDeclarations
- (FOTree foTree, FONode parent, FoXMLEvent event)
+ (FOTree foTree, FONode parent, XMLEvent event)
throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.DECLARATIONS, parent, event,
FONode.DECLARATIONS_SET, sparsePropsMap, sparseIndices);
try {
- FoXMLEvent ev =
+ XMLEvent ev =
xmlevents.expectStartElement
(FObjectNames.COLOR_PROFILE, XMLEvent.DISCARD_W_SPACE);
if (ev == null)
throw new FOPException
("No fo:color-profile in fo:declarations.");
new FoColorProfile(foTree, this, ev);
- ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
+ ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
do {
ev = xmlevents.expectStartElement
@@ -132,7 +131,7 @@
if (ev == null) break; // No instance of these elements found
new FoColorProfile(foTree, this, ev);
// 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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
