You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2002/03/21 16:36:05 UTC

cvs commit: xml-xerces/c/src/xercesc/parsers IDOMParser.cpp IDOMParser.hpp

knoaman     02/03/21 07:36:05

  Modified:    c/src/xercesc/parsers IDOMParser.cpp IDOMParser.hpp
  Log:
  Add support for reporting line/column numbers of schema errors.
  
  Revision  Changes    Path
  1.2       +10 -4     xml-xerces/c/src/xercesc/parsers/IDOMParser.cpp
  
  Index: IDOMParser.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/IDOMParser.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IDOMParser.cpp	1 Feb 2002 22:22:05 -0000	1.1
  +++ IDOMParser.cpp	21 Mar 2002 15:36:05 -0000	1.2
  @@ -59,7 +59,7 @@
   *  handler with the scanner. In these handler methods, appropriate IDOM nodes
   *  are created and added to the DOM tree.
   *
  -* $Id: IDOMParser.cpp,v 1.1 2002/02/01 22:22:05 peiyongz Exp $
  +* $Id: IDOMParser.cpp,v 1.2 2002/03/21 15:36:05 knoaman Exp $
   *
   */
   
  @@ -697,7 +697,7 @@
               fScanner->getURIText(urlId, buf);   //get namespaceURI
               namespaceURI = buf.getRawBuffer();
           }
  -        elem = fDocument->createElementNS(namespaceURI, elemDecl.getFullName());
  +        elem = createElementNSNode(namespaceURI, elemDecl.getFullName());
           IDElementImpl *elemImpl = (IDElementImpl *) elem;
           for (unsigned int index = 0; index < attrCount; ++index) {
               static const XMLCh XMLNS[] = {
  @@ -818,8 +818,14 @@
       // placehold for DOM Level 3
   }
   
  -
  -
  +// ---------------------------------------------------------------------------
  +//  IDOMParser: Helper methods
  +// ---------------------------------------------------------------------------
  +IDOM_Element* IDOMParser::createElementNSNode(const XMLCh *namespaceURI,
  +                                              const XMLCh *qualifiedName)
  +{
  +    return fDocument->createElementNS(namespaceURI, qualifiedName);
  +}
   // ---------------------------------------------------------------------------
   //  IDOMParser: Deprecated methods
   // ---------------------------------------------------------------------------
  
  
  
  1.3       +19 -3     xml-xerces/c/src/xercesc/parsers/IDOMParser.hpp
  
  Index: IDOMParser.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/IDOMParser.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IDOMParser.hpp	20 Feb 2002 18:17:01 -0000	1.2
  +++ IDOMParser.hpp	21 Mar 2002 15:36:05 -0000	1.3
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: IDOMParser.hpp,v 1.2 2002/02/20 18:17:01 tng Exp $
  + * $Id: IDOMParser.hpp,v 1.3 2002/03/21 15:36:05 knoaman Exp $
    *
    */
   
  @@ -80,6 +80,7 @@
   class XMLValidator;
   class IDDocumentImpl;
   class IDDocumentTypeImpl;
  +class IDOM_Element;
   
   
   /**
  @@ -131,7 +132,7 @@
       /**
         * Destructor
         */
  -    ~IDOMParser();
  +    virtual ~IDOMParser();
   
       //@}
   
  @@ -1418,6 +1419,22 @@
       void setDocument(IDOM_Document* toSet);
       //@}
   
  +    // -----------------------------------------------------------------------
  +    //  Protected Helper methods
  +    // -----------------------------------------------------------------------
  +    virtual IDOM_Element* createElementNSNode(const XMLCh *fNamespaceURI,
  +                                              const XMLCh *qualifiedName);
  +
  +
  +    // -----------------------------------------------------------------------
  +    //  Protected data members
  +    //
  +    //  fScanner
  +    //      The scanner used for this parser. This is created during the
  +    //      constructor.
  +    // -----------------------------------------------------------------------
  +    XMLScanner*              fScanner;
  +
   
   private :
       // -----------------------------------------------------------------------
  @@ -1477,7 +1494,6 @@
       bool                     fIncludeIgnorableWhitespace;
       ValueStackOf<IDOM_Node*>* fNodeStack;
       bool                     fParseInProgress;
  -    XMLScanner*              fScanner;
       bool                     fWithinElement;
       IDDocumentTypeImpl*      fDocumentType;
       RefVectorOf<IDDocumentImpl>* fDocumentVector;
  
  
  

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