Multi-line svn commit, see body.

[shibboleth/cpp-xmltooling.git] / xmltooling / io / AbstractXMLObjectUnmarshaller.h

diff --git a/xmltooling/io/AbstractXMLObjectUnmarshaller.h b/xmltooling/io/AbstractXMLObjectUnmarshaller.h
index 9ed78bd..80d0909 100644 (file)
--- a/xmltooling/io/AbstractXMLObjectUnmarshaller.h
+++ b/xmltooling/io/AbstractXMLObjectUnmarshaller.h
@@ -58,14 +58,14 @@ namespace xmltooling {
         virtual void unmarshallAttributes(const DOMElement* domElement);\r
 \r
         /**\r
-         * Unmarshalls a given Element's children. The resulting XMLObject child is passed to\r
-         * processChildElement() for further processing.\r
+         * Unmarshalls a given Element's child nodes. The resulting XMLObject children and content\r
+         * are passed to processChildElement() or processText() for further processing.\r
          * \r
          * @param domElement the DOM Element whose children will be unmarshalled\r
          * \r
          * @throws UnmarshallingException thrown if an error occurs unmarshalling the child elements\r
          */\r
-        virtual void unmarshallChildElements(const DOMElement* domElement);\r
+        virtual void unmarshallContent(const DOMElement* domElement);\r
 \r
         /**\r
          * Called after a child element has been unmarshalled so that it can be added to the parent XMLObject.\r
@@ -85,13 +85,6 @@ namespace xmltooling {
          * @throws UnmarshallingException thrown if there is a problem adding the attribute to the XMLObject\r
          */\r
         virtual void processAttribute(const DOMAttr* attribute);\r
-    \r
-        /**\r
-         * Called if the element being unmarshalled contained textual content so that it can be added to the XMLObject.\r
-         * \r
-         * @param elementContent the Element's text content\r
-         */\r
-        virtual void processElementContent(const XMLCh* elementContent);\r
     };\r
     \r
 };\r