Update copyright.

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

diff --git a/xmltooling/impl/AnyElement.cpp b/xmltooling/impl/AnyElement.cpp
index a19060d..1e4e2f0 100644 (file)
--- a/xmltooling/impl/AnyElement.cpp
+++ b/xmltooling/impl/AnyElement.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2007 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,11 +26,9 @@
 #include "util/NDC.h"
 #include "util/XMLHelper.h"
 
-#include <log4cpp/Category.hh>
 #include <xercesc/util/XMLUniDefs.hpp>
 
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
 XMLObject* AnyElementImpl::clone() const {
@@ -45,34 +43,24 @@ XMLObject* AnyElementImpl::clone() const {
 }
 
 AnyElementImpl::AnyElementImpl(const AnyElementImpl& src) : AbstractXMLObject(src), AbstractDOMCachingXMLObject(src),
-    AbstractElementProxy(src), AbstractAttributeExtensibleXMLObject(src) {
-    for (list<XMLObject*>::const_iterator i=src.m_children.begin(); i!=src.m_children.end(); i++) {
-        getXMLObjects().push_back((*i) ? (*i)->clone() : NULL);
-    }
+        AbstractComplexElement(src), AbstractAttributeExtensibleXMLObject(src) {
+    const vector<XMLObject*>& children = src.getUnknownXMLObjects();
+    for (vector<XMLObject*>::const_iterator i=children.begin(); i!=children.end(); ++i)
+        getUnknownXMLObjects().push_back((*i)->clone());
 }       
 
 void AnyElementImpl::marshallAttributes(DOMElement* domElement) const {
     marshallExtensionAttributes(domElement);
 }
 
-void AnyElementImpl::marshallElementContent(DOMElement* domElement) const {
-    if(getTextContent()) {
-        domElement->appendChild(domElement->getOwnerDocument()->createTextNode(getTextContent()));
-    }
-}
-
 void AnyElementImpl::processChildElement(XMLObject* childXMLObject, const DOMElement* root) {
-    getXMLObjects().push_back(childXMLObject);
+    getUnknownXMLObjects().push_back(childXMLObject);
 }
 
 void AnyElementImpl::processAttribute(const DOMAttr* attribute) {
     unmarshallExtensionAttribute(attribute);
 }
 
-void AnyElementImpl::processElementContent(const XMLCh* elementContent) {
-    setTextContent(elementContent);
-}
-
 XMLObject* AnyElementBuilder::buildObject(
     const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType
     ) const {