You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mk...@apache.org on 2003/04/01 22:20:27 UTC

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

mkwan       2003/04/01 12:20:27

  Modified:    java/src/org/apache/xalan/trace GenerateEvent.java
                        PrintTraceListener.java
  Log:
  Merging XSLTC_DTM and common serializer to the head
  
  Changes in org.apache.xalan.trace.
  
  Revision  Changes    Path
  1.9       +0 -50     xml-xalan/java/src/org/apache/xalan/trace/GenerateEvent.java
  
  Index: GenerateEvent.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/trace/GenerateEvent.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- GenerateEvent.java	30 Jan 2003 18:45:54 -0000	1.8
  +++ GenerateEvent.java	1 Apr 2003 20:20:26 -0000	1.9
  @@ -86,56 +86,6 @@
      */
     public int m_eventtype;
   
  -  /**
  -   * Event type generated when a document begins.
  -   *
  -   */
  -  public static final int EVENTTYPE_STARTDOCUMENT = 1;
  -
  -  /**
  -   * Event type generated when a document ends.
  -   */
  -  public static final int EVENTTYPE_ENDDOCUMENT = 2;
  -
  -  /**
  -   * Event type generated when an element begins (after the attributes have been processed but before the children have been added).
  -   */
  -  public static final int EVENTTYPE_STARTELEMENT = 3;
  -
  -  /**
  -   * Event type generated when an element ends, after it's children have been added.
  -   */
  -  public static final int EVENTTYPE_ENDELEMENT = 4;
  -
  -  /**
  -   * Event type generated for character data (CDATA and Ignorable Whitespace have their own events).
  -   */
  -  public static final int EVENTTYPE_CHARACTERS = 5;
  -
  -  /**
  -   * Event type generated for ignorable whitespace (I'm not sure how much this is actually called.
  -   */
  -  public static final int EVENTTYPE_IGNORABLEWHITESPACE = 6;
  -
  -  /**
  -   * Event type generated for processing instructions.
  -   */
  -  public static final int EVENTTYPE_PI = 7;
  -
  -  /**
  -   * Event type generated after a comment has been added.
  -   */
  -  public static final int EVENTTYPE_COMMENT = 8;
  -
  -  /**
  -   * Event type generate after an entity ref is created.
  -   */
  -  public static final int EVENTTYPE_ENTITYREF = 9;
  -
  -  /**
  -   * Event type generated after CDATA is generated.
  -   */
  -  public static final int EVENTTYPE_CDATA = 10;
   
     /**
      * Character data from a character or cdata event.
  
  
  
  1.18      +11 -10    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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- PrintTraceListener.java	3 Feb 2003 15:52:50 -0000	1.17
  +++ PrintTraceListener.java	1 Apr 2003 20:20:26 -0000	1.18
  @@ -64,6 +64,7 @@
   import org.apache.xalan.templates.ElemTextLiteral;
   import org.apache.xml.dtm.DTM;
   import org.apache.xml.dtm.ref.DTMNodeProxy;
  +import org.apache.xml.serializer.SerializerTrace;
   
   import org.w3c.dom.Node;
   
  @@ -351,42 +352,42 @@
       {
         switch (ev.m_eventtype)
         {
  -      case GenerateEvent.EVENTTYPE_STARTDOCUMENT :
  +      case SerializerTrace.EVENTTYPE_STARTDOCUMENT :
           m_pw.println("STARTDOCUMENT");
           break;
  -      case GenerateEvent.EVENTTYPE_ENDDOCUMENT :
  +      case SerializerTrace.EVENTTYPE_ENDDOCUMENT :
           m_pw.println("ENDDOCUMENT");
           break;
  -      case GenerateEvent.EVENTTYPE_STARTELEMENT :
  +      case SerializerTrace.EVENTTYPE_STARTELEMENT :
           m_pw.println("STARTELEMENT: " + ev.m_name);
           break;
  -      case GenerateEvent.EVENTTYPE_ENDELEMENT :
  +      case SerializerTrace.EVENTTYPE_ENDELEMENT :
           m_pw.println("ENDELEMENT: " + ev.m_name);
           break;
  -      case GenerateEvent.EVENTTYPE_CHARACTERS :
  +      case SerializerTrace.EVENTTYPE_CHARACTERS :
         {
           String chars = new String(ev.m_characters, ev.m_start, ev.m_length);
   
           m_pw.println("CHARACTERS: " + chars);
         }
         break;
  -      case GenerateEvent.EVENTTYPE_CDATA :
  +      case SerializerTrace.EVENTTYPE_CDATA :
         {
           String chars = new String(ev.m_characters, ev.m_start, ev.m_length);
   
           m_pw.println("CDATA: " + chars);
         }
         break;
  -      case GenerateEvent.EVENTTYPE_COMMENT :
  +      case SerializerTrace.EVENTTYPE_COMMENT :
           m_pw.println("COMMENT: " + ev.m_data);
           break;
  -      case GenerateEvent.EVENTTYPE_PI :
  +      case SerializerTrace.EVENTTYPE_PI :
           m_pw.println("PI: " + ev.m_name + ", " + ev.m_data);
           break;
  -      case GenerateEvent.EVENTTYPE_ENTITYREF :
  +      case SerializerTrace.EVENTTYPE_ENTITYREF :
           m_pw.println("ENTITYREF: " + ev.m_name);
           break;
  -      case GenerateEvent.EVENTTYPE_IGNORABLEWHITESPACE :
  +      case SerializerTrace.EVENTTYPE_IGNORABLEWHITESPACE :
           m_pw.println("IGNORABLEWHITESPACE");
           break;
         }
  
  
  

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