X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2FAbstractComplexElement.h;h=65567b657a1d159e86d6602a277d13785b03f636;hb=56a73c1c7b1e63f1ff1717b25a76ebd480594d5a;hp=a326359bb711cbe3ba1ebf9cd521711d1a2a293b;hpb=c47d9a28b514e071b6fbb1dfce4b5f258d26a67f;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/AbstractComplexElement.h b/xmltooling/AbstractComplexElement.h
index a326359..65567b6 100644
--- a/xmltooling/AbstractComplexElement.h
+++ b/xmltooling/AbstractComplexElement.h
@@ -1,72 +1,80 @@
-/*
- *  Copyright 2001-2006 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
- *
- *     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 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.
-     * No unprotected access to them is supplied here.
-     */
-    class XMLTOOL_API AbstractComplexElement : public virtual AbstractXMLObject
-    {
-    public:
-        virtual ~AbstractComplexElement();
-        
-        bool hasChildren() const {
-            return !m_children.empty();
-        }
-
-        const std::list<XMLObject*>& getOrderedChildren() const {
-            return m_children;
-        }
-
-    protected:
-        AbstractComplexElement() {}
-        
-        /** Copy constructor. */
-        AbstractComplexElement(const AbstractComplexElement& src) {}
-
-        /**
-         * Underlying list of child objects.
-         * Manages the lifetime of the children.
-         */
-        std::list<XMLObject*> m_children;
-    };
-    
-};
-
-#if defined (_MSC_VER)
-    #pragma warning( pop )
-#endif
-
-#endif /* __xmltooling_abscomplexel_h__ */
+/**
+ * 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__ */