Refactored simple content and child-handling into mixin classes.

[shibboleth/xmltooling.git] / xmltooling / AbstractElementProxy.h

diff --git a/xmltooling/AbstractElementProxy.h b/xmltooling/AbstractElementProxy.h
index 19bad7b..b8bd05f 100644 (file)
--- a/xmltooling/AbstractElementProxy.h
+++ b/xmltooling/AbstractElementProxy.h
@@ -17,13 +17,14 @@
 /**\r
  * @file AbstractElementProxy.h\r
  * \r
- * An abstract implementation of an ElementProxy \r
+ * AbstractXMLObject mixin that implements an open content model \r
  */\r
 \r
 #ifndef __xmltooling_abseleproxy_h__\r
 #define __xmltooling_abseleproxy_h__\r
 \r
-#include <xmltooling/AbstractXMLObject.h>\r
+#include <xmltooling/AbstractComplexElement.h>\r
+#include <xmltooling/AbstractSimpleElement.h>\r
 #include <xmltooling/ElementProxy.h>\r
 \r
 #if defined (_MSC_VER)\r
@@ -34,34 +35,30 @@
 namespace xmltooling {\r
 \r
     /**\r
-     * An abstract implementation of an ExtensibleXMLObject.\r
+     * AbstractXMLObject mixin that implements an open content model.\r
+     * Inherit from this class to merge both simple and complex content\r
+     * and expose the underlying child collection in read/write mode.\r
      */\r
-    class XMLTOOL_API AbstractElementProxy : public virtual ElementProxy, public virtual AbstractXMLObject\r
+    class XMLTOOL_API AbstractElementProxy\r
+        : public virtual ElementProxy, public AbstractSimpleElement, public AbstractComplexElement\r
     {\r
     public:\r
         virtual ~AbstractElementProxy() {}\r
         \r
-        virtual const XMLCh* getTextContent() const {\r
-            return m_value;\r
+        virtual ListOf(XMLObject) getXMLObjects() {\r
+            return ListOf(XMLObject)(this,m_children,NULL,m_children.end());\r
         }\r
-        \r
-        virtual void setTextContent(const XMLCh* value);\r
-        \r
-        virtual ListOf(XMLObject) getXMLObjects();\r
     \r
         virtual const std::list<XMLObject*>& getXMLObjects() const {\r
             return m_children;\r
         }\r
 \r
     protected:\r
-        AbstractElementProxy() : m_value(NULL) {}\r
+        AbstractElementProxy() {}\r
         \r
         /** Copy constructor. */\r
         AbstractElementProxy(const AbstractElementProxy& src)\r
-            : AbstractXMLObject(src), m_value(XMLString::replicate(src.m_value)) {}\r
-\r
-    private:\r
-        XMLCh* m_value;\r
+            : AbstractXMLObject(src), AbstractSimpleElement(src) {}\r
     };\r
     \r
 };\r