You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by el...@apache.org on 2002/09/25 01:07:52 UTC

cvs commit: xml-xerces/java/samples/xni/parser CSVConfiguration.java

elena       2002/09/24 16:07:52

  Modified:    java/samples/xni DocumentTracer.java PSVIWriter.java
                        PassThroughFilter.java
               java/samples/xni/parser CSVConfiguration.java
  Log:
  Update XNI samples:
  added xni.NamespaceContext to the XMLDocumentHandler.startDocument()
  Need to update DocumentTracer to print out current namespace information
  per element.
  
  Revision  Changes    Path
  1.19      +4 -2      xml-xerces/java/samples/xni/DocumentTracer.java
  
  Index: DocumentTracer.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/samples/xni/DocumentTracer.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- DocumentTracer.java	24 Sep 2002 22:36:50 -0000	1.18
  +++ DocumentTracer.java	24 Sep 2002 23:07:52 -0000	1.19
  @@ -66,6 +66,7 @@
   import org.apache.xerces.impl.Constants;
   import org.apache.xerces.util.ObjectFactory;
   import org.apache.xerces.parsers.XMLDocumentParser;
  +import org.apache.xerces.xni.NamespaceContext;
   import org.apache.xerces.xni.Augmentations;
   import org.apache.xerces.xni.QName;
   import org.apache.xerces.xni.XMLAttributes;
  @@ -214,7 +215,8 @@
        *
        * @throws XNIException Thrown by handler to signal an error.
        */
  -    public void startDocument(XMLLocator locator, String encoding, Augmentations augs)
  +    public void startDocument(XMLLocator locator, String encoding, 
  +                              NamespaceContext namespaceContext, Augmentations augs)
           throws XNIException {
   
           fIndent = 0;
  
  
  
  1.12      +4 -6      xml-xerces/java/samples/xni/PSVIWriter.java
  
  Index: PSVIWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/samples/xni/PSVIWriter.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- PSVIWriter.java	24 Sep 2002 09:39:43 -0000	1.11
  +++ PSVIWriter.java	24 Sep 2002 23:07:52 -0000	1.12
  @@ -442,12 +442,10 @@
   
       /**
        * The start of the document.
  -     *
  -     * @param augs   Additional information that may include infoset augmentations
  -     *
        * @throws XNIException Thrown by handler to signal an error.
        */
  -    public void startDocument(XMLLocator locator, String encoding, Augmentations augs)
  +    public void startDocument(XMLLocator locator, String encoding, 
  +                              NamespaceContext namespaceContext, Augmentations augs)
       throws XNIException {
           if (fPSVInfoset) {
               printIndentTag("<document"+
  @@ -456,7 +454,7 @@
                              " xmlns='http://www.w3.org/2001/05/XMLInfoset'>");
           }
           if (fDocumentHandler != null) {
  -            fDocumentHandler.startDocument(locator, encoding, augs);
  +            fDocumentHandler.startDocument(locator, encoding, namespaceContext, augs);
           }
       } // startDocument(XMLLocator,String)
   
  
  
  
  1.7       +5 -3      xml-xerces/java/samples/xni/PassThroughFilter.java
  
  Index: PassThroughFilter.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/samples/xni/PassThroughFilter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PassThroughFilter.java	16 Aug 2002 18:13:31 -0000	1.6
  +++ PassThroughFilter.java	24 Sep 2002 23:07:52 -0000	1.7
  @@ -59,6 +59,7 @@
   
   import org.apache.xerces.xni.Augmentations;
   import org.apache.xerces.xni.QName;
  +import org.apache.xerces.xni.NamespaceContext;
   import org.apache.xerces.xni.XMLAttributes;
   import org.apache.xerces.xni.XMLDocumentHandler;
   import org.apache.xerces.xni.XMLLocator;
  @@ -128,10 +129,11 @@
        *     
        * @throws XNIException Thrown by handler to signal an error.
        */
  -    public void startDocument(XMLLocator locator, String encoding, Augmentations augs)
  +    public void startDocument(XMLLocator locator, String encoding, 
  +                              NamespaceContext namespaceContext, Augmentations augs)
           throws XNIException {
           if (fDocumentHandler != null) {
  -            fDocumentHandler.startDocument(locator, encoding, augs);
  +            fDocumentHandler.startDocument(locator, encoding, namespaceContext, augs);
   	    }
       } // startDocument(XMLLocator,String)
       
  
  
  
  1.6       +3 -2      xml-xerces/java/samples/xni/parser/CSVConfiguration.java
  
  Index: CSVConfiguration.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/samples/xni/parser/CSVConfiguration.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CSVConfiguration.java	29 Jan 2002 01:15:06 -0000	1.5
  +++ CSVConfiguration.java	24 Sep 2002 23:07:52 -0000	1.6
  @@ -65,6 +65,7 @@
   import java.util.StringTokenizer;
   
   import org.apache.xerces.util.AugmentationsImpl;
  +import org.apache.xerces.util.NamespaceSupport;
   import org.apache.xerces.util.XMLAttributesImpl;
   import org.apache.xerces.util.XMLStringBuffer;
   
  @@ -186,7 +187,7 @@
   
           // start document
           if (fDocumentHandler != null) {
  -            fDocumentHandler.startDocument(null, "UTF-8", null);
  +            fDocumentHandler.startDocument(null, "UTF-8", new NamespaceSupport(), null);
               fDocumentHandler.xmlDecl("1.0", "UTF-8", "true", null);
               fDocumentHandler.doctypeDecl("csv", null, null, null);
           }
  
  
  

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