You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/06/07 20:39:48 UTC

cvs commit: xml-xerces/c/src/xercesc/dom/impl DOMDocumentImpl.cpp DOMDocumentImpl.hpp DOMEntityImpl.cpp DOMEntityImpl.hpp

tng         2002/06/07 11:39:47

  Modified:    c/src/xercesc/dom/impl DOMDocumentImpl.cpp
                        DOMDocumentImpl.hpp DOMEntityImpl.cpp
                        DOMEntityImpl.hpp
  Log:
  DOM L3:
  1. Add Document::get/setActualEncoding, get/setEncoding, get/setVersion, get/setStandalone, get/setDocumentURI,
  2. Add Entity::get/setActualEncoding, get/setEncoding, get/setVersion
  
  Revision  Changes    Path
  1.4       +55 -3     xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.cpp
  
  Index: DOMDocumentImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DOMDocumentImpl.cpp	6 Jun 2002 21:02:17 -0000	1.3
  +++ DOMDocumentImpl.cpp	7 Jun 2002 18:39:47 -0000	1.4
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: DOMDocumentImpl.cpp,v 1.3 2002/06/06 21:02:17 tng Exp $
  + * $Id: DOMDocumentImpl.cpp,v 1.4 2002/06/07 18:39:47 tng Exp $
    */
   
   #include <xercesc/util/XMLUniDefs.hpp>
  @@ -125,7 +125,12 @@
         fUserData(0),
         fRanges(0),
         fChanges(0),
  -      fNodeListPool(0)
  +      fNodeListPool(0),
  +      fActualEncoding(0),
  +      fEncoding(0),
  +      fVersion(0),
  +      fStandalone(false),
  +      fDocumentURI(0)
   {
       fNamePool    = new (this) DOMStringPool(257, this);
   };
  @@ -149,7 +154,12 @@
         fUserData(0),
         fRanges(0),
         fChanges(0),
  -      fNodeListPool(0)
  +      fNodeListPool(0),
  +      fActualEncoding(0),
  +      fEncoding(0),
  +      fVersion(0),
  +      fStandalone(false),
  +      fDocumentURI(0)
   {
       fNamePool    = new (this) DOMStringPool(257, this);
       try {
  @@ -1014,5 +1024,47 @@
       }
   
       return retList;
  +}
  +
  +
  +//Introduced in DOM Level 3
  +const XMLCh* DOMDocumentImpl::getActualEncoding() const {
  +    return fActualEncoding;
  +}
  +
  +void DOMDocumentImpl::setActualEncoding(const XMLCh* actualEncoding){
  +    fActualEncoding = cloneString(actualEncoding);
  +}
  +
  +const XMLCh* DOMDocumentImpl::getEncoding() const {
  +    return fEncoding;
  +}
  +
  +void DOMDocumentImpl::setEncoding(const XMLCh* encoding){
  +    fEncoding = cloneString(encoding);
  +}
  +
  +bool DOMDocumentImpl::getStandalone() const{
  +    return fStandalone;
  +}
  +
  +void DOMDocumentImpl::setStandalone(bool standalone){
  +    fStandalone = standalone;
  +}
  +
  +const XMLCh* DOMDocumentImpl::getVersion() const {
  +    return fVersion;
  +}
  +
  +void DOMDocumentImpl::setVersion(const XMLCh* version){
  +    fVersion = cloneString(version);
  +}
  +
  +const XMLCh* DOMDocumentImpl::getDocumentURI() const {
  +    return fDocumentURI;
  +}
  +
  +void DOMDocumentImpl::setDocumentURI(const XMLCh* documentURI){
  +    fDocumentURI = cloneString(documentURI);
   }
   
  
  
  
  1.3       +21 -1     xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.hpp
  
  Index: DOMDocumentImpl.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMDocumentImpl.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DOMDocumentImpl.hpp	27 May 2002 18:25:41 -0000	1.2
  +++ DOMDocumentImpl.hpp	7 Jun 2002 18:39:47 -0000	1.3
  @@ -58,7 +58,7 @@
    */
   
   /*
  - * $Id: DOMDocumentImpl.hpp,v 1.2 2002/05/27 18:25:41 tng Exp $
  + * $Id: DOMDocumentImpl.hpp,v 1.3 2002/06/07 18:39:47 tng Exp $
    */
   
   //
  @@ -134,6 +134,13 @@
   
       bool                  errorChecking;    // Bypass error checking.
   
  +    // New data introduced in DOM Level 3
  +    XMLCh*                fActualEncoding;
  +    XMLCh*                fEncoding;
  +    bool                  fStandalone;
  +    XMLCh*                fVersion;
  +    XMLCh*                fDocumentURI;
  +
   
       // Per-Document heap Variables.
       //   The heap consists of one or more biggish blocks which are
  @@ -180,6 +187,7 @@
       // Add all functions that are pure virutal in DOMNODE
       DOMNODE_FUNCTIONS;
   
  +    // Add all functions that are pure virutal in DOMDocument
       virtual DOMAttr             *createAttribute(const XMLCh *name);
       virtual DOMCDATASection     *createCDATASection(const XMLCh *data);
       virtual DOMComment          *createComment(const XMLCh *data);
  @@ -269,6 +277,18 @@
       virtual DOMNodeList        *getElementsByTagNameNS(const XMLCh *namespaceURI,
   	                                              const XMLCh *localName) const;
       virtual DOMElement         *getElementById(const XMLCh *elementId) const;
  +
  +    //Introduced in DOM Level 3
  +    virtual const XMLCh*           getActualEncoding() const;
  +    virtual void                   setActualEncoding(const XMLCh* actualEncoding);
  +    virtual const XMLCh*           getEncoding() const;
  +    virtual void                   setEncoding(const XMLCh* encoding);
  +    virtual bool                   getStandalone() const;
  +    virtual void                   setStandalone(bool standalone);
  +    virtual const XMLCh*           getVersion() const;
  +    virtual void                   setVersion(const XMLCh* version);
  +    virtual const XMLCh*           getDocumentURI() const;
  +    virtual void                   setDocumentURI(const XMLCh* documentURI);
   
   
       //Return the index > 0 of ':' in the given qualified name qName="prefix:localName".
  
  
  
  1.2       +42 -3     xml-xerces/c/src/xercesc/dom/impl/DOMEntityImpl.cpp
  
  Index: DOMEntityImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMEntityImpl.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMEntityImpl.cpp	21 May 2002 20:29:32 -0000	1.1
  +++ DOMEntityImpl.cpp	7 Jun 2002 18:39:47 -0000	1.2
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: DOMEntityImpl.cpp,v 1.1 2002/05/21 20:29:32 tng Exp $
  + * $Id: DOMEntityImpl.cpp,v 1.2 2002/06/07 18:39:47 tng Exp $
    */
   
   #include <xercesc/dom/DOMException.hpp>
  @@ -66,7 +66,13 @@
   
   
   DOMEntityImpl::DOMEntityImpl(DOMDocument *ownerDoc, const XMLCh *eName)
  -   :  fNode(ownerDoc), fParent(ownerDoc), fPublicId(0), fSystemId(0)
  +   : fNode(ownerDoc),
  +     fParent(ownerDoc),
  +     fPublicId(0),
  +     fSystemId(0),
  +     fActualEncoding(0),
  +     fEncoding(0),
  +     fVersion(0)
   {
       fRefEntity  = 0;
       fName        = ((DOMDocumentImpl *)ownerDoc)->getPooledString(eName);
  @@ -75,7 +81,11 @@
   
   
   DOMEntityImpl::DOMEntityImpl(const DOMEntityImpl &other, bool deep)
  -    : fNode(other.fNode), fParent(other.fParent)
  +    : fNode(other.fNode),
  +      fParent(other.fParent),
  +      fActualEncoding(other.fActualEncoding),
  +      fEncoding(other.fEncoding),
  +      fVersion(other.fVersion)
   {
       fName            = other.fName;
       if (deep)
  @@ -232,3 +242,32 @@
                                                                               {return fNode.isSupported (feature, version); };
              void                DOMEntityImpl::setPrefix(const XMLCh  *prefix)         {fNode.setPrefix(prefix); };
              bool                DOMEntityImpl::hasAttributes() const                   {return fNode.hasAttributes(); };
  +
  +//Introduced in DOM Level 3
  +const XMLCh* DOMEntityImpl::getActualEncoding() const {
  +    return fActualEncoding;
  +}
  +
  +void DOMEntityImpl::setActualEncoding(const XMLCh* actualEncoding){
  +    DOMDocumentImpl *doc = (DOMDocumentImpl *)this->getOwnerDocument();
  +    fActualEncoding = doc->cloneString(actualEncoding);
  +}
  +
  +const XMLCh* DOMEntityImpl::getEncoding() const {
  +    return fEncoding;
  +}
  +
  +void DOMEntityImpl::setEncoding(const XMLCh* encoding){
  +    DOMDocumentImpl *doc = (DOMDocumentImpl *)this->getOwnerDocument();
  +    fEncoding = doc->cloneString(encoding);
  +}
  +
  +const XMLCh* DOMEntityImpl::getVersion() const {
  +    return fVersion;
  +}
  +
  +void DOMEntityImpl::setVersion(const XMLCh* version){
  +    DOMDocumentImpl *doc = (DOMDocumentImpl *)this->getOwnerDocument();
  +    fVersion = doc->cloneString(version);
  +}
  +
  
  
  
  1.2       +21 -6     xml-xerces/c/src/xercesc/dom/impl/DOMEntityImpl.hpp
  
  Index: DOMEntityImpl.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMEntityImpl.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMEntityImpl.hpp	21 May 2002 20:29:32 -0000	1.1
  +++ DOMEntityImpl.hpp	7 Jun 2002 18:39:47 -0000	1.2
  @@ -58,7 +58,7 @@
    */
   
   /*
  - * $Id: DOMEntityImpl.hpp,v 1.1 2002/05/21 20:29:32 tng Exp $
  + * $Id: DOMEntityImpl.hpp,v 1.2 2002/06/07 18:39:47 tng Exp $
    */
   
   //
  @@ -87,9 +87,16 @@
       const XMLCh *   fSystemId;
       const XMLCh *   fNotationName;
       DOMEntityReference*	fRefEntity;
  -	void	cloneEntityRefTree() const;
   
  -	friend class XercesDOMParser;
  +    // New data introduced in DOM Level 3
  +    XMLCh*                fActualEncoding;
  +    XMLCh*                fEncoding;
  +    XMLCh*                fVersion;
  +
  +    // private helper function
  +    void	cloneEntityRefTree() const;
  +
  +    friend class XercesDOMParser;
   
   public:
       DOMEntityImpl(DOMDocument *doc, const XMLCh *eName);
  @@ -107,9 +114,17 @@
       virtual void            setPublicId(const XMLCh *arg);
       virtual void            setSystemId(const XMLCh *arg);
   
  -	//DOM Level 2 additions. Non standard functions
  -	virtual void		setEntityRef(DOMEntityReference *);
  -	virtual DOMEntityReference*	getEntityRef() const;
  +    //DOM Level 2 additions. Non standard functions
  +    virtual void		setEntityRef(DOMEntityReference *);
  +    virtual DOMEntityReference*	getEntityRef() const;
  +
  +    //Introduced in DOM Level 3
  +    virtual const XMLCh*           getActualEncoding() const;
  +    virtual void                   setActualEncoding(const XMLCh* actualEncoding);
  +    virtual const XMLCh*           getEncoding() const;
  +    virtual void                   setEncoding(const XMLCh* encoding);
  +    virtual const XMLCh*           getVersion() const;
  +    virtual void                   setVersion(const XMLCh* version);
   };
   
   #endif
  
  
  

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