You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ro...@apache.org on 2004/06/01 08:42:18 UTC
cvs commit: ws-axis/c/src/soap BasicNode.cpp CharacterElement.cpp
roshan 2004/05/31 23:42:18
Modified: c/include/axis/server BasicNode.h
c/src/soap BasicNode.cpp CharacterElement.cpp
Log:
fixed a problem: the BasisNode always sets its type as ELEMENT_NODE, which is wrong
Revision Changes Path
1.10 +3 -4 ws-axis/c/include/axis/server/BasicNode.h
Index: BasicNode.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/BasicNode.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BasicNode.h 25 May 2004 12:13:20 -0000 1.9
+++ BasicNode.h 1 Jun 2004 06:42:18 -0000 1.10
@@ -28,10 +28,10 @@
enum NODE_TYPE { ELEMENT_NODE=1, CHARACTER_NODE};
/*
- * @class BasicNode
- * @brief interface for the BasicNode class.
+ * @class BasicNode
+ * @brief interface for the BasicNode class.
*
- * @author Roshan Weerasuriya (roshan@jkcsworld.com, roshan@opensource.lk)
+ * @author Roshan Weerasuriya (roshan@opensource.lk, roshanw@jkcsworld.com)
* @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*
*/
@@ -73,7 +73,6 @@
protected:
NODE_TYPE m_iNodeType;
- /* string m_sPrefix; */
AxisChar* m_pachValue;
};
1.7 +4 -4 ws-axis/c/src/soap/BasicNode.cpp
Index: BasicNode.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/BasicNode.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicNode.cpp 25 May 2004 12:15:05 -0000 1.6
+++ BasicNode.cpp 1 Jun 2004 06:42:18 -0000 1.7
@@ -23,7 +23,7 @@
*
*
*
- * @author Roshan Weerasuriya (roshan@jkcsworld.com, roshan@opensource.lk)
+ * @author Roshan Weerasuriya (roshan@opensource.lk, roshanw@jkcsworld.com)
* @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*
*/
@@ -35,17 +35,17 @@
#include <axis/server/BasicNode.h>
-BasicNode::BasicNode():m_iNodeType(ELEMENT_NODE), m_pachValue(NULL)
+BasicNode::BasicNode():m_pachValue(NULL)
{}
-BasicNode::BasicNode(const AxisChar* pachValue, NODE_TYPE eNodeType):m_iNodeType(ELEMENT_NODE), m_pachValue(NULL)
+BasicNode::BasicNode(const AxisChar* pachValue, NODE_TYPE eNodeType):m_iNodeType(eNodeType), m_pachValue(NULL)
{
if(pachValue)
this->m_pachValue = strdup(pachValue);
}
-BasicNode::BasicNode(const BasicNode& rCopy):m_iNodeType(ELEMENT_NODE), m_pachValue(NULL)
+BasicNode::BasicNode(const BasicNode& rCopy):m_iNodeType(rCopy.m_iNodeType), m_pachValue(NULL)
{
if(this->m_pachValue)
free(this->m_pachValue);
1.15 +2 -11 ws-axis/c/src/soap/CharacterElement.cpp
Index: CharacterElement.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/CharacterElement.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CharacterElement.cpp 25 May 2004 12:15:05 -0000 1.14
+++ CharacterElement.cpp 1 Jun 2004 06:42:18 -0000 1.15
@@ -23,7 +23,7 @@
*
*
*
- * @author Roshan Weerasuriya (roshan@jkcs.slt.lk, roshan@opensource.lk)
+ * @author Roshan Weerasuriya (roshan@opensource.lk, roshanw@jkcsworld.com)
* @author Samisa Abeysinghe (sabeysinghe@virtusa.com)
*
*/
@@ -35,7 +35,7 @@
* rahter than working on base class attribute from derived class
*/
-/* haracterElement.cpp: implementation of the CharacterElement class. */
+/* CharacterElement.cpp: implementation of the CharacterElement class. */
#include <axis/server/CharacterElement.h>
@@ -44,18 +44,10 @@
CharacterElement::CharacterElement():BasicNode( NULL, CHARACTER_NODE)
{
-/* m_iNodeType= CHARACTER_NODE;
- m_pachValue = '\0';
- */
}
CharacterElement::CharacterElement(const AxisChar* pachValue):BasicNode(pachValue, CHARACTER_NODE)
{
- /*
- m_pachValue = (AxisChar*) malloc(strlen(pachValue)+1);
- strcpy(m_pachValue, pachValue);
- m_iNodeType= CHARACTER_NODE;
- */
}
CharacterElement::CharacterElement(const CharacterElement& rCopy):BasicNode(rCopy)
@@ -69,7 +61,6 @@
CharacterElement::~CharacterElement()
{
- //free(m_pachValue);
}
NODE_TYPE CharacterElement::getNodeType() const