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 su...@apache.org on 2003/08/05 07:45:39 UTC
cvs commit: xml-axis/c/src/common Param.h Param.cpp MessageData.cpp BasicTypeSerializer.h BasicTypeSerializer.cpp ArrayBean.h ArrayBean.cpp
susantha 2003/08/04 22:45:39
Modified: c/src/common Param.h Param.cpp MessageData.cpp
BasicTypeSerializer.h BasicTypeSerializer.cpp
ArrayBean.h ArrayBean.cpp
Log:
Some changes due to making BasicTypeSerializer non static
Revision Changes Path
1.9 +3 -0 xml-axis/c/src/common/Param.h
Index: Param.h
===================================================================
RCS file: /home/cvs/xml-axis/c/src/common/Param.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Param.h 26 Jul 2003 11:35:12 -0000 1.8
+++ Param.h 5 Aug 2003 05:45:38 -0000 1.9
@@ -74,6 +74,7 @@
#endif // _MSC_VER > 1000
#include "IParam.h"
+#include "BasicTypeSerializer.h"
#include <string>
using namespace std;
@@ -126,6 +127,8 @@
int SetArrayElements(void* pElements);
int SetUserType(IAccessBean* pObject);
void SetName(char* sName);
+private:
+ BasicTypeSerializer m_BTSZ;
};
#endif // !defined(AFX_PARAM_H__351B13BB_5D03_40C5_93F5_56D17295A8BD__INCLUDED_)
1.10 +6 -6 xml-axis/c/src/common/Param.cpp
Index: Param.cpp
===================================================================
RCS file: /home/cvs/xml-axis/c/src/common/Param.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Param.cpp 26 Jul 2003 11:35:12 -0000 1.9
+++ Param.cpp 5 Aug 2003 05:45:38 -0000 1.10
@@ -238,19 +238,19 @@
string ATprefix;
switch (m_Type){
case XSD_INT:
- pSZ << BasicTypeSerializer::serialize(m_sName, m_Value.nValue).c_str();
+ pSZ << m_BTSZ.serialize(m_sName, m_Value.nValue).c_str();
break;
case XSD_FLOAT:
- pSZ << BasicTypeSerializer::serialize(m_sName, m_Value.fValue).c_str();
+ pSZ << m_BTSZ.serialize(m_sName, m_Value.fValue).c_str();
break;
case XSD_STRING:
- pSZ << BasicTypeSerializer::serialize(m_sName, m_sValue).c_str();
+ pSZ << m_BTSZ.serialize(m_sName, m_sValue).c_str();
break;
case XSD_HEXBINARY:
- pSZ << BasicTypeSerializer::serialize(m_sName, m_sValue, XSD_HEXBINARY).c_str();
+ pSZ << m_BTSZ.serialize(m_sName, m_sValue, XSD_HEXBINARY).c_str();
break;
case XSD_BASE64BINARY:
- pSZ << BasicTypeSerializer::serialize(m_sName, m_sValue, XSD_BASE64BINARY).c_str();
+ pSZ << m_BTSZ.serialize(m_sName, m_sValue, XSD_BASE64BINARY).c_str();
break;
case XSD_ARRAY:
//pSZ << "<abc:ArrayOfPhoneNumbers xmlns:abc="http://example.org/2001/06/numbers"
@@ -283,7 +283,7 @@
else //basic type array
{
pSZ << "xsd:";
- pSZ << BasicTypeSerializer::BasicTypeStr(m_Value.pArray->m_type);
+ pSZ << m_BTSZ.BasicTypeStr(m_Value.pArray->m_type);
}
{
for (list<int>::iterator it=m_Value.pArray->m_size.begin(); it!=m_Value.pArray->m_size.end(); it++)
1.7 +4 -4 xml-axis/c/src/common/MessageData.cpp
Index: MessageData.cpp
===================================================================
RCS file: /home/cvs/xml-axis/c/src/common/MessageData.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MessageData.cpp 1 Aug 2003 14:34:53 -0000 1.6
+++ MessageData.cpp 5 Aug 2003 05:45:38 -0000 1.7
@@ -139,20 +139,20 @@
void MessageData::getSoapSerializer(IHandlerSoapSerializer **pIHandlerSoapSerializer)
{
- *pIHandlerSoapSerializer = dynamic_cast<IHandlerSoapSerializer*>(m_pSZ);
+ *pIHandlerSoapSerializer = static_cast<IHandlerSoapSerializer*>(m_pSZ);
}
void MessageData::getSoapSerializer(IWrapperSoapSerializer **pIWrapperSoapSerializer)
{
- *pIWrapperSoapSerializer = dynamic_cast<IWrapperSoapSerializer*>(m_pSZ);
+ *pIWrapperSoapSerializer = static_cast<IWrapperSoapSerializer*>(m_pSZ);
}
void MessageData::getSoapDeSerializer(IWrapperSoapDeSerializer **pIWrapperSoapDeSerializer)
{
- *pIWrapperSoapDeSerializer= dynamic_cast<IWrapperSoapDeSerializer*>(m_pDZ);
+ *pIWrapperSoapDeSerializer= static_cast<IWrapperSoapDeSerializer*>(m_pDZ);
}
void MessageData::getSoapDeSerializer(IHandlerSoapDeSerializer **pIHandlerSoapDeSerializer)
{
- *pIHandlerSoapDeSerializer= dynamic_cast<IHandlerSoapDeSerializer*>(m_pDZ);
+ *pIHandlerSoapDeSerializer= static_cast<IHandlerSoapDeSerializer*>(m_pDZ);
}
1.9 +10 -10 xml-axis/c/src/common/BasicTypeSerializer.h
Index: BasicTypeSerializer.h
===================================================================
RCS file: /home/cvs/xml-axis/c/src/common/BasicTypeSerializer.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BasicTypeSerializer.h 23 Jul 2003 09:30:47 -0000 1.8
+++ BasicTypeSerializer.h 5 Aug 2003 05:45:38 -0000 1.9
@@ -86,12 +86,11 @@
class BasicTypeSerializer
{
public:
- static string GetEntityReferenced(const string& str);
- static string m_AuxStr;
- static string& serialize(const string& sName, string& sValue, XSDTYPE type=XSD_STRING);
- static string& serialize(const string& sName, float fValue);
- static string& serialize(const string& sName, int nValue);
- static const char* BasicTypeStr(XSDTYPE type);
+ string GetEntityReferenced(const string& str);
+ string& serialize(const string& sName, string& sValue, XSDTYPE type=XSD_STRING);
+ string& serialize(const string& sName, float fValue);
+ string& serialize(const string& sName, int nValue);
+ const char* BasicTypeStr(XSDTYPE type);
BasicTypeSerializer();
virtual ~BasicTypeSerializer();
@@ -106,10 +105,11 @@
};
private:
- static void HelpSerialize(const string &sName, const string &sValue);
- static string m_sSZ;
- static char m_Buf[64]; //used for numeric to string conversions with sprintf
- static XSDTYPE m_Type; //used to temporarily set the type of item being serialized.
+ void HelpSerialize(const string &sName, const string &sValue);
+ string m_sSZ;
+ string m_AuxStr;
+ char m_Buf[32]; //used for numeric to string conversions with sprintf
+ XSDTYPE m_Type; //used to temporarily set the type of item being serialized.
};
#endif // !defined(AFX_BASICTYPESERIALIZER_H__7ECDFED3_F3D5_48A1_A7EF_1E30B93BDB2C__INCLUDED_)
1.8 +2 -5 xml-axis/c/src/common/BasicTypeSerializer.cpp
Index: BasicTypeSerializer.cpp
===================================================================
RCS file: /home/cvs/xml-axis/c/src/common/BasicTypeSerializer.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BasicTypeSerializer.cpp 22 Jul 2003 06:03:00 -0000 1.7
+++ BasicTypeSerializer.cpp 5 Aug 2003 05:45:38 -0000 1.8
@@ -70,14 +70,11 @@
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
-char BasicTypeSerializer::m_Buf[64];
-XSDTYPE BasicTypeSerializer::m_Type;
-string BasicTypeSerializer::m_sSZ = "";
-string BasicTypeSerializer::m_AuxStr = "";
BasicTypeSerializer::BasicTypeSerializer()
{
-
+ m_sSZ = "";
+ m_AuxStr = "";
}
BasicTypeSerializer::~BasicTypeSerializer()
1.4 +3 -0 xml-axis/c/src/common/ArrayBean.h
Index: ArrayBean.h
===================================================================
RCS file: /home/cvs/xml-axis/c/src/common/ArrayBean.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ArrayBean.h 1 Aug 2003 14:34:53 -0000 1.3
+++ ArrayBean.h 5 Aug 2003 05:45:38 -0000 1.4
@@ -10,6 +10,7 @@
#endif // _MSC_VER > 1000
#include "IArrayBean.h"
+#include "BasicTypeSerializer.h"
#include <list>
using namespace std;
@@ -44,6 +45,8 @@
public: //IArrayBean Interface
void AddDimension(int nDim);
void SetItemName(char* sName);
+private:
+ BasicTypeSerializer m_BTSZ;
};
#endif // !defined(AFX_ARRAYBEAN_H__374BEDCF_E850_4907_9CF0_F2EBC61E54CF__INCLUDED_)
1.4 +3 -3 xml-axis/c/src/common/ArrayBean.cpp
Index: ArrayBean.cpp
===================================================================
RCS file: /home/cvs/xml-axis/c/src/common/ArrayBean.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ArrayBean.cpp 1 Aug 2003 14:34:53 -0000 1.3
+++ ArrayBean.cpp 5 Aug 2003 05:45:38 -0000 1.4
@@ -200,7 +200,7 @@
int blocksize = GetArrayBlockSize(it);
for (int ix=0;ix<blocksize;ix++)
{
- pSZ << BasicTypeSerializer::serialize(m_ItemName, *pInt).c_str();
+ pSZ << m_BTSZ.serialize(m_ItemName, *pInt).c_str();
pInt++;
}
}
@@ -212,7 +212,7 @@
int blocksize = GetArrayBlockSize(it);
for (int ix=0;ix<blocksize;ix++)
{
- pSZ << BasicTypeSerializer::serialize(m_ItemName, *pFloat).c_str();
+ pSZ << m_BTSZ.serialize(m_ItemName, *pFloat).c_str();
pFloat++;
}
}
@@ -224,7 +224,7 @@
int blocksize = GetArrayBlockSize(it);
for (int ix=0;ix<blocksize;ix++)
{
- pSZ << BasicTypeSerializer::serialize(m_ItemName, *pStr).c_str();
+ pSZ << m_BTSZ.serialize(m_ItemName, *pStr).c_str();
pStr++;
}
}