Refactored simple content and child-handling into mixin classes.

[shibboleth/cpp-xmltooling.git] / xmltooling / AbstractDOMCachingXMLObject.cpp

diff --git a/xmltooling/AbstractDOMCachingXMLObject.cpp b/xmltooling/AbstractDOMCachingXMLObject.cpp
index 655f22d..53564ff 100644 (file)
--- a/xmltooling/AbstractDOMCachingXMLObject.cpp
+++ b/xmltooling/AbstractDOMCachingXMLObject.cpp
@@ -21,9 +21,9 @@
  */\r
 \r
 #include "internal.h"\r
-#include "exceptions.h"\r
 #include "AbstractDOMCachingXMLObject.h"\r
-#include "io/Unmarshaller.h"\r
+#include "exceptions.h"\r
+#include "XMLObjectBuilder.h"\r
 #include "util/XMLHelper.h"\r
 \r
 #include <algorithm>\r
@@ -40,7 +40,7 @@ AbstractDOMCachingXMLObject::~AbstractDOMCachingXMLObject()
         m_document->release();\r
 }\r
 \r
-void AbstractDOMCachingXMLObject::setDOM(DOMElement* dom, bool bindDocument)\r
+void AbstractDOMCachingXMLObject::setDOM(DOMElement* dom, bool bindDocument) const\r
 {\r
     m_dom=dom;\r
     if (dom) {\r
@@ -50,7 +50,7 @@ void AbstractDOMCachingXMLObject::setDOM(DOMElement* dom, bool bindDocument)
     }\r
 }\r
 \r
-void AbstractDOMCachingXMLObject::releaseDOM()\r
+void AbstractDOMCachingXMLObject::releaseDOM() const\r
 {\r
     if (m_dom) {\r
         Category& log=Category::getInstance(XMLTOOLING_LOGCAT".DOM");\r
@@ -62,42 +62,39 @@ void AbstractDOMCachingXMLObject::releaseDOM()
     }\r
 }\r
 \r
-void AbstractDOMCachingXMLObject::releaseParentDOM(bool propagateRelease)\r
+void AbstractDOMCachingXMLObject::releaseParentDOM(bool propagateRelease) const\r
 {\r
-    DOMCachingXMLObject* domCachingParent = dynamic_cast<DOMCachingXMLObject*>(getParent());\r
-    if (domCachingParent) {\r
-        if (domCachingParent->getDOM()) {\r
-            Category::getInstance(XMLTOOLING_LOGCAT".DOM").debug(\r
-                "releasing cached DOM representation for parent object with propagation set to %s",\r
-                propagateRelease ? "true" : "false"\r
-                );\r
-            domCachingParent->releaseDOM();\r
-            if (propagateRelease)\r
-                domCachingParent->releaseParentDOM(propagateRelease);\r
-        }\r
+    if (getParent() && getParent()->getDOM()) {\r
+        Category::getInstance(XMLTOOLING_LOGCAT".DOM").debug(\r
+            "releasing cached DOM representation for parent object with propagation set to %s",\r
+            propagateRelease ? "true" : "false"\r
+            );\r
+        getParent()->releaseDOM();\r
+        if (propagateRelease)\r
+            getParent()->releaseParentDOM(propagateRelease);\r
     }\r
 }\r
 \r
 class _release : public binary_function<XMLObject*,bool,void> {\r
 public:\r
     void operator()(XMLObject* obj, bool propagate) const {\r
-        DOMCachingXMLObject* domCaching = dynamic_cast<DOMCachingXMLObject*>(obj);\r
-        if (domCaching) {\r
-            domCaching->releaseDOM();\r
+        if (obj) {\r
+            obj->releaseDOM();\r
             if (propagate)\r
-                domCaching->releaseChildrenDOM(propagate);\r
+                obj->releaseChildrenDOM(propagate);\r
         }\r
     }\r
 };\r
 \r
-void AbstractDOMCachingXMLObject::releaseChildrenDOM(bool propagateRelease)\r
+void AbstractDOMCachingXMLObject::releaseChildrenDOM(bool propagateRelease) const\r
 {\r
     if (hasChildren()) {\r
         Category::getInstance(XMLTOOLING_LOGCAT".DOM").debug(\r
             "releasing cached DOM representation for children with propagation set to %s",\r
             propagateRelease ? "true" : "false"\r
             );\r
-        for_each(m_children.begin(),m_children.end(),bind2nd(_release(),propagateRelease));\r
+        const list<XMLObject*>& children=getOrderedChildren();\r
+        for_each(children.begin(),children.end(),bind2nd(_release(),propagateRelease));\r
     }\r
 }\r
 \r
@@ -117,18 +114,21 @@ XMLObject* AbstractDOMCachingXMLObject::clone() const
     DOMElement* domCopy=cloneDOM();\r
     if (domCopy) {\r
         // Seemed to work, so now we unmarshall the DOM to produce the clone.\r
-        const Unmarshaller* u=Unmarshaller::getUnmarshaller(domCopy);\r
-        if (!u) {\r
+        const XMLObjectBuilder* b=XMLObjectBuilder::getBuilder(domCopy);\r
+        if (!b) {\r
             auto_ptr<QName> q(XMLHelper::getNodeQName(domCopy));\r
             Category::getInstance(XMLTOOLING_LOGCAT".DOM").error(\r
-                "DOM clone failed, unable to locate unmarshaller for element (%s)", q->toString().c_str()\r
+                "DOM clone failed, unable to locate builder for element (%s)", q->toString().c_str()\r
                 );\r
+            domCopy->getOwnerDocument()->release();\r
+            throw UnmarshallingException("Unable to locate builder for cloned element.");\r
         }\r
         try {\r
-            return u->unmarshall(domCopy, true);    // bind document\r
+            return b->buildFromElement(domCopy,true); // bind document\r
         }\r
         catch (...) {\r
             domCopy->getOwnerDocument()->release();\r
+            throw;\r
         }\r
     }\r
     return NULL;\r