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/10 16:15:01 UTC
svn commit: r516726 - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws: ./ c/
c/literal/ cpp/ cpp/literal/
Author: nadiramra
Date: Sat Mar 10 07:15:00 2007
New Revision: 516726
URL: http://svn.apache.org/viewvc?view=rev&rev=516726
Log:
AXISCPP-543 Comments in generated code. This version will add proper method/function prologs.
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java
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/literal/ClientStubWriter.java
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java?view=diff&rev=516726&r1=516725&r2=516726
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java Sat Mar 10 07:15:00 2007
@@ -1390,6 +1390,20 @@
writer.write("\t// ======================================================================\n");
writer.write("\n");
- }
+ }
+ public static void printMethodComment(BufferedWriter writer, String s) throws IOException
+ {
+ writer.write("\n");
+ writer.write("/**\n");
+ writer.write(" ******************************************************************************\n");
+
+ // TODO: divide string into multiple lines if greater then 80, sensitive
+ // to not break line in middle of word. for now all comments are one-liners.
+ writer.write(" * " + s + "\n");
+
+ writer.write(" ******************************************************************************\n");
+ writer.write(" */\n");
+ writer.write("\n");
+ }
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java?view=diff&rev=516726&r1=516725&r2=516726
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java Sat Mar 10 07:15:00 2007
@@ -141,6 +141,9 @@
{
try
{
+ CUtils.printMethodComment(writer, "Function used to create objects of type "
+ + classname + ".");
+
writer.write("extern void* Axis_Create_" + classname + "(int nSize)\n");
writer.write("{\n");
@@ -156,7 +159,6 @@
// End function body
writer.write("}\n");
- writer.write("\n");
}
catch (IOException e)
{
@@ -169,6 +171,9 @@
{
try
{
+ CUtils.printMethodComment(writer, "Function used to delete objects of type "
+ + classname + ".");
+
this.writer.write("extern void Axis_Delete_" + classname
+ "(" + classname + "* param, int nSize)\n");
writer.write("{\n");
@@ -195,7 +200,6 @@
// End function body
writer.write("}\n");
- writer.write("\n");
}
catch (IOException e)
{
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java?view=diff&rev=516726&r1=516725&r2=516726
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java Sat Mar 10 07:15:00 2007
@@ -95,10 +95,9 @@
private void writeSerializeGlobalMethod() throws IOException, WrapperFault
{
- writer.write("\n");
- writer.write("/**\n");
- writer.write(" * This static method serializes a " + classname + " type of object\n");
- writer.write(" */\n");
+ CUtils.printMethodComment(writer, "Function to serialize an object of type "
+ + classname + ".");
+
writer.write("int Axis_Serialize_" + classname
+ "(" + classname + "* param, AXISCHANDLE pSZ, AxiscBool bArray)\n");
writer.write( "{\n");
@@ -484,10 +483,9 @@
private void writeDeSerializeGlobalMethod() throws IOException, WrapperFault
{
- writer.write("\n");
- writer.write("/**\n");
- writer.write(" * This static method deserializes a " + classname + " type of object\n");
- writer.write(" */\n");
+ CUtils.printMethodComment(writer, "Function to deserialize an object of type "
+ + classname + ".");
+
writer.write("int Axis_DeSerialize_" + classname
+ "(" + classname + "* param, AXISCHANDLE pDZ)\n{\n");
@@ -747,13 +745,9 @@
* @throws IOException
*/
private void writeCreateGlobalMethod() throws IOException
- {
- boolean writeNewline = false;
-
- writer.write("\n");
- writer.write("/**\n");
- writer.write(" * This static method to allocate a " + classname + " type of object\n");
- writer.write(" */\n");
+ {
+ CUtils.printMethodComment(writer, "Function used to create objects of type "
+ + classname + ".");
writer.write("void* Axis_Create_" + classname + "(int nSize)\n{\n");
@@ -773,6 +767,8 @@
writer.write("\t\tmemset(pTemp, 0, sizeof(" + classname + "));\n");
writer.write("\n");
+ boolean writeNewline = false;
+
// The only items in the structure that we pre-allocate is for the container structure
// for arrays. All other variables and the actual element array that gets put into
// the container structure for arrays are created by the corresponding deserializer.
@@ -821,11 +817,9 @@
*/
private void writeDeleteGlobalMethod() throws IOException
{
- writer.write("\n");
- writer.write("/**\n");
- writer.write(" * This static method to deallocate a " + classname + " type of object\n");
- writer.write(" */\n");
-
+ CUtils.printMethodComment(writer, "Function used to delete objects of type "
+ + classname + ".");
+
writer.write("void Axis_Delete_" + classname
+ "(" + classname + "* param, int nSize)\n");
@@ -926,7 +920,8 @@
{
try
{
- writer.write("\n");
+ CUtils.printMethodComment(writer, "Function used to check whether object has allowed values. Not implemented yet.");
+
writer.write("int Check_Restrictions_" + classname + "(" + classname + " value)\n");
writer.write("{\n");
writer.write("\treturn 0;\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java?view=diff&rev=516726&r1=516725&r2=516726
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java Sat Mar 10 07:15:00 2007
@@ -78,14 +78,10 @@
protected void writeMethods() throws WrapperFault
{
try
- {
- writer.write("\n");
- writer.write("/* ================================================== */\n" +
- "/* Functions relating to web service client proxy */\n" +
- "/* ================================================== */\n");
- writer.write("\n");
-
+ {
// get_xxx_stub() routine
+ CUtils.printMethodComment(writer, "Function to get new object representing a Web service stub.");
+
writer.write("AXISCHANDLE get_" + classname + "_stub(const char* pchEndPointUri)\n{\n");
writer.write("\tif(pchEndPointUri)\n");
writer.write("\t\treturn axiscStubCreate(pchEndPointUri, AXISC_APTHTTP1_1);\n");
@@ -96,32 +92,30 @@
writer.write("}\n\n");
// destroy_xxxx_stub()
+ CUtils.printMethodComment(writer, "Function to destroy an object representing a Web service stub.");
+
writer.write("void destroy_" + classname + "_stub(AXISCHANDLE p)\n{\n");
writer.write("\taxiscStubDestroy(p);\n}\n\n");
// get_xxxx_Status() routine
+ CUtils.printMethodComment(writer, "Function to get the status of last Web service method invocation.");
+
writer.write("int get_" + classname + "_Status(AXISCHANDLE stub)\n{\n");
writer.write("\tAXISCHANDLE call = axiscStubGetCall(stub);\n");
writer.write("\treturn axiscCallGetStatus(call);\n");
writer.write("}\n\n");
+ CUtils.printMethodComment(writer, "Function to set a Web service stub's exception handler.");
writer.write("void set_" + classname
+ "_ExceptionHandler(AXISCHANDLE stub, AXIS_EXCEPTION_HANDLER_FUNCT fp)\n{\n");
writer.write("\taxiscStubSetCExceptionHandler(stub, (void *)fp);\n");
writer.write("}\n");
- writer.write("\n");
- writer.write("/* ================================================== */\n" +
- "/* Functions corresponding to the web service methods */\n" +
- "/* ================================================== */\n");
- writer.write("\n");
-
MethodInfo minfo;
for (int i = 0; i < methods.size(); i++)
{
minfo = (MethodInfo) methods.get(i);
this.writeMethodInWrapper(minfo);
- writer.write("\n");
}
}
catch (IOException e)
@@ -198,9 +192,9 @@
returntypeissimple = true;
}
}
- writer.write("\n/*\n");
- writer.write(" * This method wrap the service method " + methodName + "\n");
- writer.write(" */\n");
+
+ CUtils.printMethodComment(writer, "This function wraps the service method " + methodName + ".");
+
//method signature
String paramTypeName;
boolean typeisarray = false;
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java?view=diff&rev=516726&r1=516725&r2=516726
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java Sat Mar 10 07:15:00 2007
@@ -101,9 +101,7 @@
// Generate method prototype
//=============================================================================
- writer.write("\n/*\n");
- writer.write(" * This function wraps the service method " + methodName + "\n");
- writer.write(" */\n");
+ CUtils.printMethodComment(writer, "This function wraps the service method " + methodName + ".");
//method signature
String paramTypeName;
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=516726&r1=516725&r2=516726
==============================================================================
--- 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 07:15:00 2007
@@ -89,6 +89,8 @@
{
try
{
+ CUtils.printMethodComment(writer, "Method to delete allocated resources.");
+
writer.write("void " + classname + "::clear()\n");
writer.write("{\n");
writer.write("\tif (m_Array != NULL)\n");
@@ -117,7 +119,7 @@
writer.write("\t\t}\n");
writer.write("\t\tm_belongsToAxisEngine = false;\n");
writer.write("\t}\n");
- writer.write("}\n\n");
+ writer.write("}\n");
}
catch (IOException e)
{
@@ -132,6 +134,8 @@
// Write clone method
try
{
+ CUtils.printMethodComment(writer, "Method to clone objects of type " + classname + ".");
+
writer.write("void " + classname + "::clone(const " + classname + " & original)\n");
writer.write("{\n");
writer.write("\tset((" + attribs[0].getTypeName() + "**) original.m_Array, original.m_Size);\n");
@@ -140,7 +144,7 @@
writer.write("Axis_Array * " + classname + "::clone() const\n");
writer.write("{\n");
writer.write("\treturn new " + classname + "(*this);\n");
- writer.write("}\n\n");
+ writer.write("}\n");
}
catch (IOException e)
{
@@ -154,11 +158,13 @@
{
try
{
+ CUtils.printMethodComment(writer, "Getter method for class member field m_Array.");
+
writer.write(attribs[0].getTypeName() + "** " + classname + "::" + "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");
- writer.write("}\n\n");
+ writer.write("}\n");
}
catch (IOException e)
{
@@ -172,6 +178,8 @@
{
try
{
+ 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("{\n");
writer.write("\tclear();\n");
@@ -197,7 +205,7 @@
writer.write("\t\t\t}\n");
writer.write("\t\t}\n");
writer.write("\t}\n");
- writer.write("}\n\n");
+ writer.write("}\n");
}
catch (IOException e)
{
@@ -208,17 +216,22 @@
{
try
{
+ CUtils.printMethodComment(writer, "Constructor for class " + classname + ".");
+
writer.write(classname + "::" + classname + "()\n");
writer.write("{\n");
writer.write("\tm_Type = USER_TYPE;\n");
writer.write("\tm_belongsToAxisEngine = false;\n");
- writer.write("}\n\n");
+ writer.write("}\n");
+
+ CUtils.printMethodComment(writer, "Copy constructor for class " + classname + ".");
+
writer.write(classname + "::" + classname + "(const " + classname + " & original)\n");
writer.write("{\n");
writer.write("\tm_Type = USER_TYPE;\n");
writer.write("\tm_belongsToAxisEngine = false;\n");
writer.write("\tclone(original);\n");
- writer.write("}\n\n");
+ writer.write("}\n");
}
catch (IOException e)
{
@@ -231,10 +244,12 @@
{
try
{
+ CUtils.printMethodComment(writer, "Destructor for class " + classname + ".");
+
writer.write(classname + "::~" + classname + "()\n");
writer.write("{\n");
writer.write("\tclear();\n");
- writer.write("}\n\n");
+ writer.write("}\n");
}
catch (IOException e)
{
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=516726&r1=516725&r2=516726
==============================================================================
--- 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 07:15:00 2007
@@ -69,9 +69,9 @@
{
writeGetSetMethods();
writeSerializeGlobalMethod();
- writeDeSerializeGlobalMethod();
+ writeDeSerializeGlobalMethod();
writeCreateGlobalMethod();
- writeDeleteGlobalMethod();
+ writeDeleteGlobalMethod();
}
catch (IOException e)
{
@@ -86,16 +86,13 @@
private void writeGetSetMethods() throws WrapperFault
{
- /**
- * Dushshantha: writing getter
- */
- int anyCounter = 0;
-
if (type.isArray())
return;
try
{
+ int anyCounter = 0;
+
for (int i = 0; i < attribs.length; i++)
{
// Set method name
@@ -109,26 +106,55 @@
String type = attribs[i].getTypeName();
+ // arrays require '*' in prototype for type if one not specified.
+ String asterisk = " ";
+
+ // Details
if (attribs[i].isArray())
{
- String parameterTypeName = properParamType;
- if (!parameterTypeName.endsWith("*"))
- parameterTypeName += " *";
-
- writer.write("\n" + parameterTypeName + " " + classname
- + "::get" + methodName + "()\n{\n");
+ // Ensure that type on prototype is a pointer to an array
+ if (!properParamType.endsWith("*"))
+ asterisk += "* ";
+ }
+ else if (attribs[i].isAnyType())
+ {
+ // We use a counter appeneded to parameter name.
+ anyCounter += 1;
+ parameterName = parameterName + Integer.toString(anyCounter);
+ methodName = methodName + Integer.toString(anyCounter);
+ }
+
+ //=============================================================================
+ // Write getter method
+ //=============================================================================
- writer.write("\t" + "return " + parameterName + " ; \n}\n");
+ CUtils.printMethodComment(writer, "Getter method for class member field "
+ + parameterName + ".");
+
+ writer.write(properParamType + asterisk + classname
+ + "::get" + methodName + "()\n{\n");
+
+ writer.write("\t" + "return " + parameterName + "; \n}\n");
- writer.write("\n" + "void " + classname + "::set"
- + methodName + "(" + parameterTypeName + " pInValue)\n{\n");
+ //=============================================================================
+ // Write setter method
+ //=============================================================================
+
+ CUtils.printMethodComment(writer, "Setter method for class member field "
+ + parameterName + ".");
+
+ if (attribs[i].isArray())
+ {
+ writer.write("void " + classname + "::set"
+ + methodName + "(" + properParamType + asterisk + "pInValue)\n{\n");
writer.write("\tif(" + parameterName + " == NULL)\n");
if (attribs[i].getChoiceElement() || attribs[i].getAllElement())
{
+ // TODO: for choice, we need to ensure any other set element is deleted.
writer.write("\t{\n");
- writer.write("\t\t// This object is a 'choice' or 'all', so need to ensure that any\n");
+ writer.write("\t\t// For 'choice' need to ensure that any\n");
writer.write("\t\t// other objects belonging to this union of elements are empty.\n");
writer.write("\t\t// NB: Hasn't been implemented yet!\n");
writer.write("\t\t" + parameterName + " = new " + type + "_Array();\n");
@@ -142,21 +168,9 @@
}
else if (isElementNillable(i) || isElementOptional(i))
{
- if (attribs[i].isAnyType())
- {
- anyCounter += 1;
- parameterName = parameterName + Integer.toString(anyCounter);
- }
-
- // Getter method
- writer.write("\n" + properParamType + " " + classname
- + "::get" + methodName + "()\n{\n");
-
- writer.write("\t" + "return " + parameterName + " ; \n}\n");
-
// Setter method
- writer.write("\n" + "void " + classname + "::set"
- + methodName + "(" + properParamType
+ writer.write("void " + classname + "::set"
+ + methodName + "(" + properParamType
+ " pInValue, bool deep)\n{\n");
writer.write("\tif (__axis_deepcopy_" + parameterName + ")\n");
@@ -178,6 +192,7 @@
writer.write("\t__axis_deepcopy_" + parameterName + " = deep;\n");
+ // TODO: wrong! We need to delete the object if deep copy, otherwise NULL it out.
if (attribs[i].getChoiceElement())
for (int j = 0; j < attribs.length; j++)
if ((attribs[j].getChoiceElement()) && (j != i))
@@ -187,29 +202,7 @@
}
else
{
- /**
- * Dushshantha: Write getter
- */
-
- if (attribs[i].isAnyType())
- {
- anyCounter += 1;
- parameterName = parameterName + Integer.toString(anyCounter);
- methodName = methodName + Integer.toString(anyCounter);
- }
-
- writer.write("\n"
- + properParamType + " " + classname + "::get" + methodName
- + "()\n{\n");
-
- writer.write("\t" + "return " + parameterName + " ; \n}\n");
-
- /**
- * Dushshantha: Write setter
- */
-
- writer.write("\n"
- + "void " + classname + "::set"
+ writer.write("void " + classname + "::set"
+ methodName + "(" + properParamType + " InValue");
Type attributeType = attribs[i].getType();
@@ -268,6 +261,7 @@
else
writer.write("\t" + parameterName + " = InValue ; \n");
+ // TODO: wrong! We need to delete the object if deep copy, otherwise NULL it out.
if (attribs[i].getChoiceElement())
for (int j = 0; j < attribs.length; j++)
if ((attribs[j].getChoiceElement()) && (j != i))
@@ -323,10 +317,10 @@
/* ---------------------------------------------------------------- */
/* NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE */
/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
+
+ CUtils.printMethodComment(writer, "Function to serialize an object of type "
+ + classname + ".");
- writer.write( "/*\n");
- writer.write( " * This static method serialize a " + classname + " type of object\n");
- writer.write( " */\n");
writer.write( "int Axis_Serialize_" + classname
+ "( " + classname + "* param, IWrapperSoapSerializer* pSZ, bool bArray)\n");
writer.write( "{\n");
@@ -719,9 +713,9 @@
/* NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE */
/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
- writer.write("/*\n");
- writer.write(" * This static method deserialize a " + classname + " type of object\n");
- writer.write(" */\n");
+ CUtils.printMethodComment(writer, "Function to deserialize an object of type "
+ + classname + ".");
+
writer.write("int Axis_DeSerialize_" + classname + "(" + classname
+ "* param, IWrapperSoapDeSerializer* pIWSDZ)\n{\n");
@@ -750,6 +744,11 @@
if (attributeParamCount > 0)
CUtils.printBlockComment(writer, "Deserialize attributes.");
+ for (int i = 0; i < attributeParamCount; i++)
+ {
+
+ }
+
//=============================================================================
// Deserialize attributes and elements.
//=============================================================================
@@ -1011,6 +1010,9 @@
private void writeCreateGlobalMethod() throws IOException
{
+ CUtils.printMethodComment(writer, "Function used to create objects of type "
+ + classname + ".");
+
writer.write("void* Axis_Create_" + classname + "(int nSize)\n");
writer.write("{\n");
writer.write("\tif (nSize > 0)\n");
@@ -1028,9 +1030,9 @@
private void writeDeleteGlobalMethod() throws IOException
{
- writer.write("/*\n");
- writer.write(" * This static method delete a " + classname + " type of object\n");
- writer.write(" */\n");
+ CUtils.printMethodComment(writer, "Function used to delete objects of type "
+ + classname + ".");
+
writer.write("void Axis_Delete_" + classname + "(" + classname + "* param, int nSize)\n");
writer.write("{\n");
@@ -1066,7 +1068,9 @@
try
{
// Write default constructor
- writer.write("\n" + classname + "::" + classname + "()\n{\n");
+ CUtils.printMethodComment(writer, "Constructor for class " + classname + ".");
+
+ writer.write(classname + "::" + classname + "()\n{\n");
for (int i = 0 ; i < attribs.length ; i++)
{
if (attribs[i].isArray())
@@ -1074,7 +1078,7 @@
if (attribs[i].getChoiceElement()||attribs[i].getAllElement())
{
// This is the 'choice' or 'all' route in the code
- writer.write("\t\t// This object is a 'choice' or 'all', so need to ensure that any\n");
+ writer.write("\t\t// This a 'choice' so need to ensure that any\n");
writer.write("\t\t// other objects belonging to this union of elements are empty.\n");
writer.write("\t\t// NB: Hasn't been implemented yet!\n");
writer.write("\t" + attribs[i].getParamNameAsMember() + " = new "
@@ -1107,7 +1111,8 @@
try
{
//write copy constructor
- writer.write("\n" + classname + "::" + classname + "(const " + classname + " & original)\n{\n");
+ CUtils.printMethodComment(writer, "Copy constructor for class " + classname + ".");
+ writer.write(classname + "::" + classname + "(const " + classname + " & original)\n{\n");
// AXISCPP-918 patch provided by Franz Fehringer
if (extensionBaseAttrib != null && extensionBaseAttrib.getTypeName() != null)
@@ -1207,7 +1212,9 @@
{
try
{
- writer.write("\nvoid " + classname + "::reset()\n{\n");
+ CUtils.printMethodComment(writer, "Method to initialize objects of class " + classname + ".");
+
+ writer.write("void " + classname + "::reset()\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;
@@ -1277,10 +1284,12 @@
{
try
{
+ CUtils.printMethodComment(writer, "Destructor for class " + classname + ".");
+
if (type.isFault())
- writer.write("\n" + classname + "::~" + classname + "() throw ()\n{\n");
+ writer.write(classname + "::~" + classname + "() throw ()\n{\n");
else
- writer.write("\n" + classname + "::~" + classname + "()\n{\n");
+ writer.write(classname + "::~" + classname + "()\n{\n");
writer.write("\t/*delete any pointer and array members here*/\n");
int anyCounter = 0;
@@ -1332,7 +1341,9 @@
protected void writeRestrictionCheckerFunction() throws WrapperFault
{
try
- {
+ {
+ CUtils.printMethodComment(writer, "Function used to check whether object has allowed values. Not implemented yet.");
+
writer.write("int Check_Restrictions_" + classname + "(" + classname + " value)\n");
//TODO write code to check the restrictions.
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=516726&r1=516725&r2=516726
==============================================================================
--- 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 07:15:00 2007
@@ -92,14 +92,18 @@
{
try
{
+ 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("}\n\n");
+ writer.write("}\n");
+
+ CUtils.printMethodComment(writer, "Constructor for service " + classname + ".");
writer.write(classname + "::" + 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");
- writer.write("}\n\n");
+ writer.write("}\n");
}
catch (IOException e)
{
@@ -116,7 +120,9 @@
{
try
{
- writer.write(classname + "::~" + classname + "()\n{\n}\n\n");
+ CUtils.printMethodComment(writer, "Destructor for service " + classname + ".");
+
+ writer.write(classname + "::~" + classname + "()\n{\n}\n");
}
catch (IOException e)
{
@@ -132,13 +138,11 @@
{
try
{
- writer.write("\n/*Methods corresponding to the web service methods*/\n");
MethodInfo minfo;
for (int i = 0; i < methods.size(); i++)
{
minfo = (MethodInfo) methods.get(i);
this.writeMethodInWrapper(minfo);
- writer.write("\n");
}
}
catch (IOException e)
@@ -225,10 +229,8 @@
//=============================================================================
// Generate method prototype
//=============================================================================
-
- writer.write("\n/*\n");
- writer.write(" * This method wrap the service method " + methodName + "\n");
- writer.write(" */\n");
+
+ CUtils.printMethodComment(writer, "This method wraps the service method " + methodName + ".");
//method signature
String paramTypeName;
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=516726&r1=516725&r2=516726
==============================================================================
--- 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 07:15:00 2007
@@ -119,10 +119,8 @@
//=============================================================================
// Generate method prototype
//=============================================================================
-
- writer.write ("\n/*\n");
- writer.write (" * This method wraps the service method" + methodName + "\n");
- writer.write (" */\n");
+
+ CUtils.printMethodComment(writer, "This method wraps the service method " + methodName + ".");
//method signature
String paramTypeName;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org