https://issues.shibboleth.net/jira/browse/CPPXT-67

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

diff --git a/xmltooling/AbstractAttributeExtensibleXMLObject.h b/xmltooling/AbstractAttributeExtensibleXMLObject.h
index 3f50678..0429461 100644 (file)
--- a/xmltooling/AbstractAttributeExtensibleXMLObject.h
+++ b/xmltooling/AbstractAttributeExtensibleXMLObject.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2009 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 /**
- * @file AbstractAttributeExtensibleXMLObject.h
+ * @file xmltooling/AbstractAttributeExtensibleXMLObject.h
  * 
  * AbstractXMLObject mixin that implements AttributeExtensibleXMLObject
  */
@@ -23,10 +23,11 @@
 #ifndef __xmltooling_absattrextxmlobj_h__
 #define __xmltooling_absattrextxmlobj_h__
 
-#include <map>
 #include <xmltooling/AbstractXMLObject.h>
 #include <xmltooling/AttributeExtensibleXMLObject.h>
 
+#include <map>
+
 #if defined (_MSC_VER)
     #pragma warning( push )
     #pragma warning( disable : 4250 4251 )
@@ -44,25 +45,14 @@ namespace xmltooling {
     public:
         virtual ~AbstractAttributeExtensibleXMLObject();
         
-        const XMLCh* getAttribute(const QName& qualifiedName) const {
-            std::map<QName,XMLCh*>::const_iterator i=m_attributeMap.find(qualifiedName);
-            return (i==m_attributeMap.end()) ? NULL : i->second;
-        }
-        
+        // Virtual function overrides.
+        const XMLCh* getAttribute(const QName& qualifiedName) const;
         void setAttribute(const QName& qualifiedName, const XMLCh* value, bool ID=false);
-    
-        const std::map<QName,XMLCh*>& getExtensionAttributes() const {
-            return m_attributeMap;
-        }
-        
-        const XMLCh* getXMLID() const {
-            return (m_idAttribute == m_attributeMap.end()) ? NULL : m_idAttribute->second;
-        }
+        const std::map<QName,XMLCh*>& getExtensionAttributes() const;
+        const XMLCh* getXMLID() const;
     
      protected:
-        AbstractAttributeExtensibleXMLObject() {
-            m_idAttribute = m_attributeMap.end();
-        }
+        AbstractAttributeExtensibleXMLObject();
 
         /** Copy constructor. */
         AbstractAttributeExtensibleXMLObject(const AbstractAttributeExtensibleXMLObject& src);
@@ -72,14 +62,14 @@ namespace xmltooling {
          * 
          * @param attribute the DOM attribute node being unmarshalled
          */
-        void unmarshallExtensionAttribute(const DOMAttr* attribute);
+        void unmarshallExtensionAttribute(const xercesc::DOMAttr* attribute);
 
         /**
          * Assists in the marshalling of extension attributes.
          * 
          * @param domElement    the DOM element against which to marshall the attributes
          */
-        void marshallExtensionAttributes(DOMElement* domElement) const;
+        void marshallExtensionAttributes(xercesc::DOMElement* domElement) const;
     
     private:
         /** Map of arbitrary attributes. */