X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2FAbstractDOMCachingXMLObject.h;h=3f02e32f77a5a3898a9a25dbd176beca7dbf37af;hb=56a73c1c7b1e63f1ff1717b25a76ebd480594d5a;hp=125ef792eb5d3743b7fe6b9a59346629241e2877;hpb=aff64904d1663ea3770daa633a80f64d205fbb2f;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/AbstractDOMCachingXMLObject.h b/xmltooling/AbstractDOMCachingXMLObject.h
index 125ef79..3f02e32 100644
--- a/xmltooling/AbstractDOMCachingXMLObject.h
+++ b/xmltooling/AbstractDOMCachingXMLObject.h
@@ -1,23 +1,27 @@
-/*
- *  Copyright 2001-2007 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
  * @file xmltooling/AbstractDOMCachingXMLObject.h
  * 
- * AbstractXMLObject mixin that implements DOM caching
+ * AbstractXMLObject mixin that implements DOM caching.
  */
 
 #ifndef __xmltooling_abstractdomxmlobj_h__
@@ -40,43 +44,30 @@ namespace xmltooling {
     {
     public:
         virtual ~AbstractDOMCachingXMLObject();
-        
-        xercesc::DOMElement* getDOM() const {
-            return m_dom;
-        }
-        
+
+        // Virtual function overrides.
+        xercesc::DOMElement* getDOM() const;
         void setDOM(xercesc::DOMElement* dom, bool bindDocument=false) const;
-        
-        void setDocument(xercesc::DOMDocument* doc) const {
-            if (m_document)
-                m_document->release();
-            m_document=doc;
-        }
-    
-        virtual void releaseDOM() const;
-        
-        virtual void releaseParentDOM(bool propagateRelease=true) const;
-        
-        virtual void releaseChildrenDOM(bool propagateRelease=true) const;
-    
+        void setDocument(xercesc::DOMDocument* doc) const;
+        void releaseDOM() const;
+        void releaseParentDOM(bool propagateRelease=true) const;
+        void releaseChildrenDOM(bool propagateRelease=true) const;
         XMLObject* clone() const;
-
         void detach();
 
      protected:
-        AbstractDOMCachingXMLObject() : m_dom(NULL), m_document(NULL) {}
+        AbstractDOMCachingXMLObject();
 
         /** Copy constructor. */
-        AbstractDOMCachingXMLObject(const AbstractDOMCachingXMLObject& src)
-            : AbstractXMLObject(src), m_dom(NULL), m_document(NULL) {}
+        AbstractDOMCachingXMLObject(const AbstractDOMCachingXMLObject& src);
 
         /**
          * If a DOM representation exists, this clones it into a new document.
          * 
-         * @param doc   the document to clone into, or NULL, in which case a new document is created
+         * @param doc   the document to clone into, or nullptr, in which case a new document is created
          * @return  the cloned DOM
          */
-        xercesc::DOMElement* cloneDOM(xercesc::DOMDocument* doc=NULL) const;
+        xercesc::DOMElement* cloneDOM(xercesc::DOMDocument* doc=nullptr) const;
 
     private:
         mutable xercesc::DOMElement* m_dom;