From cb70cfd2645ea21c32dd933049b2a9bfbf0d3f3e Mon Sep 17 00:00:00 2001 From: cantor Date: Wed, 8 Mar 2006 01:39:59 +0000 Subject: [PATCH] Renamed classes git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/trunk@48 de75baf8-a10c-0410-a50a-987c0e22f00f --- xmltooling/AbstractAttributeExtensibleXMLObject.h | 2 +- ...sibleXMLObject.cpp => AbstractElementProxy.cpp} | 10 ++++----- ...xtensibleXMLObject.h => AbstractElementProxy.h} | 24 +++++++++++----------- .../{ExtensibleXMLObject.h => ElementProxy.h} | 14 ++++++------- xmltooling/Makefile.am | 6 +++--- xmltooling/xmltooling.vcproj | 8 ++++---- xmltoolingtest/XMLObjectBaseTestCase.h | 6 +++--- 7 files changed, 35 insertions(+), 35 deletions(-) rename xmltooling/{AbstractExtensibleXMLObject.cpp => AbstractElementProxy.cpp} (76%) rename xmltooling/{AbstractExtensibleXMLObject.h => AbstractElementProxy.h} (72%) rename xmltooling/{ExtensibleXMLObject.h => ElementProxy.h} (80%) diff --git a/xmltooling/AbstractAttributeExtensibleXMLObject.h b/xmltooling/AbstractAttributeExtensibleXMLObject.h index d7c6daa..e5f716f 100644 --- a/xmltooling/AbstractAttributeExtensibleXMLObject.h +++ b/xmltooling/AbstractAttributeExtensibleXMLObject.h @@ -39,7 +39,7 @@ namespace xmltooling { /** * An abstract implementation of a DOM-caching AttributeExtensibleXMLObject. */ - class XMLTOOL_API AbstractAttributeExtensibleXMLObject : public virtual AbstractDOMCachingXMLObject + class XMLTOOL_API AbstractAttributeExtensibleXMLObject : public virtual AttributeExtensibleXMLObject, public virtual AbstractDOMCachingXMLObject { public: virtual ~AbstractAttributeExtensibleXMLObject(); diff --git a/xmltooling/AbstractExtensibleXMLObject.cpp b/xmltooling/AbstractElementProxy.cpp similarity index 76% rename from xmltooling/AbstractExtensibleXMLObject.cpp rename to xmltooling/AbstractElementProxy.cpp index 8afac3b..989fc33 100644 --- a/xmltooling/AbstractExtensibleXMLObject.cpp +++ b/xmltooling/AbstractElementProxy.cpp @@ -15,23 +15,23 @@ */ /** - * AbstractExtensibleXMLObject.cpp + * AbstractElementProxy.cpp * - * Extension of AbstractDOMCachingXMLObject that implements an ExtensibleXMLObject. + * Extension of AbstractDOMCachingXMLObject that implements an ElementProxy. */ #include "internal.h" -#include "AbstractExtensibleXMLObject.h" +#include "AbstractElementProxy.h" using namespace xmltooling; using namespace std; -void AbstractExtensibleXMLObject::setTextContent(const XMLCh* value) +void AbstractElementProxy::setTextContent(const XMLCh* value) { m_value=prepareForAssignment(m_value,value); } -ListOf(XMLObject) AbstractExtensibleXMLObject::getXMLObjects() +ListOf(XMLObject) AbstractElementProxy::getXMLObjects() { return ListOf(XMLObject)(this,m_children,NULL,m_children.end()); } diff --git a/xmltooling/AbstractExtensibleXMLObject.h b/xmltooling/AbstractElementProxy.h similarity index 72% rename from xmltooling/AbstractExtensibleXMLObject.h rename to xmltooling/AbstractElementProxy.h index fb96a9a..ba122a4 100644 --- a/xmltooling/AbstractExtensibleXMLObject.h +++ b/xmltooling/AbstractElementProxy.h @@ -15,16 +15,16 @@ */ /** - * @file AbstractExtensibleXMLObject.h + * @file AbstractElementProxy.h * - * An abstract implementation of a DOM-caching ExtensibleXMLObject + * An abstract implementation of a DOM-caching ElementProxy */ -#if !defined(__xmltooling_absextxmlobj_h__) -#define __xmltooling_absextxmlobj_h__ +#if !defined(__xmltooling_abseleproxy_h__) +#define __xmltooling_abseleproxy_h__ #include -#include +#include using namespace xercesc; @@ -38,26 +38,26 @@ namespace xmltooling { /** * An abstract implementation of a DOM-caching ExtensibleXMLObject. */ - class XMLTOOL_API AbstractExtensibleXMLObject : public virtual AbstractDOMCachingXMLObject + class XMLTOOL_API AbstractElementProxy : public virtual ElementProxy, public virtual AbstractDOMCachingXMLObject { public: - virtual ~AbstractExtensibleXMLObject() {} + virtual ~AbstractElementProxy() {} /** - * @see ExtensibleXMLObject::getTextContent() + * @see ElementProxy::getTextContent() */ virtual const XMLCh* getTextContent() const { return m_value; } /** - * @see ExtensibleXMLObject::setTextContent() + * @see ElementProxy::setTextContent() */ virtual void setTextContent(const XMLCh* value); /** - * @see ExtensibleXMLObject::getXMLObjects() + * @see ElementProxy::getXMLObjects() */ virtual ListOf(XMLObject) getXMLObjects(); @@ -69,7 +69,7 @@ namespace xmltooling { * @param elementLocalName the local name of the XML element this Object represents * @param namespacePrefix the namespace prefix to use */ - AbstractExtensibleXMLObject( + AbstractElementProxy( const XMLCh* namespaceURI=NULL, const XMLCh* elementLocalName=NULL, const XMLCh* namespacePrefix=NULL ) : AbstractDOMCachingXMLObject(namespaceURI,elementLocalName, namespacePrefix), m_value(NULL) {} @@ -83,4 +83,4 @@ namespace xmltooling { #pragma warning( pop ) #endif -#endif /* __xmltooling_absextxmlobj_h__ */ +#endif /* __xmltooling_abseleproxy_h__ */ diff --git a/xmltooling/ExtensibleXMLObject.h b/xmltooling/ElementProxy.h similarity index 80% rename from xmltooling/ExtensibleXMLObject.h rename to xmltooling/ElementProxy.h index fb31320..874139b 100644 --- a/xmltooling/ExtensibleXMLObject.h +++ b/xmltooling/ElementProxy.h @@ -15,13 +15,13 @@ */ /** - * @file ExtensibleXMLObject.h + * @file ElementProxy.h * * An XMLObject with an open content model */ -#if !defined(__xmltooling_extxmlobj_h__) -#define __xmltooling_extxmlobj_h__ +#if !defined(__xmltooling_eleproxy_h__) +#define __xmltooling_eleproxy_h__ #include #include @@ -33,11 +33,11 @@ namespace xmltooling { /** * An XMLObject with an open content model. */ - class XMLTOOL_API ExtensibleXMLObject : public virtual XMLObject + class XMLTOOL_API ElementProxy : public virtual XMLObject { public: - ExtensibleXMLObject() {} - virtual ~ExtensibleXMLObject() {} + ElementProxy() {} + virtual ~ElementProxy() {} /** * Gets the text content of the object @@ -64,4 +64,4 @@ namespace xmltooling { }; -#endif /* __xmltooling_extxmlobj_h__ */ +#endif /* __xmltooling_eleproxy_h__ */ diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am index 37f7c40..a179d82 100644 --- a/xmltooling/Makefile.am +++ b/xmltooling/Makefile.am @@ -8,14 +8,14 @@ libxmltoolingincludedir = \ libxmltoolinginclude_HEADERS = \ AbstractAttributeExtensibleXMLObject.h \ AbstractDOMCachingXMLObject.h \ - AbstractExtensibleXMLObject.h \ + AbstractElementProxy.h \ AbstractXMLObject.h \ AttributeExtensibleXMLObject.h \ base.h \ config_pub.h \ DOMCachingXMLObject.h \ + ElementProxy.h \ exceptions.h \ - ExtensibleXMLObject.h \ ILockable.h \ Namespace.h \ QName.h \ @@ -50,7 +50,7 @@ noinst_HEADERS = \ libxmltooling_la_SOURCES = \ AbstractAttributeExtensibleXMLObject.cpp \ AbstractDOMCachingXMLObject.cpp \ - AbstractExtensibleXMLObject.cpp \ + AbstractElementProxy.cpp \ Namespace.cpp \ QName.cpp \ unicode.cpp \ diff --git a/xmltooling/xmltooling.vcproj b/xmltooling/xmltooling.vcproj index 0418077..d08bede 100644 --- a/xmltooling/xmltooling.vcproj +++ b/xmltooling/xmltooling.vcproj @@ -190,7 +190,7 @@ > #include #include -#include +#include #include #include #include @@ -156,13 +156,13 @@ private: class WildcardXMLObjectMarshaller; -class WildcardXMLObject : public AbstractExtensibleXMLObject, public AbstractAttributeExtensibleXMLObject +class WildcardXMLObject : public AbstractElementProxy, public AbstractAttributeExtensibleXMLObject { friend class WildcardXMLObjectMarshaller; public: WildcardXMLObject(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix) : AbstractDOMCachingXMLObject(nsURI, localName, prefix), - AbstractExtensibleXMLObject(nsURI, localName, prefix), + AbstractElementProxy(nsURI, localName, prefix), AbstractAttributeExtensibleXMLObject(nsURI, localName, prefix) {} virtual ~WildcardXMLObject() {} -- 2.1.4