Multi-line svn commit, see body.

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

diff --git a/xmltooling/io/AbstractXMLObjectMarshaller.h b/xmltooling/io/AbstractXMLObjectMarshaller.h
index 18d9056..cbab2fe 100644 (file)
--- a/xmltooling/io/AbstractXMLObjectMarshaller.h
+++ b/xmltooling/io/AbstractXMLObjectMarshaller.h
@@ -107,13 +107,13 @@ namespace xmltooling {
         void marshallNamespaces(DOMElement* domElement) const;\r
     \r
         /**\r
-         * Marshalls the child elements of the XMLObject.\r
+         * Marshalls the text content and/or child elements of the XMLObject.\r
          * \r
          * @param domElement the DOM element that will recieved the marshalled children\r
          * \r
          * @throws MarshallingException thrown if there is a problem marshalling a child element\r
          */\r
-        void marshallChildElements(DOMElement* domElement) const;\r
+        void marshallContent(DOMElement* domElement) const;\r
 \r
         /**\r
          * Marshalls the attributes from the XMLObject into the given DOM element.\r
@@ -123,13 +123,6 @@ namespace xmltooling {
          * @throws MarshallingException thrown if there is a problem marshalling an attribute\r
          */\r
         virtual void marshallAttributes(DOMElement* domElement) const {}\r
-\r
-        /**\r
-         * Marshalls data from the XMLObject into content of the DOM Element.\r
-         * \r
-         * @param domElement the DOM element recieving the content\r
-         */\r
-        virtual void marshallElementContent(DOMElement* domElement) const {}\r
     };\r
     \r
 };\r