sboag 01/03/11 13:58:47
Modified: java/src/org/apache/xalan/transformer QueuedEvents.java
QueuedStartElement.java ResultTreeHandler.java
Log:
The user for http://nagoya.apache.org/bugzilla/show_bug.cgi?id=741 reported
problems on testing, so these changes are a re-fix. He tested and
everything seems OK now. There actually may be a slight performance
improvement involved here.
Revision Changes Path
1.7 +10 -10
xml-xalan/java/src/org/apache/xalan/transformer/QueuedEvents.java
Index: QueuedEvents.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/QueuedEvents.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- QueuedEvents.java 2000/12/12 21:32:57 1.6
+++ QueuedEvents.java 2001/03/11 21:58:47 1.7
@@ -109,12 +109,12 @@
return (m_eventCount > 1) ? m_startElement : null;
}
- /**
- * This is for the derived class to init new events.
- *
- * @param qse Queud Sax event
- */
- protected abstract void initQSE(QueuedSAXEvent qse);
+// /**
+// * This is for the derived class to init new events.
+// *
+// * @param qse Queud Sax event
+// */
+// protected abstract void initQSE(QueuedSAXEvent qse);
/**
* To re-initialize the document and element events
@@ -122,8 +122,8 @@
*/
protected void reInitEvents()
{
- initQSE(m_startDoc);
- initQSE(m_startElement);
+ // initQSE(m_startDoc);
+ // initQSE(m_startElement);
}
/**
@@ -143,7 +143,7 @@
{
m_startDoc.setPending(true);
- initQSE(m_startDoc);
+ // initQSE(m_startDoc);
m_eventCount++;
}
@@ -162,7 +162,7 @@
{
m_startElement.setPending(ns, localName, name, atts);
- initQSE(m_startElement);
+ // initQSE(m_startElement);
m_eventCount++;
}
1.9 +1 -1
xml-xalan/java/src/org/apache/xalan/transformer/QueuedStartElement.java
Index: QueuedStartElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/QueuedStartElement.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- QueuedStartElement.java 2001/03/06 05:50:23 1.8
+++ QueuedStartElement.java 2001/03/11 21:58:47 1.9
@@ -187,7 +187,7 @@
super.setPending(true);
- if(m_isTransformClient)
+ if(m_isTransformClient && (null != m_transformer))
{
m_currentElement = m_transformer.getCurrentElement();
m_currentNode = m_transformer.getCurrentNode();
1.35 +22 -13
xml-xalan/java/src/org/apache/xalan/transformer/ResultTreeHandler.java
Index: ResultTreeHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/ResultTreeHandler.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ResultTreeHandler.java 2001/03/06 05:50:23 1.34
+++ ResultTreeHandler.java 2001/03/11 21:58:47 1.35
@@ -134,6 +134,8 @@
{
m_transformer = transformer;
+ m_startElement.setTransformer(m_transformer);
+ m_startDoc.setTransformer(m_transformer);
TraceManager tracer = transformer.getTraceManager();
@@ -141,8 +143,13 @@
m_tracer = tracer;
else
m_tracer = null;
+
+ m_startElement.setTraceManager(m_tracer);
+ m_startDoc.setTraceManager(m_tracer);
m_contentHandler = realHandler;
+ m_startElement.setContentHandler(m_contentHandler);
+ m_startDoc.setContentHandler(m_contentHandler);
if (m_contentHandler instanceof LexicalHandler)
m_lexicalHandler = (LexicalHandler) m_contentHandler;
@@ -197,7 +204,7 @@
qsd.setPending(false);
}
}
-
+
/**
* Bottleneck the startElement event. This is used to "pend" an
* element, so that attributes can still be added to it before
@@ -1059,19 +1066,19 @@
{
return m_nsSupport;
}
-
- /**
- * Override QueuedEvents#initQSE.
- *
- * @param qse Give queued Sax event
- */
- protected void initQSE(QueuedSAXEvent qse)
- {
- qse.setContentHandler(m_contentHandler);
- qse.setTransformer(m_transformer);
- qse.setTraceManager(m_tracer);
- }
+// /**
+// * Override QueuedEvents#initQSE.
+// *
+// * @param qse Give queued Sax event
+// */
+// protected void initQSE(QueuedSAXEvent qse)
+// {
+//
+// // qse.setContentHandler(m_contentHandler);
+// // qse.setTransformer(m_transformer);
+// // qse.setTraceManager(m_tracer);
+// }
/**
* Return the current content handler.
@@ -1099,6 +1106,8 @@
m_contentHandler = ch;
m_startElement.setIsTransformClient(m_contentHandler instanceof
TransformerClient);
+ m_startElement.setContentHandler(m_contentHandler);
+ m_startDoc.setContentHandler(m_contentHandler);
reInitEvents();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
