Added built-in ID attribute support to base classes.

[shibboleth/xmltooling.git] / xmltooling / base.h

diff --git a/xmltooling/base.h b/xmltooling/base.h
index 4f9ec8f..228640d 100644 (file)
--- a/xmltooling/base.h
+++ b/xmltooling/base.h
@@ -229,7 +229,7 @@
  */
 #define BEGIN_XMLOBJECT(linkage,cname,base,desc) \
     XMLTOOLING_DOXYGEN(desc) \
-    class linkage cname : public virtual base, public virtual xmltooling::ValidatingXMLObject { \
+    class linkage cname : public virtual base { \
     protected: \
         cname() {} \
     public: \
@@ -252,7 +252,7 @@
  */
 #define BEGIN_XMLOBJECT2(linkage,cname,base,base2,desc) \
     XMLTOOLING_DOXYGEN(desc) \
-    class linkage cname : public virtual base, public virtual base2, public virtual xmltooling::ValidatingXMLObject { \
+    class linkage cname : public virtual base, public virtual base2 { \
     protected: \
         cname() {} \
     public: \
@@ -276,8 +276,7 @@
  */
 #define BEGIN_XMLOBJECT3(linkage,cname,base,base2,base3,desc) \
     XMLTOOLING_DOXYGEN(desc) \
-    class linkage cname : public virtual base, public virtual base2, public virtual base3, \
-        public virtual xmltooling::ValidatingXMLObject { \
+    class linkage cname : public virtual base, public virtual base2, public virtual base3 { \
     protected: \
         cname() {} \
     public: \
@@ -302,8 +301,7 @@
  */
 #define BEGIN_XMLOBJECT4(linkage,cname,base,base2,base3,base4,desc) \
     XMLTOOLING_DOXYGEN(desc) \
-    class linkage cname : public virtual base, public virtual base2, public virtual base3, \
-        public virtual base4, public virtual xmltooling::ValidatingXMLObject { \
+    class linkage cname : public virtual base, public virtual base2, public virtual base3, public virtual base4 { \
     protected: \
         cname() {} \
     public: \
@@ -380,13 +378,27 @@
  * 
  * @param proper    the proper name of the attribute
  * @param upcased   the upcased name of the attribute
+ * @param def       the default/presumed value, if no explicit value has been set
  */
-#define DECL_BOOLEAN_ATTRIB(proper,upcased) \
+#define DECL_BOOLEAN_ATTRIB(proper,upcased,def) \
     public: \
         XMLTOOLING_DOXYGEN(proper attribute name) \
         static const XMLCh upcased##_ATTRIB_NAME[]; \
-        XMLTOOLING_DOXYGEN(Returns the proper attribute after a NULL indicator.) \
-        virtual std::pair<bool,bool> proper() const=0; \
+        XMLTOOLING_DOXYGEN(Returns the proper attribute or def if not set.) \
+        bool proper() const { \
+            switch (get##proper()) { \
+                case xmltooling::XMLConstants::XML_BOOL_TRUE: \
+                case xmltooling::XMLConstants::XML_BOOL_ONE: \
+                    return true; \
+                case xmltooling::XMLConstants::XML_BOOL_FALSE: \
+                case xmltooling::XMLConstants::XML_BOOL_ZERO: \
+                    return false; \
+                default: \
+                    return def; \
+            } \
+        } \
+        XMLTOOLING_DOXYGEN(Returns the proper attribute as an explicit enumerated value.) \
+        virtual xmltooling::XMLConstants::xmltooling_bool_t get##proper() const=0; \
         XMLTOOLING_DOXYGEN(Sets the proper attribute using an enumerated value.) \
         virtual void proper(xmltooling::XMLConstants::xmltooling_bool_t value)=0; \
         XMLTOOLING_DOXYGEN(Sets the proper attribute.) \
@@ -443,6 +455,18 @@
     IMPL_XMLOBJECT_ATTRIB(proper,XMLCh)
 
 /**
+ * Implements get/set methods and a private member for a string XML attribute,
+ * plus a getXMLID override.
+ * 
+ * @param proper    the proper name of the attribute
+ */
+#define IMPL_ID_ATTRIB(proper) \
+    IMPL_XMLOBJECT_ATTRIB(proper,XMLCh) \
+    const XMLCh* getXMLID() const { \
+        return m_##proper; \
+    }
+
+/**
  * Implements get/set methods and a private member for a DateTime XML attribute.
  * 
  * @param proper    the proper name of the attribute
@@ -484,7 +508,7 @@
         XMLCh* m_##proper; \
     public: \
         pair<bool,int> get##proper() const { \
-            return make_pair((m_##proper!=NULL),(m_##proper!=NULL ? XMLString::parseInt(m_##proper): NULL)); \
+            return make_pair((m_##proper!=NULL),(m_##proper!=NULL ? XMLString::parseInt(m_##proper): 0)); \
         } \
         void set##proper(const XMLCh* proper) { \
             m_##proper = prepareForAssignment(m_##proper,proper); \
@@ -505,11 +529,8 @@
     protected: \
         XMLConstants::xmltooling_bool_t m_##proper; \
     public: \
-        pair<bool,bool> proper() const { \
-            return make_pair( \
-                (m_##proper!=XMLConstants::XML_BOOL_NULL), \
-                (m_##proper==XMLConstants::XML_BOOL_TRUE || m_##proper==XMLConstants::XML_BOOL_ONE) \
-                ); \
+        XMLConstants::xmltooling_bool_t get##proper() const { \
+            return m_##proper; \
         } \
         void proper(XMLConstants::xmltooling_bool_t value) { \
             if (m_##proper != value) { \
@@ -1037,7 +1058,6 @@
             public xmltooling::AbstractSimpleElement, \
             public xmltooling::AbstractChildlessElement, \
             public xmltooling::AbstractDOMCachingXMLObject, \
-            public xmltooling::AbstractValidatingXMLObject, \
             public xmltooling::AbstractXMLObjectMarshaller, \
             public xmltooling::AbstractXMLObjectUnmarshaller \
     { \
@@ -1049,8 +1069,7 @@
         cname##Impl(const cname##Impl& src) \
             : xmltooling::AbstractXMLObject(src), \
                 xmltooling::AbstractSimpleElement(src), \
-                xmltooling::AbstractDOMCachingXMLObject(src), \
-                xmltooling::AbstractValidatingXMLObject(src) {} \
+                xmltooling::AbstractDOMCachingXMLObject(src) {} \
         IMPL_XMLOBJECT_CLONE(cname) \
         IMPL_XMLOBJECT_CONTENT \
     }
@@ -1129,9 +1148,6 @@
     { \
     public: \
         virtual ~cname##SchemaValidator() {} \
-        virtual cname##SchemaValidator* clone() const { \
-            return new cname##SchemaValidator(); \
-        } \
         virtual void validate(const xmltooling::XMLObject* xmlObject) const { \
             const cname* ptr=dynamic_cast<const cname*>(xmlObject); \
             if (!ptr) \
@@ -1149,9 +1165,6 @@
     { \
     public: \
         virtual ~cname##SchemaValidator() {} \
-        virtual cname##SchemaValidator* clone() const { \
-            return new cname##SchemaValidator(); \
-        } \
         virtual void validate(const xmltooling::XMLObject* xmlObject) const { \
             const cname* ptr=dynamic_cast<const cname*>(xmlObject); \
             if (!ptr) \