Set fourth file version digit to signify rebuild.

[shibboleth/cpp-xmltooling.git] / xmltooling / AbstractComplexElement.h

diff --git a/xmltooling/AbstractComplexElement.h b/xmltooling/AbstractComplexElement.h
index 9f71657..65567b6 100644 (file)
--- a/xmltooling/AbstractComplexElement.h
+++ b/xmltooling/AbstractComplexElement.h
@@ -1,74 +1,80 @@
-/*\r
- *  Copyright 2001-2006 Internet2\r
- * \r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-/**\r
- * @file AbstractComplexElement.h\r
- * \r
- * AbstractXMLObject mixin that implements children\r
- */\r
-\r
-#ifndef __xmltooling_abscomplexel_h__\r
-#define __xmltooling_abscomplexel_h__\r
-\r
-#include <xmltooling/AbstractXMLObject.h>\r
-\r
-#if defined (_MSC_VER)\r
-    #pragma warning( push )\r
-    #pragma warning( disable : 4250 4251 )\r
-#endif\r
-\r
-namespace xmltooling {\r
-\r
-    /**\r
-     * AbstractXMLObject mixin that implements children.\r
-     * Inherit from this class to implement an element with child objects.\r
-     * No unprotected access to them is supplied here.\r
-     */\r
-    class XMLTOOL_API AbstractComplexElement : public virtual AbstractXMLObject\r
-    {\r
-    public:\r
-        virtual ~AbstractComplexElement();\r
-        \r
-        bool hasChildren() const {\r
-            return !m_children.empty();\r
-        }\r
-\r
-        const std::list<XMLObject*>& getOrderedChildren() const {\r
-            return m_children;\r
-        }\r
-\r
-        void removeChild(XMLObject* child);\r
-\r
-    protected:\r
-        AbstractComplexElement() {}\r
-        \r
-        /** Copy constructor. */\r
-        AbstractComplexElement(const AbstractComplexElement& src) {}\r
-\r
-        /**\r
-         * Underlying list of child objects.\r
-         * Manages the lifetime of the children.\r
-         */\r
-        std::list<XMLObject*> m_children;\r
-    };\r
-    \r
-};\r
-\r
-#if defined (_MSC_VER)\r
-    #pragma warning( pop )\r
-#endif\r
-\r
-#endif /* __xmltooling_abscomplexel_h__ */\r
+/**
+ * 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.
+ *
+ * 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
+ *
+ * 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/AbstractComplexElement.h
+ * 
+ * AbstractXMLObject mixin that implements children
+ */
+
+#ifndef __xmltooling_abscomplexel_h__
+#define __xmltooling_abscomplexel_h__
+
+#include <xmltooling/AbstractXMLObject.h>
+
+#if defined (_MSC_VER)
+    #pragma warning( push )
+    #pragma warning( disable : 4250 4251 )
+#endif
+
+namespace xmltooling {
+
+    /**
+     * AbstractXMLObject mixin that implements children.
+     * Inherit from this class to implement an element with child objects and mixed content.
+     */
+    class XMLTOOL_API AbstractComplexElement : public virtual AbstractXMLObject
+    {
+    public:
+        virtual ~AbstractComplexElement();
+
+        // Virtual function overrides.
+        bool hasChildren() const;
+        const std::list<XMLObject*>& getOrderedChildren() const;
+        void removeChild(XMLObject* child);
+        const XMLCh* getTextContent(unsigned int position=0) const;
+        void setTextContent(const XMLCh* value, unsigned int position=0);
+
+    protected:
+        AbstractComplexElement();
+        
+        /** Copy constructor. */
+        AbstractComplexElement(const AbstractComplexElement& src);
+
+        /**
+         * Underlying list of child objects.
+         * Manages the lifetime of the children.
+         */
+        std::list<XMLObject*> m_children;
+        
+        /**
+         * Interstitial text nodes.
+         * Needed to support mixed content, and preserve DOM whitespace across rebuilds.
+         */
+        std::vector<XMLCh*> m_text;
+    };
+    
+};
+
+#if defined (_MSC_VER)
+    #pragma warning( pop )
+#endif
+
+#endif /* __xmltooling_abscomplexel_h__ */