Renamed classes

git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/trunk@48 de75baf8-a10c-0410-a50a-987c0e22f00f

diff --git a/xmltooling/AbstractAttributeExtensibleXMLObject.h b/xmltooling/AbstractAttributeExtensibleXMLObject.h
index d7c6daa..e5f716f 100644 (file)
--- a/xmltooling/AbstractAttributeExtensibleXMLObject.h
+++ b/xmltooling/AbstractAttributeExtensibleXMLObject.h
@@ -39,7 +39,7 @@ namespace xmltooling {
     /**\r
      * An abstract implementation of a DOM-caching AttributeExtensibleXMLObject.\r
      */\r
-    class XMLTOOL_API AbstractAttributeExtensibleXMLObject : public virtual AbstractDOMCachingXMLObject\r
+    class XMLTOOL_API AbstractAttributeExtensibleXMLObject : public virtual AttributeExtensibleXMLObject, public virtual AbstractDOMCachingXMLObject\r
     {\r
     public:\r
         virtual ~AbstractAttributeExtensibleXMLObject();\r

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 (file)
--- a/xmltooling/AbstractExtensibleXMLObject.cpp
+++ b/xmltooling/AbstractElementProxy.cpp
@@ -15,23 +15,23 @@
  */\r
 \r
 /**\r
- * AbstractExtensibleXMLObject.cpp\r
+ * AbstractElementProxy.cpp\r
  * \r
- * Extension of AbstractDOMCachingXMLObject that implements an ExtensibleXMLObject. \r
+ * Extension of AbstractDOMCachingXMLObject that implements an ElementProxy. \r
  */\r
 \r
 #include "internal.h"\r
-#include "AbstractExtensibleXMLObject.h"\r
+#include "AbstractElementProxy.h"\r
 \r
 using namespace xmltooling;\r
 using namespace std;\r
 \r
-void AbstractExtensibleXMLObject::setTextContent(const XMLCh* value)\r
+void AbstractElementProxy::setTextContent(const XMLCh* value)\r
 {\r
     m_value=prepareForAssignment(m_value,value);\r
 }\r
 \r
-ListOf(XMLObject) AbstractExtensibleXMLObject::getXMLObjects()\r
+ListOf(XMLObject) AbstractElementProxy::getXMLObjects()\r
 {\r
     return ListOf(XMLObject)(this,m_children,NULL,m_children.end());\r
 }\r

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 (file)
--- a/xmltooling/AbstractExtensibleXMLObject.h
+++ b/xmltooling/AbstractElementProxy.h
@@ -15,16 +15,16 @@
  */\r
 \r
 /**\r
- * @file AbstractExtensibleXMLObject.h\r
+ * @file AbstractElementProxy.h\r
  * \r
- * An abstract implementation of a DOM-caching ExtensibleXMLObject \r
+ * An abstract implementation of a DOM-caching ElementProxy \r
  */\r
 \r
-#if !defined(__xmltooling_absextxmlobj_h__)\r
-#define __xmltooling_absextxmlobj_h__\r
+#if !defined(__xmltooling_abseleproxy_h__)\r
+#define __xmltooling_abseleproxy_h__\r
 \r
 #include <xmltooling/AbstractDOMCachingXMLObject.h>\r
-#include <xmltooling/ExtensibleXMLObject.h>\r
+#include <xmltooling/ElementProxy.h>\r
 \r
 using namespace xercesc;\r
 \r
@@ -38,26 +38,26 @@ namespace xmltooling {
     /**\r
      * An abstract implementation of a DOM-caching ExtensibleXMLObject.\r
      */\r
-    class XMLTOOL_API AbstractExtensibleXMLObject : public virtual AbstractDOMCachingXMLObject\r
+    class XMLTOOL_API AbstractElementProxy : public virtual ElementProxy, public virtual AbstractDOMCachingXMLObject\r
     {\r
     public:\r
-        virtual ~AbstractExtensibleXMLObject() {}\r
+        virtual ~AbstractElementProxy() {}\r
         \r
         /**\r
-         * @see ExtensibleXMLObject::getTextContent()\r
+         * @see ElementProxy::getTextContent()\r
          */\r
         virtual const XMLCh* getTextContent() const {\r
             return m_value;\r
         }\r
         \r
         /**\r
-         * @see ExtensibleXMLObject::setTextContent()\r
+         * @see ElementProxy::setTextContent()\r
          */\r
         virtual void setTextContent(const XMLCh* value);\r
         \r
 \r
         /**\r
-         * @see ExtensibleXMLObject::getXMLObjects()\r
+         * @see ElementProxy::getXMLObjects()\r
          */\r
         virtual ListOf(XMLObject) getXMLObjects();\r
     \r
@@ -69,7 +69,7 @@ namespace xmltooling {
          * @param elementLocalName the local name of the XML element this Object represents\r
          * @param namespacePrefix the namespace prefix to use\r
          */\r
-        AbstractExtensibleXMLObject(\r
+        AbstractElementProxy(\r
             const XMLCh* namespaceURI=NULL, const XMLCh* elementLocalName=NULL, const XMLCh* namespacePrefix=NULL\r
             ) : AbstractDOMCachingXMLObject(namespaceURI,elementLocalName, namespacePrefix), m_value(NULL) {}\r
 \r
@@ -83,4 +83,4 @@ namespace xmltooling {
     #pragma warning( pop )\r
 #endif\r
 \r
-#endif /* __xmltooling_absextxmlobj_h__ */\r
+#endif /* __xmltooling_abseleproxy_h__ */\r

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 (file)
--- a/xmltooling/ExtensibleXMLObject.h
+++ b/xmltooling/ElementProxy.h
@@ -15,13 +15,13 @@
  */\r
 \r
 /**\r
- * @file ExtensibleXMLObject.h\r
+ * @file ElementProxy.h\r
  * \r
  * An XMLObject with an open content model \r
  */\r
 \r
-#if !defined(__xmltooling_extxmlobj_h__)\r
-#define __xmltooling_extxmlobj_h__\r
+#if !defined(__xmltooling_eleproxy_h__)\r
+#define __xmltooling_eleproxy_h__\r
 \r
 #include <xmltooling/XMLObject.h>\r
 #include <xmltooling/util/XMLObjectChildrenList.h>\r
@@ -33,11 +33,11 @@ namespace xmltooling {
     /**\r
      * An XMLObject with an open content model.\r
      */\r
-    class XMLTOOL_API ExtensibleXMLObject : public virtual XMLObject\r
+    class XMLTOOL_API ElementProxy : public virtual XMLObject\r
     {\r
     public:\r
-        ExtensibleXMLObject() {}\r
-        virtual ~ExtensibleXMLObject() {}\r
+        ElementProxy() {}\r
+        virtual ~ElementProxy() {}\r
         \r
         /**\r
          * Gets the text content of the object\r
@@ -64,4 +64,4 @@ namespace xmltooling {
     \r
 };\r
 \r
-#endif /* __xmltooling_extxmlobj_h__ */\r
+#endif /* __xmltooling_eleproxy_h__ */\r

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 37f7c40..a179d82 100644 (file)
--- 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 (file)
--- a/xmltooling/xmltooling.vcproj
+++ b/xmltooling/xmltooling.vcproj
@@ -190,7 +190,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\AbstractExtensibleXMLObject.cpp"\r
+                               RelativePath=".\AbstractElementProxy.cpp"\r
                                >\r
                        </File>\r
                        <File\r
@@ -276,7 +276,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\AbstractExtensibleXMLObject.h"\r
+                               RelativePath=".\AbstractElementProxy.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -300,11 +300,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\exceptions.h"\r
+                               RelativePath=".\ElementProxy.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\ExtensibleXMLObject.h"\r
+                               RelativePath=".\exceptions.h"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/xmltoolingtest/XMLObjectBaseTestCase.h b/xmltoolingtest/XMLObjectBaseTestCase.h
index 66f676e..28aa716 100644 (file)
--- a/xmltoolingtest/XMLObjectBaseTestCase.h
+++ b/xmltoolingtest/XMLObjectBaseTestCase.h
@@ -17,7 +17,7 @@
 #include <cxxtest/TestSuite.h>
 #include <xmltooling/AbstractAttributeExtensibleXMLObject.h>
 #include <xmltooling/AbstractDOMCachingXMLObject.h>
-#include <xmltooling/AbstractExtensibleXMLObject.h>
+#include <xmltooling/AbstractElementProxy.h>
 #include <xmltooling/exceptions.h>
 #include <xmltooling/XMLObjectBuilder.h>
 #include <xmltooling/XMLToolingConfig.h>
@@ -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() {}