minchau 2003/05/09 11:47:57
Modified: java/src/org/apache/xml/serializer ToSAXHandler.java
ToTextStream.java ToHTMLStream.java
ToXMLSAXHandler.java ToXMLStream.java
ToHTMLSAXHandler.java ToTextSAXHandler.java
ToStream.java SerializerBase.java
Log:
Guarded the fireXXX(); calls to trace events with if (m_tracer != null),
strictly for performance reasons. This should run faster than making the call
and then checking.
Revision Changes Path
1.2 +8 -4
xml-xalan/java/src/org/apache/xml/serializer/ToSAXHandler.java
Index: ToSAXHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToSAXHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ToSAXHandler.java 1 Apr 2003 19:24:54 -0000 1.1
+++ ToSAXHandler.java 9 May 2003 18:47:56 -0000 1.2
@@ -176,7 +176,8 @@
m_lexHandler.comment(comment.toCharArray(), 0, comment.length());
// time to fire off comment event
- super.fireCommentEvent(comment.toCharArray(), 0,
comment.length());
+ if (m_tracer != null)
+ super.fireCommentEvent(comment.toCharArray(), 0,
comment.length());
}
}
@@ -237,7 +238,8 @@
}
// fire off the start element event
- super.fireStartElem(arg2);
+ if (m_tracer != null)
+ super.fireStartElem(arg2);
}
/**
@@ -338,7 +340,8 @@
}
// fire off the start element event
- super.fireStartElem(qName);
+ if (m_tracer != null)
+ super.fireStartElem(qName);
}
/**
@@ -353,7 +356,8 @@
m_state.resetState(getTransformer());
}
// fire off the start element event
- super.fireStartElem(qName);
+ if (m_tracer != null)
+ super.fireStartElem(qName);
}
/**
1.2 +22 -12
xml-xalan/java/src/org/apache/xml/serializer/ToTextStream.java
Index: ToTextStream.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToTextStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ToTextStream.java 1 Apr 2003 19:24:54 -0000 1.1
+++ ToTextStream.java 9 May 2003 18:47:56 -0000 1.2
@@ -126,7 +126,8 @@
{
flushPending();
flushWriter();
- super.fireEndDoc();
+ if (m_tracer != null)
+ super.fireEndDoc();
}
/**
@@ -169,7 +170,8 @@
m_currentElemDepth++;
// time to fire off startElement event
- super.fireStartElem(name);
+ if (m_tracer != null)
+ super.fireStartElem(name);
return;
}
@@ -203,7 +205,8 @@
throws org.xml.sax.SAXException
{
m_currentElemDepth--;
- super.fireEndElem(name);
+ if (m_tracer != null)
+ super.fireEndElem(name);
}
/**
@@ -241,7 +244,8 @@
try
{
writeNormalizedChars(ch, start, length, false);
- super.fireCharEvent(ch, start, length);
+ if (m_tracer != null)
+ super.fireCharEvent(ch, start, length);
}
catch(IOException ioe)
{
@@ -416,7 +420,8 @@
try
{
writeNormalizedChars(ch, start, length, false);
- super.fireCDATAEvent(ch, start, length);
+ if (m_tracer != null)
+ super.fireCDATAEvent(ch, start, length);
}
catch(IOException ioe)
{
@@ -487,8 +492,10 @@
throws org.xml.sax.SAXException
{
// flush anything pending first
- flushPending();
- super.fireEscapingEvent(target, data);
+ flushPending();
+
+ if (m_tracer != null)
+ super.fireEscapingEvent(target, data);
}
/**
@@ -522,8 +529,8 @@
{
flushPending();
-
- super.fireCommentEvent(ch, start, length);
+ if (m_tracer != null)
+ super.fireCommentEvent(ch, start, length);
}
/**
@@ -535,7 +542,8 @@
*/
public void entityReference(String name) throws org.xml.sax.SAXException
{
- super.fireEntityReference(name);
+ if (m_tracer != null)
+ super.fireEntityReference(name);
}
/**
@@ -565,7 +573,8 @@
public void endElement(String elemName) throws SAXException
{
m_currentElemDepth--;
- super.fireEndElem(elemName);
+ if (m_tracer != null)
+ super.fireEndElem(elemName);
}
/**
@@ -582,7 +591,8 @@
if (m_needToCallStartDocument)
startDocumentInternal();
// time to fire off startlement event.
- super.fireStartElem(elementName);
+ if (m_tracer != null)
+ super.fireStartElem(elementName);
return;
}
1.5 +11 -6
xml-xalan/java/src/org/apache/xml/serializer/ToHTMLStream.java
Index: ToHTMLStream.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToHTMLStream.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ToHTMLStream.java 3 May 2003 01:41:58 -0000 1.4
+++ ToHTMLStream.java 9 May 2003 18:47:56 -0000 1.5
@@ -700,8 +700,8 @@
}
flushWriter();
-
- super.fireEndDoc();
+ if (m_tracer != null)
+ super.fireEndDoc();
}
/**
@@ -955,7 +955,9 @@
m_elementLocalName = null;
// fire off the end element event
- super.fireEndElem(name);
+
+ if (m_tracer != null)
+ super.fireEndElem(name);
}
@@ -1381,7 +1383,8 @@
// m_writer.write("]]>");
// time to generate characters event
- super.fireCharEvent(chars, start, length);
+ if (m_tracer != null)
+ super.fireCharEvent(chars, start, length);
return;
}
@@ -1533,7 +1536,8 @@
}
// now generate the PI event
- super.fireEscapingEvent(target, data);
+ if (m_tracer != null)
+ super.fireEscapingEvent(target, data);
}
/**
@@ -1581,7 +1585,8 @@
{
// finish processing attributes, time to fire off the start element
event
- super.fireStartElem(m_elementName);
+ if (m_tracer != null)
+ super.fireStartElem(m_elementName);
int nAttrs = 0;
if ((nAttrs = m_attributes.getLength()) > 0)
1.3 +10 -5
xml-xalan/java/src/org/apache/xml/serializer/ToXMLSAXHandler.java
Index: ToXMLSAXHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToXMLSAXHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ToXMLSAXHandler.java 1 May 2003 14:49:08 -0000 1.2
+++ ToXMLSAXHandler.java 9 May 2003 18:47:56 -0000 1.3
@@ -228,7 +228,8 @@
// Close output document
m_saxHandler.endDocument();
- super.fireEndDoc();
+ if (m_tracer != null)
+ super.fireEndDoc();
}
/**
@@ -298,7 +299,8 @@
m_saxHandler.endElement(namespaceURI, localName, qName);
- super.fireEndElem(qName);
+ if (m_tracer != null)
+ super.fireEndElem(qName);
/* Pop all namespaces at the current element depth.
* We are not waiting for official endPrefixMapping() calls.
@@ -438,7 +440,8 @@
if (m_lexHandler != null)
m_lexHandler.comment(arg0, arg1, arg2);
- super.fireCommentEvent(arg0, arg1, arg2);
+ if (m_tracer != null)
+ super.fireCommentEvent(arg0, arg1, arg2);
}
/**
@@ -535,7 +538,8 @@
}
// time to generate characters event
- fireCharEvent(ch, off, len);
+ if (m_tracer != null)
+ fireCharEvent(ch, off, len);
}
@@ -576,7 +580,8 @@
// we don't want to leave serializer to fire off this event,
// so do it here.
- super.fireEscapingEvent(target, data);
+ if (m_tracer != null)
+ super.fireEscapingEvent(target, data);
}
/**
1.2 +12 -3
xml-xalan/java/src/org/apache/xml/serializer/ToXMLStream.java
Index: ToXMLStream.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToXMLStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ToXMLStream.java 1 Apr 2003 19:24:54 -0000 1.1
+++ ToXMLStream.java 9 May 2003 18:47:56 -0000 1.2
@@ -228,7 +228,9 @@
}
flushWriter();
- super.fireEndDoc();
+
+ if (m_tracer != null)
+ super.fireEndDoc();
}
/**
@@ -298,7 +300,10 @@
try
{
if (m_startTagOpen)
+ {
closeStartTag();
+ m_startTagOpen = false;
+ }
if (shouldIndent())
indent();
@@ -350,7 +355,9 @@
throw new SAXException(e);
}
}
- super.fireEscapingEvent(target, data);
+
+ if (m_tracer != null)
+ super.fireEscapingEvent(target, data);
}
/**
@@ -381,7 +388,9 @@
{
throw new SAXException(e);
}
- super.fireEntityReference(name);
+
+ if (m_tracer != null)
+ super.fireEntityReference(name);
}
1.2 +13 -6
xml-xalan/java/src/org/apache/xml/serializer/ToHTMLSAXHandler.java
Index: ToHTMLSAXHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToHTMLSAXHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ToHTMLSAXHandler.java 1 Apr 2003 19:24:54 -0000 1.1
+++ ToHTMLSAXHandler.java 9 May 2003 18:47:56 -0000 1.2
@@ -288,7 +288,8 @@
m_saxHandler.endElement(uri, localName, qName);
// time to fire off endElement event
- super.fireEndElem(qName);
+ if (m_tracer != null)
+ super.fireEndElem(qName);
}
/**
@@ -334,7 +335,9 @@
m_saxHandler.processingInstruction(arg0,arg1);
// time to fire off processing instruction event
- super.fireEscapingEvent(arg0,arg1);
+
+ if (m_tracer != null)
+ super.fireEscapingEvent(arg0,arg1);
}
/**
@@ -407,7 +410,8 @@
m_lexHandler.comment(ch, start, length);
// time to fire off comment event
- super.fireCommentEvent(ch, start, length);
+ if (m_tracer != null)
+ super.fireCommentEvent(ch, start, length);
return;
}
@@ -467,7 +471,8 @@
// Close output document
m_saxHandler.endDocument();
- super.fireEndDoc();
+ if (m_tracer != null)
+ super.fireEndDoc();
}
/**
@@ -605,7 +610,8 @@
m_saxHandler.endElement(EMPTYSTRING, elementName, elementName);
// time to fire off endElement event
- super.fireEndElem(elementName);
+ if (m_tracer != null)
+ super.fireEndElem(elementName);
}
/**
@@ -644,7 +650,8 @@
m_saxHandler.characters(ch, off, len);
// time to fire off characters event
- super.fireCharEvent(ch, off, len);
+ if (m_tracer != null)
+ super.fireCharEvent(ch, off, len);
}
/**
1.2 +13 -7
xml-xalan/java/src/org/apache/xml/serializer/ToTextSAXHandler.java
Index: ToTextSAXHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToTextSAXHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ToTextSAXHandler.java 1 Apr 2003 19:24:54 -0000 1.1
+++ ToTextSAXHandler.java 9 May 2003 18:47:56 -0000 1.2
@@ -87,7 +87,8 @@
*/
public void endElement(String elemName) throws SAXException
{
- super.fireEndElem(elemName);
+ if (m_tracer != null)
+ super.fireEndElem(elemName);
}
/**
@@ -96,7 +97,8 @@
public void endElement(String arg0, String arg1, String arg2)
throws SAXException
{
- super.fireEndElem(arg2);
+ if (m_tracer != null)
+ super.fireEndElem(arg2);
}
public ToTextSAXHandler(ContentHandler hdlr, LexicalHandler lex, String
encoding)
@@ -115,7 +117,8 @@
public void comment(char ch[], int start, int length)
throws org.xml.sax.SAXException
{
- super.fireCommentEvent(ch, start, length);
+ if (m_tracer != null)
+ super.fireCommentEvent(ch, start, length);
}
public void comment(String data) throws org.xml.sax.SAXException
@@ -277,7 +280,8 @@
public void processingInstruction(String arg0, String arg1)
throws SAXException
{
- super.fireEscapingEvent(arg0,arg1);
+ if (m_tracer != null)
+ super.fireEscapingEvent(arg0, arg1);
}
/**
@@ -365,8 +369,9 @@
flushPending();
m_saxHandler.endDocument();
-
- super.fireEndDoc();
+
+ if (m_tracer != null)
+ super.fireEndDoc();
}
/**
@@ -391,7 +396,8 @@
m_saxHandler.characters(characters, offset, length);
// time to fire off characters event
- super.fireCharEvent(characters, offset, length);
+ if (m_tracer != null)
+ super.fireCharEvent(characters, offset, length);
}
/**
1.5 +14 -7
xml-xalan/java/src/org/apache/xml/serializer/ToStream.java
Index: ToStream.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToStream.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ToStream.java 6 May 2003 19:24:07 -0000 1.4
+++ ToStream.java 9 May 2003 18:47:56 -0000 1.5
@@ -1308,7 +1308,8 @@
}
// time to fire off CDATA event
- super.fireCDATAEvent(ch, old_start, length);
+ if (m_tracer != null)
+ super.fireCDATAEvent(ch, old_start, length);
}
catch (IOException ioe)
{
@@ -1400,7 +1401,8 @@
{
// Even though the character string is empty, but it is still a
character event
// time to fire off characters generation event
- super.fireCharEvent(chars, start, length);
+ if (m_tracer != null)
+ super.fireCharEvent(chars, start, length);
return;
}
@@ -1433,7 +1435,8 @@
charactersRaw(chars, start, length);
// time to fire off characters generation event
- super.fireCharEvent(chars, start, length);
+ if (m_tracer != null)
+ super.fireCharEvent(chars, start, length);
return;
}
@@ -1526,7 +1529,8 @@
}
// time to fire off characters generation event
- super.fireCharEvent(chars, start, length);
+ if (m_tracer != null)
+ super.fireCharEvent(chars, start, length);
}
/**
@@ -1833,7 +1837,8 @@
{
// finish processing attributes, time to fire off the start element
event
- super.fireStartElem(m_elementName);
+ if (m_tracer != null)
+ super.fireStartElem(m_elementName);
int nAttrs = 0;
// if passed real SAX attributes, then process only them
@@ -1989,7 +1994,8 @@
m_elementLocalName = null;
// fire off the end element event
- super.fireEndElem(name);
+ if (m_tracer != null)
+ super.fireEndElem(name);
}
/**
@@ -2174,7 +2180,8 @@
m_startNewLine = true;
// time to generate comment event
- super.fireCommentEvent(ch, start_old,length);
+ if (m_tracer != null)
+ super.fireCommentEvent(ch, start_old,length);
}
/**
1.4 +6 -3
xml-xalan/java/src/org/apache/xml/serializer/SerializerBase.java
Index: SerializerBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/SerializerBase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SerializerBase.java 6 May 2003 19:25:30 -0000 1.3
+++ SerializerBase.java 9 May 2003 18:47:56 -0000 1.4
@@ -521,7 +521,8 @@
m_inExternalDTD = false;
m_inEntityRef = false;
- this.fireEndEntity(name);
+ if (m_tracer != null)
+ this.fireEndEntity(name);
}
/**
@@ -961,7 +962,8 @@
startEntity(name);
endEntity(name);
- fireEntityReference(name);
+ if (m_tracer != null)
+ fireEntityReference(name);
}
/**
@@ -1264,7 +1266,8 @@
*/
protected void startDocumentInternal() throws org.xml.sax.SAXException
{
- this.fireStartDoc();
+ if (m_tracer != null)
+ this.fireStartDoc();
}
/**
* This method is used to set the source locator, which might be used to
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
