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 na...@apache.org on 2007/03/11 07:22:40 UTC
svn commit: r516861 - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp:
ArrayParamWriter.java BeanParamWriter.java ClientStubWriter.java
ExceptionWriter.java ServiceWriter.java WrapWriter.java
literal/ClientStubWriter.java
Author: nadiramra
Date: Sat Mar 10 22:22:39 2007
New Revision: 516861
URL: http://svn.apache.org/viewvc?view=rev&rev=516861
Log:
AXISCPP-543 Code formatting to make more readable.
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java?view=diff&rev=516861&r1=516860&r2=516861
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamWriter.java Sat Mar 10 22:22:39 2007
@@ -91,7 +91,7 @@
{
CUtils.printMethodComment(writer, "Method to delete allocated resources.");
- writer.write("void " + classname + "::clear()\n");
+ writer.write("void " + classname + "::\nclear()\n");
writer.write("{\n");
writer.write("\tif (m_Array != NULL)\n");
writer.write("\t{\n");
@@ -134,14 +134,16 @@
// Write clone method
try
{
- CUtils.printMethodComment(writer, "Method to clone objects of type " + classname + ".");
+ CUtils.printMethodComment(writer, "Method to initialize object from another object of type " + classname + ".");
- writer.write("void " + classname + "::clone(const " + classname + " & original)\n");
+ writer.write("void " + classname + "::\nclone(const " + classname + " & original)\n");
writer.write("{\n");
writer.write("\tset((" + attribs[0].getTypeName() + "**) original.m_Array, original.m_Size);\n");
writer.write("}\n\n");
+
+ CUtils.printMethodComment(writer, "Method to clone objects of type " + classname + ".");
- writer.write("Axis_Array * " + classname + "::clone() const\n");
+ writer.write("Axis_Array * " + classname + "::\nclone() const\n");
writer.write("{\n");
writer.write("\treturn new " + classname + "(*this);\n");
writer.write("}\n");
@@ -160,7 +162,7 @@
{
CUtils.printMethodComment(writer, "Getter method for class member field m_Array.");
- writer.write(attribs[0].getTypeName() + "** " + classname + "::" + "get(int & size) const\n");
+ writer.write(attribs[0].getTypeName() + "** " + classname + "::\n" + "get(int & size) const\n");
writer.write("{\n");
writer.write("\tXSDTYPE type;\n");
writer.write("\treturn (" + attribs[0].getTypeName() + "**) Axis_Array::get(size, type);\n");
@@ -180,7 +182,7 @@
{
CUtils.printMethodComment(writer, "Setter method for class member field m_Array.");
- writer.write("void " + classname + "::" + "set(" + attribs[0].getTypeName() + "** array, const int size)\n");
+ writer.write("void " + classname + "::\n" + "set(" + attribs[0].getTypeName() + "** array, const int size)\n");
writer.write("{\n");
writer.write("\tclear();\n");
writer.write("\tm_Size = size;\n");
@@ -218,7 +220,7 @@
{
CUtils.printMethodComment(writer, "Constructor for class " + classname + ".");
- writer.write(classname + "::" + classname + "()\n");
+ writer.write(classname + "::\n" + classname + "()\n");
writer.write("{\n");
writer.write("\tm_Type = USER_TYPE;\n");
writer.write("\tm_belongsToAxisEngine = false;\n");
@@ -226,7 +228,7 @@
CUtils.printMethodComment(writer, "Copy constructor for class " + classname + ".");
- writer.write(classname + "::" + classname + "(const " + classname + " & original)\n");
+ writer.write(classname + "::\n" + classname + "(const " + classname + " & original)\n");
writer.write("{\n");
writer.write("\tm_Type = USER_TYPE;\n");
writer.write("\tm_belongsToAxisEngine = false;\n");
@@ -246,7 +248,7 @@
{
CUtils.printMethodComment(writer, "Destructor for class " + classname + ".");
- writer.write(classname + "::~" + classname + "()\n");
+ writer.write(classname + "::\n~" + classname + "()\n");
writer.write("{\n");
writer.write("\tclear();\n");
writer.write("}\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java?view=diff&rev=516861&r1=516860&r2=516861
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java Sat Mar 10 22:22:39 2007
@@ -118,7 +118,7 @@
}
else if (attribs[i].isAnyType())
{
- // We use a counter appeneded to parameter name.
+ // We use a counter appended to parameter name.
anyCounter += 1;
parameterName = parameterName + Integer.toString(anyCounter);
methodName = methodName + Integer.toString(anyCounter);
@@ -132,7 +132,7 @@
+ parameterName + ".");
writer.write(properParamType + asterisk + classname
- + "::get" + methodName + "()\n{\n");
+ + "::\nget" + methodName + "()\n{\n");
writer.write("\t" + "return " + parameterName + "; \n}\n");
@@ -145,7 +145,7 @@
if (attribs[i].isArray())
{
- writer.write("void " + classname + "::set"
+ writer.write("void " + classname + "::\nset"
+ methodName + "(" + properParamType + asterisk + "pInValue)\n{\n");
writer.write("\tif(" + parameterName + " == NULL)\n");
@@ -169,7 +169,7 @@
else if (isElementNillable(i) || isElementOptional(i))
{
// Setter method
- writer.write("void " + classname + "::set"
+ writer.write("void " + classname + "::\nset"
+ methodName + "(" + properParamType
+ " pInValue, bool deep)\n{\n");
@@ -202,7 +202,7 @@
}
else
{
- writer.write("void " + classname + "::set"
+ writer.write("void " + classname + "::\nset"
+ methodName + "(" + properParamType + " InValue");
Type attributeType = attribs[i].getType();
@@ -1070,7 +1070,7 @@
// Write default constructor
CUtils.printMethodComment(writer, "Constructor for class " + classname + ".");
- writer.write(classname + "::" + classname + "()\n{\n");
+ writer.write(classname + "::\n" + classname + "()\n{\n");
for (int i = 0 ; i < attribs.length ; i++)
{
if (attribs[i].isArray())
@@ -1112,7 +1112,7 @@
{
//write copy constructor
CUtils.printMethodComment(writer, "Copy constructor for class " + classname + ".");
- writer.write(classname + "::" + classname + "(const " + classname + " & original)\n{\n");
+ writer.write(classname + "::\n" + classname + "(const " + classname + " & original)\n{\n");
// AXISCPP-918 patch provided by Franz Fehringer
if (extensionBaseAttrib != null && extensionBaseAttrib.getTypeName() != null)
@@ -1214,7 +1214,7 @@
{
CUtils.printMethodComment(writer, "Method to initialize objects of class " + classname + ".");
- writer.write("void " + classname + "::reset()\n{\n");
+ writer.write("void " + classname + "::\nreset()\n{\n");
writer.write("\t/*do not allocate memory to any pointer members here\n\t because deserializer will allocate memory anyway. */\n");
int anyCounter = 0;
@@ -1287,9 +1287,9 @@
CUtils.printMethodComment(writer, "Destructor for class " + classname + ".");
if (type.isFault())
- writer.write(classname + "::~" + classname + "() throw ()\n{\n");
+ writer.write(classname + "::\n~" + classname + "() throw ()\n{\n");
else
- writer.write(classname + "::~" + classname + "()\n{\n");
+ writer.write(classname + "::\n~" + classname + "()\n{\n");
writer.write("\t/*delete any pointer and array members here*/\n");
int anyCounter = 0;
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java?view=diff&rev=516861&r1=516860&r2=516861
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java Sat Mar 10 22:22:39 2007
@@ -94,12 +94,12 @@
{
CUtils.printMethodComment(writer, "Constructor for service " + classname + ".");
- writer.write(classname + "::" + classname
- + "(const char* pcEndpointUri, AXIS_PROTOCOL_TYPE eProtocol):Stub(pcEndpointUri, eProtocol)\n{\n");
+ writer.write(classname + "::\n" + classname
+ + "(const char* pcEndpointUri, AXIS_PROTOCOL_TYPE eProtocol)\n:Stub(pcEndpointUri, eProtocol)\n{\n");
writer.write("}\n");
CUtils.printMethodComment(writer, "Constructor for service " + classname + ".");
- writer.write(classname + "::" + classname + "()\n:Stub(\" \", APTHTTP1_1)\n{\n");
+ writer.write(classname + "::\n" + classname + "()\n:Stub(\" \", APTHTTP1_1)\n{\n");
//TODO get TransportURI from WrapInfo and check what the transport is and do the following line accordingly
writer.write("\tm_pCall->setEndpointURI(\""
+ wscontext.getWrapInfo().getTargetEndpointURI() + "\");\n");
@@ -122,7 +122,7 @@
{
CUtils.printMethodComment(writer, "Destructor for service " + classname + ".");
- writer.write(classname + "::~" + classname + "()\n{\n}\n");
+ writer.write(classname + "::\n~" + classname + "()\n{\n}\n");
}
catch (IOException e)
{
@@ -249,7 +249,7 @@
else
writer.write (outparamType + "*");
- writer.write(" " + classname + "::" + methodName + "(");
+ writer.write(" " + classname + "::\n" + methodName + "(");
ArrayList paramsB = (ArrayList) params;
for (int i = 0; i < paramsB.size(); i++)
{
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java?view=diff&rev=516861&r1=516860&r2=516861
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ExceptionWriter.java Sat Mar 10 22:22:39 2007
@@ -184,7 +184,7 @@
}
writer.write(
- faultName + "::" + faultName + "(ISoapFault* pFault)\n");
+ faultName + "::\n" + faultName + "(ISoapFault* pFault)\n");
writer.write("{\n");
writer.write(
"\tm_iExceptionCode = AXISC_SERVICE_THROWN_EXCEPTION;\n");
@@ -192,7 +192,7 @@
writer.write("}\n\n");
writer.write(
- faultName + "::" + faultName + "(const int iExceptionCode, const char* pcMessage):AxisException(iExceptionCode)\n");
+ faultName + "::\n" + faultName + "(const int iExceptionCode, const char* pcMessage):AxisException(iExceptionCode)\n");
writer.write("{\n\n");
writer.write("\tstring sMessage = \"\";\n");
writer.write("\tif (pcMessage)\n\t{\n");
@@ -204,7 +204,7 @@
writer.write("\telse\n");
writer.write("\t\tsetMessage(getMessageForExceptionCode(iExceptionCode).c_str());\n");
writer.write("}\n\n");
- writer.write(faultName + "::" + faultName + "(const " + faultName + "& e):AxisException(e)\n");
+ writer.write(faultName + "::\n" + faultName + "(const " + faultName + "& e):AxisException(e)\n");
writer.write("{}\n\n");
@@ -230,7 +230,7 @@
}
writer.write(
faultName
- + "::~"
+ + "::\n~"
+ faultName
+ "() throw () \n{}\n\n");
}
@@ -257,7 +257,7 @@
writer.write(
"string "
+ faultName
- + "::getMessageForExceptionCode (int iExceptionCode)\n");
+ + "::\ngetMessageForExceptionCode (int iExceptionCode)\n");
writer.write("{\n");
writer.write("\tswitch(iExceptionCode)\n");
writer.write("\t{\n");
@@ -276,7 +276,7 @@
writer.write("return m_sMessageForExceptionCode;\n");
writer.write("}\n\n");
- writer.write("const ISoapFault* " + faultName + "::getFault()");
+ writer.write("const ISoapFault* " + faultName + "::\ngetFault()");
//Fred Preston
writer.write("{\n");
writer.write("\treturn m_pISoapFault;\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java?view=diff&rev=516861&r1=516860&r2=516861
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java Sat Mar 10 22:22:39 2007
@@ -88,7 +88,7 @@
{
try
{
- writer.write("\n" + classname + "::" + classname + "()\n{\n");
+ writer.write("\n" + classname + "::\n" + classname + "()\n{\n");
writer.write("}\n");
}
catch (IOException e)
@@ -104,7 +104,7 @@
{
try
{
- writer.write("\n" + classname + "::~" + classname + "()\n{\n");
+ writer.write("\n" + classname + "::\n~" + classname + "()\n{\n");
writer.write("}\n");
}
catch (IOException e)
@@ -125,17 +125,17 @@
"\n/* This function is called by the AxisEngine when something went wrong"
+ "\n with the current web service request processing. Appropriate actions should"
+ "\n be taken here.*/");
- writer.write("\nvoid " + classname + "::onFault()\n{\n}");
+ writer.write("\nvoid " + classname + "::\nonFault()\n{\n}");
/*writer.write(
"\n/* This function is called by the AxisEngine when this web service"
+ "\n library is first loaded. So here we can initialize any global/static"
+ "\n data structures of this web service or open database connections *//*");
- writer.write("\nvoid " + classname + "::init()\n{\n}");
+ writer.write("\nvoid " + classname + "::\ninit()\n{\n}");
writer.write(
"\n/* This function is called by the AxisEngine when this web service"
+ "\n library is unloaded. So we can deallocate any global/static data structures"
+ "\n and close database connections etc here. *//*");
- writer.write("\nvoid " + classname + "::fini()\n{\n}");*/
+ writer.write("\nvoid " + classname + "::\nfini()\n{\n}");*/
writer.write("\n\n");
for (int i = 0; i < methods.size(); i++)
{
@@ -180,7 +180,7 @@
writer.write("void ");
}
}
- writer.write(classname + "::" + minfo.getMethodname() + "(");
+ writer.write(classname + "::\n" + minfo.getMethodname() + "(");
//write parameter names
boolean hasInputParms = false;
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java?view=diff&rev=516861&r1=516860&r2=516861
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java Sat Mar 10 22:22:39 2007
@@ -87,7 +87,7 @@
{
try
{
- writer.write(classname + "::" + classname + "()\n{\n");
+ writer.write(classname + "::\n" + classname + "()\n{\n");
writer.write(
"\tpWs = new "
+ CUtils.getWebServiceNameFromWrapperName(classname)
@@ -108,7 +108,7 @@
try
{
writer.write(
- classname + "::~" + classname + "()\n{\n\tdelete pWs;\n}\n\n");
+ classname + "::\n~" + classname + "()\n{\n\tdelete pWs;\n}\n\n");
}
catch (IOException e)
{
@@ -129,17 +129,17 @@
writer.write(
"void "
+ classname
- + "::onFault(void *pMsg)\n{"
+ + "::\nonFault(void *pMsg)\n{"
+ "\n\tpWs->onFault();\n}\n\n");
/*writer.write(
"int "
+ classname
- + "::init()\n{\n"
+ + "::\ninit()\n{\n"
+ "\tpWs->init();\n\treturn AXIS_SUCCESS;\n}\n\n");
writer.write(
"int "
+ classname
- + "::fini()\n{\n"
+ + "::\nfini()\n{\n"
+ "\tpWs->fini();\n\treturn AXIS_SUCCESS;\n}\n\n");
*/
writeInvoke();
@@ -188,7 +188,7 @@
writer.write("\n/*\n");
writer.write(" * This method invokes the right service method \n");
writer.write(" */\n");
- writer.write("int " + classname + "::invoke(void *pMsg)\n{\n");
+ writer.write("int " + classname + "::\ninvoke(void *pMsg)\n{\n");
writer.write("\tIMessageData* mc = (IMessageData*)pMsg;\n");
//msgdata.setSoapFault(new SOAPFault(new AxisFault()))
writer.write("\tconst AxisChar *method = mc->getOperationName();\n");
@@ -283,7 +283,7 @@
writer.write(" */\n");
//method signature
writer.write(
- "int " + classname + "::" + methodName + "(void* pMsg)\n{\n");
+ "int " + classname + "::\n" + methodName + "(void* pMsg)\n{\n");
writer.write("\tIMessageData* mc = (IMessageData*)pMsg;\n");
writer.write("\tint nStatus;\n");
writer.write("\tIWrapperSoapSerializer* pIWSSZ = NULL;\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java?view=diff&rev=516861&r1=516860&r2=516861
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java Sat Mar 10 22:22:39 2007
@@ -139,7 +139,7 @@
else
writer.write (outparamType + "*");
- writer.write (" " + classname + "::" + methodName + "(");
+ writer.write (" " + classname + "::\n" + methodName + "(");
ArrayList paramsB = (ArrayList) params;
ParameterInfo paramtype = null;
if (0 < paramsB.size ())
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org