pbwest 2004/01/14 07:07:46
Modified: src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOAttributes.java
Log:
Changed constructor signature to take XMLEvent instead of FoXMLEvent
Test for CHARACTERS event now performed using event.type rather than event.foType
Revision Changes Path
No revision
No revision
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/Attic/FOAttributes.java
Index: FOAttributes.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FOAttributes.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FOAttributes.java 5 Jan 2004 02:52:09 -0000 1.1.2.4
+++ FOAttributes.java 14 Jan 2004 15:07:46 -0000 1.1.2.5
@@ -68,7 +68,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.Ints;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.XMLEvent;
import org.apache.fop.xml.XMLNamespaces;
/**
@@ -135,7 +135,7 @@
* @param foNode - the <tt>FONode</tt> with which these attributes are
* associated.
*/
- public FOAttributes(FoXMLEvent event, FONode foNode) throws FOPException {
+ public FOAttributes(XMLEvent event, FONode foNode) throws FOPException {
// If the event is null, there is no event associated with this
// node, probably because this is a manufactured node; e.g.,
@@ -143,7 +143,7 @@
// includes an empty foAttrMap HashMap.
if (event == null) return;
- if (event.getFoType() == FObjectNames.PCDATA)
+ if (event.getType() == XMLEvent.CHARACTERS)
return; // go with the empty foAttrMap
// Create the foAttrMap.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
