You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@apache.org on 2001/06/23 03:37:18 UTC

cvs commit: xml-xalan/java/src/org/apache/xalan/trace PrintTraceListener.java

sboag       01/06/22 18:37:17

  Modified:    java/src/org/apache/xalan/trace PrintTraceListener.java
  Log:
  Dump the filename in addition to line and column number.
  
  Revision  Changes    Path
  1.9       +35 -35    xml-xalan/java/src/org/apache/xalan/trace/PrintTraceListener.java
  
  Index: PrintTraceListener.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/trace/PrintTraceListener.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- PrintTraceListener.java	2001/06/15 17:54:06	1.8
  +++ PrintTraceListener.java	2001/06/23 01:37:15	1.9
  @@ -127,7 +127,7 @@
       case Constants.ELEMNAME_TEXTLITERALRESULT :
         if (m_traceElements)
         {
  -        m_pw.print("Line #" + ev.m_styleNode.getLineNumber() + ", "
  +        m_pw.print(ev.m_styleNode.getSystemId()+ " Line #" + ev.m_styleNode.getLineNumber() + ", "
                      + "Column #" + ev.m_styleNode.getColumnNumber() + " -- "
                      + ev.m_styleNode.getNodeName() + ": ");
   
  @@ -142,7 +142,7 @@
         {
           ElemTemplate et = (ElemTemplate) ev.m_styleNode;
   
  -        m_pw.print("Line #" + et.getLineNumber() + ", " + "Column #"
  +        m_pw.print(et.getSystemId()+ " Line #" + et.getLineNumber() + ", " + "Column #"
                      + et.getColumnNumber() + ": " + et.getNodeName() + " ");
   
           if (null != et.getMatch())
  @@ -161,7 +161,7 @@
       default :
         if (m_traceElements)
         {
  -        m_pw.println("Line #" + ev.m_styleNode.getLineNumber() + ", "
  +        m_pw.println(ev.m_styleNode.getSystemId()+ " Line #" + ev.m_styleNode.getLineNumber() + ", "
                        + "Column #" + ev.m_styleNode.getColumnNumber() + ": "
                        + ev.m_styleNode.getNodeName());
         }
  @@ -208,43 +208,43 @@
         }
         else
         {
  -        m_pw.print("Line #" + ev.m_styleNode.getLineNumber() + ", "
  +        m_pw.print(ev.m_styleNode.getSystemId()+ " Line #" + ev.m_styleNode.getLineNumber() + ", "
                      + "Column #" + ev.m_styleNode.getColumnNumber() + ": "
                      + ete.getNodeName() + ", " + ev.m_attributeName + "='"
                      + ev.m_xpath.getPatternString() + "': ");
         }
   
  -			if (ev.m_selection.getType() == ev.m_selection.CLASS_NODESET)
  -			{
  -				m_pw.println();
  -				
  -				org.apache.xml.dtm.DTMIterator nl = ev.m_selection.iter();
  -
  -				try
  -				{
  -					nl = nl.cloneWithReset();
  -				}
  -				catch(CloneNotSupportedException cnse)
  -				{
  -					m_pw.println("     [Can't trace nodelist because it it threw a CloneNotSupportedException]");
  -					return;
  -				}
  -				int pos = nl.nextNode();
  -
  -				if (DTM.NULL == pos)
  -				{
  -					m_pw.println("     [empty node list]");
  -				}
  -				else
  -				{
  -					while (DTM.NULL != pos)
  -					{
  -						m_pw.println("     " + ev.m_processor.getXPathContext().getDTM(pos).getNode(pos));
  -
  -						pos = nl.nextNode();
  -					}
  -				}        
  -			}
  +                        if (ev.m_selection.getType() == ev.m_selection.CLASS_NODESET)
  +                        {
  +                                m_pw.println();
  +                                
  +                                org.apache.xml.dtm.DTMIterator nl = ev.m_selection.iter();
  +
  +                                try
  +                                {
  +                                        nl = nl.cloneWithReset();
  +                                }
  +                                catch(CloneNotSupportedException cnse)
  +                                {
  +                                        m_pw.println("     [Can't trace nodelist because it it threw a CloneNotSupportedException]");
  +                                        return;
  +                                }
  +                                int pos = nl.nextNode();
  +
  +                                if (DTM.NULL == pos)
  +                                {
  +                                        m_pw.println("     [empty node list]");
  +                                }
  +                                else
  +                                {
  +                                        while (DTM.NULL != pos)
  +                                        {
  +                                                m_pw.println("     " + ev.m_processor.getXPathContext().getDTM(pos).getNode(pos));
  +
  +                                                pos = nl.nextNode();
  +                                        }
  +                                }        
  +                        }
         else
         {
           m_pw.println(ev.m_selection.str());
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org