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:15:13 UTC
cvs commit: xml-fop/src/java/org/apache/fop/xml FoXMLSerialHandler.java
pbwest 2004/01/14 08:15:13
Modified: src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXMLSerialHandler.java
Log:
SyncedFoXmlEventsBuffer renamed to SyncedXmlEventsBuffer
Handling of character changed to use the DefAttNSpace and
to generate an XMLEvent rather than ah FoXMLEvent.
Revision Changes Path
No revision
No revision
1.1.2.3 +17 -15 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoXMLSerialHandler.java 10 Jan 2004 06:29:50 -0000 1.1.2.2
+++ FoXMLSerialHandler.java 14 Jan 2004 16:15:13 -0000 1.1.2.3
@@ -78,7 +78,7 @@
private static final String tag = "$Name$";
private static final String revision = "$Revision$";
- private SyncedFoXmlEventsBuffer events;
+ private SyncedXmlEventsBuffer events;
private XMLReader parser;
private XMLNamespaces namespaces;
private InputSource source;
@@ -91,7 +91,7 @@
* @param source the parser input source.
*/
public FoXMLSerialHandler
- (SyncedFoXmlEventsBuffer events, XMLReader parser, InputSource source)
+ (SyncedXmlEventsBuffer events, XMLReader parser, InputSource source)
{
this.events = events;
this.parser = parser;
@@ -127,7 +127,7 @@
/**
* Utility routine for the callback methods. It captures the
* <tt>InterruptedException</tt> that is possible from the <i>put</i>
- * method of a <tt>SyncedFoXmlEventsBuffer</tt>.
+ * method of a <tt>SyncedXmlEventsBuffer</tt>.
*/
public void putEvent(XMLEvent event) throws NoSuchElementException {
synchronized (events) {
@@ -177,7 +177,7 @@
private XMLEvent acquireXMLEvent(int nsIndex) {
try {
return
- namespaces.acquireXMLEvent(XMLNamespaces.DefAttrNSIndex);
+ namespaces.acquireXMLEvent(nsIndex);
} catch (FOPException ex) {
throw new RuntimeException(
"Namespace index " + nsIndex + " not recognized");
@@ -208,7 +208,7 @@
// + Thread.currentThread().getName());
event.type = XMLEvent.STARTELEMENT;
// Is this from the fo: namespace?
- event.uriIndex = namespaces.getURIIndex(uri);
+ event.uriIndex = uriIndex;
event.localName = localName;
//event.qName = qName;
event.attributes = new AttributesImpl(attributes);
@@ -265,18 +265,20 @@
{
synchronized (events) {
try {
- // TODO chars events are legitimate XSL-FO events
- // This may cause problems with other namespaces, and will have
- // to be checked as those namepsaces are implemented.
- // As SAX provides no URI information for chars, such
- // such discrimination may have to be done at a higher level.
+ // TODO chars events have no namespace, but a namespace is
+ // essential for subsequent processing. Use the default
+ // attribute namespace (the empty string), and rely on
+ // downstream processing to determine the environment in
+ // which the characters belong.
XMLEvent event
- = namespaces.acquireXMLEvent(XMLNamespaces.XSLNSpaceIndex);
+ = namespaces.acquireXMLEvent(XMLNamespaces.DefAttrNSIndex);
//System.out.println("characters thread "
// + Thread.currentThread().getName());
event.type = XMLEvent.CHARACTERS;
event.chars = new String(ch, start, length);
- event.setFoType(FObjectNames.PCDATA);
+ // Can't setFoType, because this event is now an XMLEvent,
+ // not an FoXMLEvent
+ //event.setFoType(FObjectNames.PCDATA);
//System.out.println("SerialHandler: " + event);
putEvent(event);
} catch (FOPException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org