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/03/14 23:04:06 UTC

cvs commit: xml-xerces/c/src/xercesc/idom IDAttrImpl.cpp IDDocumentFragmentImpl.cpp IDDocumentImpl.cpp IDDocumentTypeImpl.cpp IDElementImpl.cpp IDEntityImpl.cpp IDEntityReferenceImpl.cpp

tng         02/03/14 14:04:06

  Modified:    c/src/xercesc/idom IDAttrImpl.cpp IDDocumentFragmentImpl.cpp
                        IDDocumentImpl.cpp IDDocumentTypeImpl.cpp
                        IDElementImpl.cpp IDEntityImpl.cpp
                        IDEntityReferenceImpl.cpp
  Log:
  Certain IDOM Node should call fParent.normalize().
  
  Revision  Changes    Path
  1.3       +2 -2      xml-xerces/c/src/xercesc/idom/IDAttrImpl.cpp
  
  Index: IDAttrImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/idom/IDAttrImpl.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IDAttrImpl.cpp	4 Feb 2002 21:20:59 -0000	1.2
  +++ IDAttrImpl.cpp	14 Mar 2002 22:04:05 -0000	1.3
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: IDAttrImpl.cpp,v 1.2 2002/02/04 21:20:59 tng Exp $
  + * $Id: IDAttrImpl.cpp,v 1.3 2002/03/14 22:04:05 tng Exp $
    */
   
   #include "IDAttrImpl.hpp"
  @@ -254,7 +254,7 @@
              bool                IDAttrImpl::hasChildNodes() const                   {return fParent.hasChildNodes (); };
              IDOM_Node          *IDAttrImpl::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
                                                                                      {return fParent.insertBefore (newChild, refChild); };
  -           void                IDAttrImpl::normalize()                             {fNode.normalize (); };
  +           void                IDAttrImpl::normalize()                             {fParent.normalize (); };
              IDOM_Node          *IDAttrImpl::removeChild(IDOM_Node *oldChild)        {return fParent.removeChild (oldChild); };
              IDOM_Node          *IDAttrImpl::replaceChild(IDOM_Node *newChild, IDOM_Node *oldChild)
                                                                                      {return fParent.replaceChild (newChild, oldChild); };
  
  
  
  1.3       +2 -2      xml-xerces/c/src/xercesc/idom/IDDocumentFragmentImpl.cpp
  
  Index: IDDocumentFragmentImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/idom/IDDocumentFragmentImpl.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IDDocumentFragmentImpl.cpp	4 Feb 2002 21:20:59 -0000	1.2
  +++ IDDocumentFragmentImpl.cpp	14 Mar 2002 22:04:05 -0000	1.3
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: IDDocumentFragmentImpl.cpp,v 1.2 2002/02/04 21:20:59 tng Exp $
  + * $Id: IDDocumentFragmentImpl.cpp,v 1.3 2002/03/14 22:04:05 tng Exp $
    */
   
   #include "IDDocumentFragmentImpl.hpp"
  @@ -133,7 +133,7 @@
              bool                IDDocumentFragmentImpl::hasChildNodes() const                   {return fParent.hasChildNodes (); };
              IDOM_Node          *IDDocumentFragmentImpl::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
                                                                               {return fParent.insertBefore (newChild, refChild); };
  -           void                IDDocumentFragmentImpl::normalize()                             {fNode.normalize (); };
  +           void                IDDocumentFragmentImpl::normalize()                             {fParent.normalize (); };
              IDOM_Node          *IDDocumentFragmentImpl::removeChild(IDOM_Node *oldChild)        {return fParent.removeChild (oldChild); };
              IDOM_Node          *IDDocumentFragmentImpl::replaceChild(IDOM_Node *newChild, IDOM_Node *oldChild)
                                                                               {return fParent.replaceChild (newChild, oldChild); };
  
  
  
  1.3       +3 -2      xml-xerces/c/src/xercesc/idom/IDDocumentImpl.cpp
  
  Index: IDDocumentImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/idom/IDDocumentImpl.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IDDocumentImpl.cpp	4 Feb 2002 21:50:17 -0000	1.2
  +++ IDDocumentImpl.cpp	14 Mar 2002 22:04:05 -0000	1.3
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: IDDocumentImpl.cpp,v 1.2 2002/02/04 21:50:17 tng Exp $
  + * $Id: IDDocumentImpl.cpp,v 1.3 2002/03/14 22:04:05 tng Exp $
    */
   
   #include <xercesc/util/XMLUniDefs.hpp>
  @@ -845,7 +845,7 @@
              IDOM_Node          *IDDocumentImpl::getParentNode() const                   {return fNode.getParentNode (); };
              IDOM_Node          *IDDocumentImpl::getPreviousSibling() const              {return fNode.getPreviousSibling (); };
              bool                IDDocumentImpl::hasChildNodes() const                   {return fParent.hasChildNodes (); };
  -           void                IDDocumentImpl::normalize()                             {fNode.normalize (); };
  +           void                IDDocumentImpl::normalize()                             {fParent.normalize (); };
              IDOM_Node          *IDDocumentImpl::replaceChild(IDOM_Node *newChild, IDOM_Node *oldChild)
                                                                               {return fParent.replaceChild (newChild, oldChild); };
              bool                IDDocumentImpl::isSupported(const XMLCh *feature, const XMLCh *version) const
  @@ -865,6 +865,7 @@
   
   XMLCh * IDDocumentImpl::cloneString(const XMLCh *src)
   {
  +    if (!src) return 0;
       size_t   len = XMLString::stringLen(src);
       len = (len + 1) * sizeof(XMLCh);
       len = (len % 4) + len;
  
  
  
  1.3       +2 -2      xml-xerces/c/src/xercesc/idom/IDDocumentTypeImpl.cpp
  
  Index: IDDocumentTypeImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/idom/IDDocumentTypeImpl.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IDDocumentTypeImpl.cpp	4 Feb 2002 21:50:17 -0000	1.2
  +++ IDDocumentTypeImpl.cpp	14 Mar 2002 22:04:05 -0000	1.3
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: IDDocumentTypeImpl.cpp,v 1.2 2002/02/04 21:50:17 tng Exp $
  + * $Id: IDDocumentTypeImpl.cpp,v 1.3 2002/03/14 22:04:05 tng Exp $
    */
   
   #include "IDDocumentTypeImpl.hpp"
  @@ -390,7 +390,7 @@
              bool                IDDocumentTypeImpl::hasChildNodes() const                   {return fParent.hasChildNodes (); };
              IDOM_Node          *IDDocumentTypeImpl::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
                                                                               {return fParent.insertBefore (newChild, refChild); };
  -           void                IDDocumentTypeImpl::normalize()                             {fNode.normalize (); };
  +           void                IDDocumentTypeImpl::normalize()                             {fParent.normalize (); };
              IDOM_Node          *IDDocumentTypeImpl::removeChild(IDOM_Node *oldChild)        {return fParent.removeChild (oldChild); };
              IDOM_Node          *IDDocumentTypeImpl::replaceChild(IDOM_Node *newChild, IDOM_Node *oldChild)
                                                                               {return fParent.replaceChild (newChild, oldChild); };
  
  
  
  1.3       +2 -2      xml-xerces/c/src/xercesc/idom/IDElementImpl.cpp
  
  Index: IDElementImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/idom/IDElementImpl.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IDElementImpl.cpp	4 Feb 2002 21:20:59 -0000	1.2
  +++ IDElementImpl.cpp	14 Mar 2002 22:04:05 -0000	1.3
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: IDElementImpl.cpp,v 1.2 2002/02/04 21:20:59 tng Exp $
  + * $Id: IDElementImpl.cpp,v 1.3 2002/03/14 22:04:05 tng Exp $
    */
   
   #include "IDElementImpl.hpp"
  @@ -493,7 +493,7 @@
              bool                IDElementImpl::hasChildNodes() const                   {return fParent.hasChildNodes (); };
              IDOM_Node          *IDElementImpl::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
                                                                               {return fParent.insertBefore (newChild, refChild); };
  -           void                IDElementImpl::normalize()                             {fNode.normalize (); };
  +           void                IDElementImpl::normalize()                             {fParent.normalize (); };
              IDOM_Node          *IDElementImpl::removeChild(IDOM_Node *oldChild)        {return fParent.removeChild (oldChild); };
              IDOM_Node          *IDElementImpl::replaceChild(IDOM_Node *newChild, IDOM_Node *oldChild)
                                                                               {return fParent.replaceChild (newChild, oldChild); };
  
  
  
  1.3       +3 -3      xml-xerces/c/src/xercesc/idom/IDEntityImpl.cpp
  
  Index: IDEntityImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/idom/IDEntityImpl.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IDEntityImpl.cpp	4 Feb 2002 21:20:59 -0000	1.2
  +++ IDEntityImpl.cpp	14 Mar 2002 22:04:05 -0000	1.3
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: IDEntityImpl.cpp,v 1.2 2002/02/04 21:20:59 tng Exp $
  + * $Id: IDEntityImpl.cpp,v 1.3 2002/03/14 22:04:05 tng Exp $
    */
   
   #include "IDOM_DOMException.hpp"
  @@ -66,7 +66,7 @@
   
   
   IDEntityImpl::IDEntityImpl(IDOM_Document *ownerDoc, const XMLCh *eName)
  -   :  fNode(ownerDoc), fParent(ownerDoc)
  +   :  fNode(ownerDoc), fParent(ownerDoc), fPublicId(0), fSystemId(0)
   {
       fRefEntity  = 0;
       fName        = ((IDDocumentImpl *)ownerDoc)->getPooledString(eName);
  @@ -224,7 +224,7 @@
              IDOM_Node          *IDEntityImpl::getPreviousSibling() const              {return fNode.getPreviousSibling (); };
              IDOM_Node          *IDEntityImpl::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
                                                                               {return fParent.insertBefore (newChild, refChild); };
  -           void                IDEntityImpl::normalize()                             {fNode.normalize (); };
  +           void                IDEntityImpl::normalize()                             {fParent.normalize (); };
              IDOM_Node          *IDEntityImpl::removeChild(IDOM_Node *oldChild)        {return fParent.removeChild (oldChild); };
              IDOM_Node          *IDEntityImpl::replaceChild(IDOM_Node *newChild, IDOM_Node *oldChild)
                                                                               {return fParent.replaceChild (newChild, oldChild); };
  
  
  
  1.3       +2 -2      xml-xerces/c/src/xercesc/idom/IDEntityReferenceImpl.cpp
  
  Index: IDEntityReferenceImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/idom/IDEntityReferenceImpl.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IDEntityReferenceImpl.cpp	4 Feb 2002 21:20:59 -0000	1.2
  +++ IDEntityReferenceImpl.cpp	14 Mar 2002 22:04:05 -0000	1.3
  @@ -55,7 +55,7 @@
    */
   
   /*
  - * $Id: IDEntityReferenceImpl.cpp,v 1.2 2002/02/04 21:20:59 tng Exp $
  + * $Id: IDEntityReferenceImpl.cpp,v 1.3 2002/03/14 22:04:05 tng Exp $
    */
   
   /**
  @@ -213,7 +213,7 @@
              bool                IDEntityReferenceImpl::hasChildNodes() const                   {return fParent.hasChildNodes (); };
              IDOM_Node          *IDEntityReferenceImpl::insertBefore(IDOM_Node *newChild, IDOM_Node *refChild)
                                                                               {return fParent.insertBefore (newChild, refChild); };
  -           void                IDEntityReferenceImpl::normalize()                             {fNode.normalize (); };
  +           void                IDEntityReferenceImpl::normalize()                             {fParent.normalize (); };
              IDOM_Node          *IDEntityReferenceImpl::removeChild(IDOM_Node *oldChild)        {return fParent.removeChild (oldChild); };
              IDOM_Node          *IDEntityReferenceImpl::replaceChild(IDOM_Node *newChild, IDOM_Node *oldChild)
                                                                               {return fParent.replaceChild (newChild, oldChild); };
  
  
  

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