Merge branch '1.x' of ssh://authdev.it.ohio-state.edu/~scantor/git/cpp-xmltooling...

[shibboleth/cpp-xmltooling.git] / xmltooling / impl / AnyElement.h

diff --git a/xmltooling/impl/AnyElement.h b/xmltooling/impl/AnyElement.h
index 85ee2e1..37e629f 100644 (file)
--- a/xmltooling/impl/AnyElement.h
+++ b/xmltooling/impl/AnyElement.h
@@ -1,30 +1,35 @@
-/*
- *  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
+/**
+ * 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 AnyElement.h
+ * @file xmltooling/impl/AnyElement.h
  * 
  * Advanced anyType implementation suitable for deep processing of unknown content.
  */
 
-#if !defined(__xmltooling_anyelement_h__)
+#ifndef __xmltooling_anyelement_h__
 #define __xmltooling_anyelement_h__
 
+#include <xmltooling/ElementProxy.h>
 #include <xmltooling/AbstractAttributeExtensibleXMLObject.h>
-#include <xmltooling/AbstractElementProxy.h>
+#include <xmltooling/AbstractComplexElement.h>
 #include <xmltooling/XMLObjectBuilder.h>
 #include <xmltooling/io/AbstractXMLObjectMarshaller.h>
 #include <xmltooling/io/AbstractXMLObjectUnmarshaller.h>
@@ -39,29 +44,32 @@ namespace xmltooling {
     /**
      * Implements a smart wrapper around unknown or arbitrary DOM content.
      */
-    class XMLTOOL_API AnyElementImpl : public AbstractDOMCachingXMLObject,
-        public AbstractElementProxy,
+    class XMLTOOL_API AnyElementImpl : public virtual ElementProxy,
+        public AbstractDOMCachingXMLObject,
+        public AbstractComplexElement,
         public AbstractAttributeExtensibleXMLObject,
         public AbstractXMLObjectMarshaller,
         public AbstractXMLObjectUnmarshaller
     {
+    /// @cond OFF
     public:
-        virtual ~AnyElementImpl() {}
+        virtual ~AnyElementImpl();
 
-        AnyElementImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL, const QName* schemaType=NULL)
-            : AbstractXMLObject(nsURI, localName, prefix, schemaType) {}
+        AnyElementImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=nullptr, const QName* schemaType=nullptr);
         
         XMLObject* clone() const;
         
     protected:
-        AnyElementImpl(const AnyElementImpl& src);   
+        AnyElementImpl();
+        AnyElementImpl(const AnyElementImpl& src);
+        
+        IMPL_XMLOBJECT_CHILDREN(UnknownXMLObject,m_children.end());
         
-        void marshallAttributes(DOMElement* domElement) const;
-        void marshallElementContent(DOMElement* domElement) const;
-        void processChildElement(XMLObject* childXMLObject, const DOMElement* root);
-        void processAttribute(const DOMAttr* attribute);
-        void processElementContent(const XMLCh* elementContent);
+        void marshallAttributes(xercesc::DOMElement* domElement) const;
+        void processChildElement(XMLObject* childXMLObject, const xercesc::DOMElement* childRoot);
+        void processAttribute(const xercesc::DOMAttr* attribute);
     };
+    /// @endcond
 
     /**
      * Builder for AnyElementImpl objects.
@@ -72,7 +80,7 @@ namespace xmltooling {
     {
     public:
         XMLObject* buildObject(
-            const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL, const QName* schemaType=NULL
+            const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=nullptr, const QName* schemaType=nullptr
             ) const;
     };