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 2006/03/16 02:24:13 UTC
svn commit: r386235 [1/3] -
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/
Author: nadiramra
Date: Wed Mar 15 17:24:11 2006
New Revision: 386235
URL: http://svn.apache.org/viewcvs?rev=386235&view=rev
Log:
Format code so more readable - align braces, etc.
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/AllParamWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ServiceHeaderWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/AllParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/AllParamWriter.java?rev=386235&r1=386234&r2=386235&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/AllParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/AllParamWriter.java Wed Mar 15 17:24:11 2006
@@ -94,10 +94,10 @@
Type currentType = wscontext.getTypemap().getType(elementQname);
if (currentType != null)
{
- if ( currentType.isSimpleType())
- {
- continue;
- }
+ if ( currentType.isSimpleType())
+ {
+ continue;
+ }
}
if (CUtils.isSimpleType(qname)
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java?rev=386235&r1=386234&r2=386235&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java Wed Mar 15 17:24:11 2006
@@ -151,7 +151,7 @@
{
attribs[i].setParamName( CUtils.sanitiseAttributeName( classname, attribs[i].getParamName()));
- String methodName = attribs[i].getParamNameWithoutSymbols();
+ String methodName = attribs[i].getParamNameWithoutSymbols();
String parameterName = methodName;
String properParamName = getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i]);
String type = attribs[i].getTypeName();
@@ -187,10 +187,10 @@
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// 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");
+ writer.write("\t\t// This object is a 'choice' or 'all', 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\t" + parameterName + " = new " + type + "_Array();\n");
}
else
{
@@ -201,62 +201,62 @@
if (attribs[i].getChoiceElement()||attribs[i].getAllElement())
{
// This is the 'choice' or 'all' route in the code
- writer.write("\t" + parameterName + "->clone( *pInValue);\n");
+ writer.write("\t" + parameterName + "->clone( *pInValue);\n");
}
else
{
- writer.write("\t" + parameterName + "->clone( *pInValue);\n");
+ writer.write("\t" + parameterName + "->clone( *pInValue);\n");
}
writer.write("}\n");
}
else
{
- // FJP Nillable vv
- if (isElementNillable(i) || isElementOptional(i))
- {
- if (attribs[i].isAnyType())
- {
- anyCounter += 1;
- parameterName = parameterName + Integer.toString(anyCounter);
- }
- if(attribs[i].getAllElement() || attribs[i].getChoiceElement() )
- {
- if (isElementNillable(i))
- writer.write("\n" + properParamName + " * " + classname
- + "::get" + methodName + "()\n{\n");
- else
- writer.write("\n" + properParamName + " " + classname
- + "::get" + methodName + "()\n{\n");
- }
-
- else
- {
- writer.write("\n" + properParamName + " * " + classname
- + "::get" + methodName + "()\n{\n");
- }
-
- writer.write("\t" + "return " + parameterName + " ; \n}\n");
-
- if(attribs[i].getAllElement() || attribs[i].getChoiceElement())
- {
- if (isElementNillable(i))
- writer.write("\n" + "void " + classname + "::set"
- + methodName + "(" + properParamName
- + " * pInValue, bool deep)\n{\n");
- else
- writer.write("\n" + "void " + classname + "::set"
- + methodName + "(" + properParamName
- + " pInValue, bool deep)\n{\n");
- }
- else
- {
- writer.write("\n" + "void " + classname + "::set"
- + methodName + "(" + properParamName
- + " * pInValue, bool deep)\n{\n");
- }
-
-
- writer.write("\tif (" + parameterName + " != NULL)\n");
+ // FJP Nillable vv
+ if (isElementNillable(i) || isElementOptional(i))
+ {
+ if (attribs[i].isAnyType())
+ {
+ anyCounter += 1;
+ parameterName = parameterName + Integer.toString(anyCounter);
+ }
+ if(attribs[i].getAllElement() || attribs[i].getChoiceElement() )
+ {
+ if (isElementNillable(i))
+ writer.write("\n" + properParamName + " * " + classname
+ + "::get" + methodName + "()\n{\n");
+ else
+ writer.write("\n" + properParamName + " " + classname
+ + "::get" + methodName + "()\n{\n");
+ }
+
+ else
+ {
+ writer.write("\n" + properParamName + " * " + classname
+ + "::get" + methodName + "()\n{\n");
+ }
+
+ writer.write("\t" + "return " + parameterName + " ; \n}\n");
+
+ if(attribs[i].getAllElement() || attribs[i].getChoiceElement())
+ {
+ if (isElementNillable(i))
+ writer.write("\n" + "void " + classname + "::set"
+ + methodName + "(" + properParamName
+ + " * pInValue, bool deep)\n{\n");
+ else
+ writer.write("\n" + "void " + classname + "::set"
+ + methodName + "(" + properParamName
+ + " pInValue, bool deep)\n{\n");
+ }
+ else
+ {
+ writer.write("\n" + "void " + classname + "::set"
+ + methodName + "(" + properParamName
+ + " * pInValue, bool deep)\n{\n");
+ }
+
+
+ writer.write("\tif (" + parameterName + " != NULL)\n");
writer.write("\t{\n");
writer.write("\t\tif (__axis_deepcopy_" + parameterName + ")\n");
writer.write("\t\t{\n");
@@ -270,14 +270,14 @@
writer.write("\t\t{\n");
if(attribs[i].getAllElement() || attribs[i].getChoiceElement())
{
- if (isElementNillable(i))
- writer.write("\t\t\t" + parameterName + " = new " + type + "*();\n");
- else
- writer.write("\t\t\t" + parameterName + " = new " + type + "();\n");
+ if (isElementNillable(i))
+ writer.write("\t\t\t" + parameterName + " = new " + type + "*();\n");
+ else
+ writer.write("\t\t\t" + parameterName + " = new " + type + "();\n");
}
else
{
- writer.write("\t\t\t" + parameterName + " = new " + properParamName + "();\n");
+ writer.write("\t\t\t" + parameterName + " = new " + properParamName + "();\n");
}
writer.write("\t\t\t*" + parameterName + " = *pInValue;\n");
writer.write("\t\t}\n");
@@ -292,119 +292,119 @@
writer.write("\t}\n");
writer.write("\t__axis_deepcopy_" + parameterName + " = deep;\n");
-
- if (attribs[i].getChoiceElement())
- {
- for (int j = 0; j < attribs.length; j++)
- {
- if ((attribs[j].getChoiceElement()) && (j != i))
- {
- writer.write("\t"
- + attribs[j].getParamNameWithoutSymbols()
- + " = NULL ; \n");
- }
- }
- }
- if (attribs[i].getAllElement())
- {
- for (int j = 0; j < attribs.length; j++)
- {
- if ((attribs[j].getAllElement()) && (j != i))
- {
- writer.write("\t"
- + attribs[j].getParamNameWithoutSymbols()
- + " = NULL ; \n");
- }
- }
- }
-
- writer.write("}\n");
- }
- else
- {
- // FJP Nillable ^^
-
- /**
- * Dushshantha: Write getter
- */
-
+
+ if (attribs[i].getChoiceElement())
+ {
+ for (int j = 0; j < attribs.length; j++)
+ {
+ if ((attribs[j].getChoiceElement()) && (j != i))
+ {
+ writer.write("\t"
+ + attribs[j].getParamNameWithoutSymbols()
+ + " = NULL ; \n");
+ }
+ }
+ }
+ if (attribs[i].getAllElement())
+ {
+ for (int j = 0; j < attribs.length; j++)
+ {
+ if ((attribs[j].getAllElement()) && (j != i))
+ {
+ writer.write("\t"
+ + attribs[j].getParamNameWithoutSymbols()
+ + " = NULL ; \n");
+ }
+ }
+ }
+
+ writer.write("}\n");
+ }
+ else
+ {
+ // FJP Nillable ^^
+
+ /**
+ * Dushshantha: Write getter
+ */
+
- if (attribs[i].isAnyType())
- {
- anyCounter += 1;
- parameterName = parameterName + Integer.toString(anyCounter);
- methodName = methodName + Integer.toString(anyCounter);
- }
-
- writer.write("\n"
- + properParamName
- + " " + classname + "::get"
- + methodName
- + "()\n{\n");
-
- writer.write("\t" + "return "
- + parameterName
- + " ; \n}\n");
-
- /**
- * Dushshantha: Write setter
- */
-
- writer.write("\n"
- + "void "
- + classname
- + "::set"
- + methodName
- + "("
- + properParamName
- + " InValue");
- Type attributeType = attribs[i].getType();
- boolean isPointerType = false;
- if (attributeType.isSimpleType())
- {
- isPointerType = CUtils.isPointerType(CUtils.getclass4qname(attributeType.getBaseType()));
- }
- else
- {
- isPointerType = CUtils.isPointerType(getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i]));
- }
- if((attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()) && (isPointerType || attribs[i].getAllElement() || attribs[i].getChoiceElement()))
- {
- writer.write(", bool deep");
- }
- writer.write(")\n{\n");
-
- if(isPointerType)
- {
- writer.write("\tif (" + parameterName + " != NULL)\n");
- writer.write("\t{\n");
- writer.write("\t\tif (__axis_deepcopy_" + parameterName + ")\n");
- writer.write("\t\t{\n");
- writer.write("\t\t\tdelete [] " + parameterName + ";\n");
- writer.write("\t\t}\n");
- writer.write("\t\t" + parameterName + " = NULL;\n");
- writer.write("\t}\n\n");
- writer.write("\tif(InValue != NULL)\n");
- writer.write("\t{\n");
- writer.write("\t\tif (deep)\n");
- writer.write("\t\t{\n");
- writer.write("\t\t\t" + parameterName + " = new char[strlen(InValue) + 1];\n");
- writer.write("\t\t\tstrcpy(" + parameterName + ", InValue);\n");
- writer.write("\t\t}\n");
- writer.write("\t\telse\n");
- writer.write("\t\t{\n");
- writer.write("\t\t\t" + parameterName + " = InValue;\n");
- writer.write("\t\t}\n");
- writer.write("\t}\n");
- writer.write("\telse\n");
- writer.write("\t{\n");
- writer.write("\t\t" + parameterName + " = NULL;\n");
- writer.write("\t}\n");
- writer.write("\t__axis_deepcopy_" + parameterName + " = deep;\n");
- }
- else if ((attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()) && (attribs[i].getAllElement() || attribs[i].getChoiceElement()))
- {
+ if (attribs[i].isAnyType())
+ {
+ anyCounter += 1;
+ parameterName = parameterName + Integer.toString(anyCounter);
+ methodName = methodName + Integer.toString(anyCounter);
+ }
+
+ writer.write("\n"
+ + properParamName
+ + " " + classname + "::get"
+ + methodName
+ + "()\n{\n");
+
+ writer.write("\t" + "return "
+ + parameterName
+ + " ; \n}\n");
+
+ /**
+ * Dushshantha: Write setter
+ */
+
+ writer.write("\n"
+ + "void "
+ + classname
+ + "::set"
+ + methodName
+ + "("
+ + properParamName
+ + " InValue");
+ Type attributeType = attribs[i].getType();
+ boolean isPointerType = false;
+ if (attributeType.isSimpleType())
+ {
+ isPointerType = CUtils.isPointerType(CUtils.getclass4qname(attributeType.getBaseType()));
+ }
+ else
+ {
+ isPointerType = CUtils.isPointerType(getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i]));
+ }
+ if((attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()) && (isPointerType || attribs[i].getAllElement() || attribs[i].getChoiceElement()))
+ {
+ writer.write(", bool deep");
+ }
+ writer.write(")\n{\n");
+
+ if(isPointerType)
+ {
+ writer.write("\tif (" + parameterName + " != NULL)\n");
+ writer.write("\t{\n");
+ writer.write("\t\tif (__axis_deepcopy_" + parameterName + ")\n");
+ writer.write("\t\t{\n");
+ writer.write("\t\t\tdelete [] " + parameterName + ";\n");
+ writer.write("\t\t}\n");
+ writer.write("\t\t" + parameterName + " = NULL;\n");
+ writer.write("\t}\n\n");
+ writer.write("\tif(InValue != NULL)\n");
+ writer.write("\t{\n");
+ writer.write("\t\tif (deep)\n");
+ writer.write("\t\t{\n");
+ writer.write("\t\t\t" + parameterName + " = new char[strlen(InValue) + 1];\n");
+ writer.write("\t\t\tstrcpy(" + parameterName + ", InValue);\n");
+ writer.write("\t\t}\n");
+ writer.write("\t\telse\n");
+ writer.write("\t\t{\n");
+ writer.write("\t\t\t" + parameterName + " = InValue;\n");
+ writer.write("\t\t}\n");
+ writer.write("\t}\n");
+ writer.write("\telse\n");
+ writer.write("\t{\n");
+ writer.write("\t\t" + parameterName + " = NULL;\n");
+ writer.write("\t}\n");
+ writer.write("\t__axis_deepcopy_" + parameterName + " = deep;\n");
+ }
+ else if ((attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()) && (attribs[i].getAllElement() || attribs[i].getChoiceElement()))
+ {
writer.write("\tif (" + parameterName + " != NULL)\n");
writer.write("\t{\n");
writer.write("\t\tif (__axis_deepcopy_" + parameterName + ")\n");
@@ -417,7 +417,7 @@
writer.write("\t{\n");
writer.write("\t\tif (deep)\n");
writer.write("\t\t{\n");
- writer.write("\t\t\t" + parameterName + " = new " + type + "();\n");
+ writer.write("\t\t\t" + parameterName + " = new " + type + "();\n");
writer.write("\t\t\t*" + parameterName + " = *InValue;\n");
writer.write("\t\t}\n");
writer.write("\t\telse\n");
@@ -430,31 +430,31 @@
writer.write("\t\t" + parameterName + " = NULL;\n");
writer.write("\t}\n");
writer.write("\t__axis_deepcopy_" + parameterName + " = deep;\n");
- }
- else
- {
- writer.write("\t" + parameterName
- + " = InValue ; \n");
- }
-
- if (attribs[i].getChoiceElement())
- {
- for (int j = 0; j < attribs.length; j++)
- {
-
-
-
- if ((attribs[j].getChoiceElement()) && (j != i))
- {
- writer.write("\t"
- + attribs[j].getParamNameWithoutSymbols()
- + " = NULL ; \n");
- }
- }
- }
-
- writer.write("}\n");
- }
+ }
+ else
+ {
+ writer.write("\t" + parameterName
+ + " = InValue ; \n");
+ }
+
+ if (attribs[i].getChoiceElement())
+ {
+ for (int j = 0; j < attribs.length; j++)
+ {
+
+
+
+ if ((attribs[j].getChoiceElement()) && (j != i))
+ {
+ writer.write("\t"
+ + attribs[j].getParamNameWithoutSymbols()
+ + " = NULL ; \n");
+ }
+ }
+ }
+
+ writer.write("}\n");
+ }
}
}
}
@@ -558,18 +558,18 @@
}
//end remove _Ref sufix and _ prefix in SOAP tag name
Type type = attribs[i].getType();
- boolean isPointerType = false;
- String basicType = null;
- if (!attribs[i].isSimpleType() && type.isSimpleType())
- {
- basicType = CUtils.getclass4qname(attribs[i].getType().getBaseType());
- isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
- }
- else
- {
- basicType = attribs[i].getTypeName();
- isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
- }
+ boolean isPointerType = false;
+ String basicType = null;
+ if (!attribs[i].isSimpleType() && type.isSimpleType())
+ {
+ basicType = CUtils.getclass4qname(attribs[i].getType().getBaseType());
+ isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
+ }
+ else
+ {
+ basicType = attribs[i].getTypeName();
+ isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
+ }
if (isPointerType)
{
writer.write("\tif (0 != param->"
@@ -604,13 +604,13 @@
}
if (type.isFault())
{
- writer.write("\tif(Axis_URI_" + classname + ")\n\t{\n");
- writer.write("\t\tbool blnIsNewPrefix = false;\n");
- writer.write("\t\tconst AxisChar* sPrefix = pSZ->getNamespacePrefix(Axis_URI_"
- + classname + ", blnIsNewPrefix);\n");
- writer.write("\t\tpSZ->serialize(\" xmlns:\", sPrefix, \"=\\\"\",");
- writer.write("Axis_URI_" + classname + ", \" " + " \\\"\"");
- writer.write(", NULL);\n\t}\n");
+ writer.write("\tif(Axis_URI_" + classname + ")\n\t{\n");
+ writer.write("\t\tbool blnIsNewPrefix = false;\n");
+ writer.write("\t\tconst AxisChar* sPrefix = pSZ->getNamespacePrefix(Axis_URI_"
+ + classname + ", blnIsNewPrefix);\n");
+ writer.write("\t\tpSZ->serialize(\" xmlns:\", sPrefix, \"=\\\"\",");
+ writer.write("Axis_URI_" + classname + ", \" " + " \\\"\"");
+ writer.write(", NULL);\n\t}\n");
}
writer.write("\tpSZ->serialize( \">\", 0);\n");
@@ -618,17 +618,17 @@
{
String typeName = extensionBaseAttrib.getTypeName();
if( typeName != null)
- {
- writer.write("\tpSZ->serializeAsChardata((void*)");
- if (!CUtils.isPointerType(typeName))
- {
- writer.write("&");
- }
- writer.write("(param->"
- + extensionBaseAttrib.getParamNameAsMember()
- + "), "
- + CUtils.getXSDTypeForBasicType(typeName) + ");\n");
- }
+ {
+ writer.write("\tpSZ->serializeAsChardata((void*)");
+ if (!CUtils.isPointerType(typeName))
+ {
+ writer.write("&");
+ }
+ writer.write("(param->"
+ + extensionBaseAttrib.getParamNameAsMember()
+ + "), "
+ + CUtils.getXSDTypeForBasicType(typeName) + ");\n");
+ }
}
writer.write("\n\t/* then serialize elements if any*/\n");
@@ -650,7 +650,7 @@
}
// Dushshantha:
- // if the attribute is a choice following should do
+ // if the attribute is a choice following should do
if (attribs[i].getChoiceElement())
{
if (!firstIfWritten)
@@ -682,7 +682,7 @@
if (attribs[i].isAnyType())
{
anyCounter += 1;
- writer.write("\tpSZ->serializeAnyObject(param->any" + Integer.toString(anyCounter) +");\n");
+ writer.write("\tpSZ->serializeAnyObject(param->any" + Integer.toString(anyCounter) +");\n");
}
else if (attribs[i].isArray())
{
@@ -698,7 +698,7 @@
{
baseTypeName = attribs[i].getTypeName();;
}
- writer.write("\tpSZ->serializeBasicArray(param->"
+ writer.write("\tpSZ->serializeBasicArray(param->"
+ attribs[i].getParamName()
+ ", "
+ namespace
@@ -770,14 +770,14 @@
* as pointers in the header file. Chinthana: This is the
* same in 'all' element
*/
- if (attribs[i].getChoiceElement()
+ if (attribs[i].getChoiceElement()
|| attribs[i].getAllElement()
|| isElementNillable(i) || isElementOptional(i))
- {
-
- if (((attribs[i].getChoiceElement())&&(isElementNillable(i)))&& !(attribs[i].getTypeName().equals("xsd__string")) )
- {
- writer.write("\t\tpSZ->serializeAsElement(\""
+ {
+
+ if (((attribs[i].getChoiceElement())&&(isElementNillable(i)))&& !(attribs[i].getTypeName().equals("xsd__string")) )
+ {
+ writer.write("\t\tpSZ->serializeAsElement(\""
+ attribs[i].getSOAPElementNameAsString()
+ "\", "
+ namespace
@@ -785,10 +785,10 @@
+ attribs[i].getParamNameWithoutSymbols()
+ ")), "
+ CUtils.getXSDTypeForBasicType(baseTypeName) + ");\n");
- }
- else
- {
- writer.write("\t\tpSZ->serializeAsElement(\""
+ }
+ else
+ {
+ writer.write("\t\tpSZ->serializeAsElement(\""
+ attribs[i].getSOAPElementNameAsString()
+ "\", "
+ namespace
@@ -796,8 +796,8 @@
+ attribs[i].getParamNameWithoutSymbols()
+ "), "
+ CUtils.getXSDTypeForBasicType(baseTypeName) + ");\n");
- }
- }
+ }
+ }
else
{
writer.write("\tpSZ->serializeAsElement(\""
@@ -843,20 +843,20 @@
if (attribs[i].getNsQualified())
{
writer.write("\tpSZ->serialize(\"<\", pSZ->getNamespacePrefix(\""
- + type.getName().getNamespaceURI()
- + "\"), \":\", \"" + elm + "\", 0);\n");
- writer.write("\tAxis_Serialize_" + attribs[i].getTypeName()
- + "(param->" + attribs[i].getParamName() + ", pSZ);\n");
- writer.write("\tpSZ->serialize(\"</\", pSZ->getNamespacePrefix(\""
- + type.getName().getNamespaceURI()
- + "\"), \":\", \"" + elm + "\", \">\", 0);\n");
+ + type.getName().getNamespaceURI()
+ + "\"), \":\", \"" + elm + "\", 0);\n");
+ writer.write("\tAxis_Serialize_" + attribs[i].getTypeName()
+ + "(param->" + attribs[i].getParamName() + ", pSZ);\n");
+ writer.write("\tpSZ->serialize(\"</\", pSZ->getNamespacePrefix(\""
+ + type.getName().getNamespaceURI()
+ + "\"), \":\", \"" + elm + "\", \">\", 0);\n");
}
else
{
writer.write("\tpSZ->serialize(\"<" + elm + "\", 0);\n");
- writer.write("\tAxis_Serialize_" + attribs[i].getTypeName()
- + "(param->" + attribs[i].getParamName() + ", pSZ);\n");
- writer.write("\tpSZ->serialize(\"</" + elm + "\", \">\", 0);\n");
+ writer.write("\tAxis_Serialize_" + attribs[i].getTypeName()
+ + "(param->" + attribs[i].getParamName() + ", pSZ);\n");
+ writer.write("\tpSZ->serialize(\"</" + elm + "\", \">\", 0);\n");
}
if (attribs[i].isOptional())
@@ -883,10 +883,10 @@
}
}
- writer.write("\n\tif (!bArray && blnIsNewPrefix)\n");
+ writer.write("\n\tif (!bArray && blnIsNewPrefix)\n");
writer.write("\t{\n");
writer.write("\t\tpSZ->removeNamespacePrefix(Axis_URI_"
- + classname + ");\n");
+ + classname + ");\n");
writer.write("\t}\n\n");
@@ -984,8 +984,8 @@
if (attribs[i].isAnyType())
{
- anyCounter +=1;
- writer.write("\tparam->any" + Integer.toString(anyCounter)+ " = pIWSDZ->getAnyObject();\n");
+ anyCounter +=1;
+ writer.write("\tparam->any" + Integer.toString(anyCounter)+ " = pIWSDZ->getAnyObject();\n");
}
else if (attribs[i].isArray())
{
@@ -1008,9 +1008,9 @@
+ "\",0);\n");
writer.write("\tif(param->" + attribs[i].getParamNameAsMember() + " == NULL)\n");
writer.write("\t{\n");
- writer.write("\t\tparam->" + attribs[i].getParamNameAsMember() + " = new " + attribs[i].getTypeName() + "_Array();\n");
+ writer.write("\t\tparam->" + attribs[i].getParamNameAsMember() + " = new " + attribs[i].getTypeName() + "_Array();\n");
writer.write("\t}\n");
- writer.write("\tparam->" + attribs[i].getParamNameAsMember() + "->clone( *array" + arrayCount + ");\n");
+ writer.write("\tparam->" + attribs[i].getParamNameAsMember() + "->clone( *array" + arrayCount + ");\n");
writer.write("\tAxis::AxisDelete((void*) array" + arrayCount + ", XSD_ARRAY);\n\n");
}
else
@@ -1061,43 +1061,43 @@
}
Type type = attribs[i].getType();
- boolean isPointerType = false;
- if (type.isSimpleType())
- {
- isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
- }
- else
- {
- isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
- }
+ boolean isPointerType = false;
+ if (type.isSimpleType())
+ {
+ isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
+ }
+ else
+ {
+ isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
+ }
if (attribs[i].isNillable() ||
isElementNillable(i) ||
isElementOptional(i) ||
isPointerType)
{
- if (attribs[i].getChoiceElement() && isElementNillable(i) && !isPointerType)
- {
- writer.write("\tparam->"
- + attribs[i].getParamNameAsMember()
- + " = ("
- + attribs[i].getTypeName()
- + "**)("
- + attribs[i].getTypeName()
- +"*)new "
- +attribs[i].getTypeName()
- + ";\n");
-
- writer.write("\t\t*(param->"
+ if (attribs[i].getChoiceElement() && isElementNillable(i) && !isPointerType)
+ {
+ writer.write("\tparam->"
+ + attribs[i].getParamNameAsMember()
+ + " = ("
+ + attribs[i].getTypeName()
+ + "**)("
+ + attribs[i].getTypeName()
+ +"*)new "
+ +attribs[i].getTypeName()
+ + ";\n");
+
+ writer.write("\t\t*(param->"
+ attribs[i].getParamNameAsMember()
+ ") = pIWSDZ->"
+ CUtils.getParameterGetValueMethodName(
attribs[i].getTypeName(), attribs[i].isAttribute()) + "( \""
+ soapTagName + "\",0);\n");
}
- else
- {
- String typeName = attribs[i].getTypeName();
- String baseTypeName = null;
+ else
+ {
+ String typeName = attribs[i].getTypeName();
+ String baseTypeName = null;
if (type.isSimpleType())
{
baseTypeName = CUtils.getclass4qname (type.getBaseType ());;
@@ -1106,43 +1106,43 @@
{
baseTypeName = typeName;
}
- String elementName = attribs[i].getParamNameAsMember();
-
-
-
- if( isPointerType)
- {
- writer.write("\t" + typeName + " pValue" + i + " = pIWSDZ->" +
- CUtils.getParameterGetValueMethodName(baseTypeName, attribs[i].isAttribute()) +
- "( \"" + soapTagName + "\", 0);\n\n");
- }
- else
- {
- writer.write("\t\t\t" + typeName + " * pValue" + i + " = pIWSDZ->" +
- CUtils.getParameterGetValueMethodName(baseTypeName, attribs[i].isAttribute()) +
- "( \"" + soapTagName + "\", 0);\n\n");
- }
-
- writer.write( "\t\t\tif( pValue" + i + " == NULL)\n");
- writer.write( "\t\t\t{\n");
- writer.write("\t\t\t\tparam->" + elementName + " = NULL;\n");
- writer.write( "\t\t\t}\n");
- writer.write( "\t\t\telse\n");
- writer.write( "\t\t\t{\n");
-
- String localElemName = elementName;
- if( elementName.endsWith( "_"))
+ String elementName = attribs[i].getParamNameAsMember();
+
+
+
+ if( isPointerType)
+ {
+ writer.write("\t" + typeName + " pValue" + i + " = pIWSDZ->" +
+ CUtils.getParameterGetValueMethodName(baseTypeName, attribs[i].isAttribute()) +
+ "( \"" + soapTagName + "\", 0);\n\n");
+ }
+ else
+ {
+ writer.write("\t\t\t" + typeName + " * pValue" + i + " = pIWSDZ->" +
+ CUtils.getParameterGetValueMethodName(baseTypeName, attribs[i].isAttribute()) +
+ "( \"" + soapTagName + "\", 0);\n\n");
+ }
+
+ writer.write( "\t\t\tif( pValue" + i + " == NULL)\n");
+ writer.write( "\t\t\t{\n");
+ writer.write("\t\t\t\tparam->" + elementName + " = NULL;\n");
+ writer.write( "\t\t\t}\n");
+ writer.write( "\t\t\telse\n");
+ writer.write( "\t\t\t{\n");
+
+ String localElemName = elementName;
+ if( elementName.endsWith( "_"))
{
localElemName = elementName.substring( 0, elementName.length() - 1);
}
-
- writer.write("\t\t\t\tparam->set" + localElemName + " (pValue" + i + ");\n");
-
- writer.write("\t\t\t\tAxis::AxisDelete( (void *) pValue" + i + ", " + CUtils.getXSDTypeForBasicType( baseTypeName) + ");\n\n");
+
+ writer.write("\t\t\t\tparam->set" + localElemName + " (pValue" + i + ");\n");
+
+ writer.write("\t\t\t\tAxis::AxisDelete( (void *) pValue" + i + ", " + CUtils.getXSDTypeForBasicType( baseTypeName) + ");\n\n");
- writer.write( "\t\t\t}\n");
- }
+ writer.write( "\t\t\t}\n");
+ }
}
else
{
@@ -1178,16 +1178,16 @@
+ elementNameToSearchFor + "\",0)) != NULL)\n\t{\n");
String localElemName = attribs[i].getParamNameAsMember();
- if( localElemName.endsWith( "_"))
+ if( localElemName.endsWith( "_"))
{
- localElemName = localElemName.substring( 0, localElemName.length() - 1);
+ localElemName = localElemName.substring( 0, localElemName.length() - 1);
}
writer.write("\t\tparam->set"
+ localElemName + "(* "
+ attribs[i].getParamNameAsMember() + " );\n");
- writer.write("\t\tAxis::AxisDelete( (void *) " + attribs[i].getParamNameAsMember() + ", " + CUtils.getXSDTypeForBasicType( attribs[i].getTypeName()) + ");\n");
- writer.write("\t}\n");
+ writer.write("\t\tAxis::AxisDelete( (void *) " + attribs[i].getParamNameAsMember() + ", " + CUtils.getXSDTypeForBasicType( attribs[i].getTypeName()) + ");\n");
+ writer.write("\t}\n");
}
}
if (attribs[i].isOptional())
@@ -1343,18 +1343,18 @@
{
if (attribs[i].isArray())
{
- if (attribs[i].getChoiceElement()||attribs[i].getAllElement())
- {
+ 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// 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 " + attribs[i].getTypeName() +"_Array();\n");
- }
- else
- {
- writer.write("\t" + attribs[i].getParamNameAsMember() + " = new " + attribs[i].getTypeName() +"_Array();\n");
- }
+ writer.write("\t\t// This object is a 'choice' or 'all', 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 " + attribs[i].getTypeName() +"_Array();\n");
+ }
+ else
+ {
+ writer.write("\t" + attribs[i].getParamNameAsMember() + " = new " + attribs[i].getTypeName() +"_Array();\n");
+ }
}
}
writer.write("\treset();\n");
@@ -1366,77 +1366,77 @@
for (int i = 0 ; i < attribs.length ; i++)
{
if (attribs[i].isArray())
- {
- if (attribs[i].getChoiceElement()||attribs[i].getAllElement())
- {
+ {
+ 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// 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].getParamName() + " = new " + attribs[i].getTypeName() + "_Array( *original." + attribs[i].getParamName() + ");\n");
- }
- else
- {
- writer.write("\t" + attribs[i].getParamName() + " = new " + attribs[i].getTypeName() + "_Array(*original." + attribs[i].getParamName() + ");\n");
- }
+ writer.write("\t\t// This object is a 'choice' or 'all', 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].getParamName() + " = new " + attribs[i].getTypeName() + "_Array( *original." + attribs[i].getParamName() + ");\n");
+ }
+ else
+ {
+ writer.write("\t" + attribs[i].getParamName() + " = new " + attribs[i].getTypeName() + "_Array(*original." + attribs[i].getParamName() + ");\n");
+ }
}
else if (attribs[i].isAnyType())
{
anyCounter++;
writer.write("\tif (original." + attribs[i].getParamName() + anyCounter + " != NULL)\n");
- writer.write("\t{\n");
- writer.write("\t\t" + attribs[i].getParamName() + anyCounter + " = new " + attribs[i].getTypeName() + "(*(original." + attribs[i].getParamName() + anyCounter + "));\n");
- writer.write("\t}\n");
- writer.write("\telse\n");
- writer.write("\t{\n");
- writer.write("\t\t" + attribs[i].getParamName() + anyCounter + " = NULL;\n");
- writer.write("\t}\n");
+ writer.write("\t{\n");
+ writer.write("\t\t" + attribs[i].getParamName() + anyCounter + " = new " + attribs[i].getTypeName() + "(*(original." + attribs[i].getParamName() + anyCounter + "));\n");
+ writer.write("\t}\n");
+ writer.write("\telse\n");
+ writer.write("\t{\n");
+ writer.write("\t\t" + attribs[i].getParamName() + anyCounter + " = NULL;\n");
+ writer.write("\t}\n");
}
else
{
Type type = attribs[i].getType();
- boolean isPointerType = false;
- if (type.isSimpleType())
- {
- isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
- }
- else
- {
- isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
- }
- if ((attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()) && (isPointerType || attribs[i].isOptional() || attribs[i].isNillable() || attribs[i].getChoiceElement() || attribs[i].getAllElement()))
- {
- writer.write("\t" + attribs[i].getParamName() + " = NULL;\n");
- writer.write("\t__axis_deepcopy_" + attribs[i].getParamName() + " = false;\n");
- String methodName = attribs[i].getParamNameWithoutSymbols();
- if( methodName.endsWith( "_"))
- {
- String localMethodName = methodName.substring( 0, methodName.length() - 1);
-
- if( localMethodName.equals( classname))
- {
- methodName = localMethodName;
- }
- }
- writer.write("\tset" + methodName + "(original." + attribs[i].getParamName() + ", original.__axis_deepcopy_" + attribs[i].getParamName() + ");\n\n");
- }
- else
- {
- if (attribs[i].isSimpleType())
- {
- writer.write("\t" + attribs[i].getParamName() + " = original." + attribs[i].getParamName() + ";\n");
- }
- else
- {
- writer.write("\tif (original." + attribs[i].getParamName() + " != NULL)\n");
- writer.write("\t{\n");
- writer.write("\t\t" + attribs[i].getParamName() + " = new " + attribs[i].getTypeName() + "(*(original." + attribs[i].getParamName() + "));\n");
- writer.write("\t}\n");
- writer.write("\telse\n");
- writer.write("\t{\n");
- writer.write("\t\t" + attribs[i].getParamName() + " = NULL;\n");
- writer.write("\t}\n");
- }
+ boolean isPointerType = false;
+ if (type.isSimpleType())
+ {
+ isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
+ }
+ else
+ {
+ isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
+ }
+ if ((attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()) && (isPointerType || attribs[i].isOptional() || attribs[i].isNillable() || attribs[i].getChoiceElement() || attribs[i].getAllElement()))
+ {
+ writer.write("\t" + attribs[i].getParamName() + " = NULL;\n");
+ writer.write("\t__axis_deepcopy_" + attribs[i].getParamName() + " = false;\n");
+ String methodName = attribs[i].getParamNameWithoutSymbols();
+ if( methodName.endsWith( "_"))
+ {
+ String localMethodName = methodName.substring( 0, methodName.length() - 1);
+
+ if( localMethodName.equals( classname))
+ {
+ methodName = localMethodName;
+ }
+ }
+ writer.write("\tset" + methodName + "(original." + attribs[i].getParamName() + ", original.__axis_deepcopy_" + attribs[i].getParamName() + ");\n\n");
+ }
+ else
+ {
+ if (attribs[i].isSimpleType())
+ {
+ writer.write("\t" + attribs[i].getParamName() + " = original." + attribs[i].getParamName() + ";\n");
+ }
+ else
+ {
+ writer.write("\tif (original." + attribs[i].getParamName() + " != NULL)\n");
+ writer.write("\t{\n");
+ writer.write("\t\t" + attribs[i].getParamName() + " = new " + attribs[i].getTypeName() + "(*(original." + attribs[i].getParamName() + "));\n");
+ writer.write("\t}\n");
+ writer.write("\telse\n");
+ writer.write("\t{\n");
+ writer.write("\t\t" + attribs[i].getParamName() + " = NULL;\n");
+ writer.write("\t}\n");
+ }
}
}
}
@@ -1450,10 +1450,10 @@
}
/*
- * (non-Javadoc)
- *
- * @see
- */
+ * (non-Javadoc)
+ *
+ * @see
+ */
protected void writeReset() throws WrapperFault
{
try
@@ -1467,32 +1467,32 @@
{
if (attribs[i].isArray())
{
- if (attribs[i].getChoiceElement()||attribs[i].getAllElement())
- {
- writer.write( "\t// This object is a 'choice' or 'all', so need to ensure that any\n");
- writer.write( "\t// other objects belonging to this union of elements are empty.\n");
- writer.write( "\t// NB: Hasn't been implemented yet!\n");
-
- writer.write("\t" + attribs[i].getParamNameAsMember() + "->clear();\n");
- }
- else
- {
- writer.write("\t" + attribs[i].getParamNameAsMember() + "->clear();\n");
- }
+ if (attribs[i].getChoiceElement()||attribs[i].getAllElement())
+ {
+ writer.write( "\t// This object is a 'choice' or 'all', so need to ensure that any\n");
+ writer.write( "\t// other objects belonging to this union of elements are empty.\n");
+ writer.write( "\t// NB: Hasn't been implemented yet!\n");
+
+ writer.write("\t" + attribs[i].getParamNameAsMember() + "->clear();\n");
+ }
+ else
+ {
+ writer.write("\t" + attribs[i].getParamNameAsMember() + "->clear();\n");
+ }
}
else if (!(attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()))
{
- if (attribs[i].isAnyType())
+ if (attribs[i].isAnyType())
{
- anyCounter += 1;
- writer.write("\t" + attribs[i].getParamNameAsMember() + Integer.toString(anyCounter)
+ anyCounter += 1;
+ writer.write("\t" + attribs[i].getParamNameAsMember() + Integer.toString(anyCounter)
+ "= NULL;\n");
}
- else
+ else
{
- writer.write("\t" + attribs[i].getParamNameAsMember()
- + "= NULL;\n");
- }
+ writer.write("\t" + attribs[i].getParamNameAsMember()
+ + "= NULL;\n");
+ }
}
else if (isElementNillable(i) || isElementOptional(i) || attribs[i].getChoiceElement() || attribs[i].getAllElement())
{
@@ -1503,15 +1503,15 @@
else
{
Type type = attribs[i].getType();
- boolean isPointerType = false;
- if (type.isSimpleType())
- {
- isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
- }
- else
- {
- isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
- }
+ boolean isPointerType = false;
+ if (type.isSimpleType())
+ {
+ isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
+ }
+ else
+ {
+ isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
+ }
if(isPointerType)
{
writer.write("\t"+ attribs[i].getParamNameAsMember() + " = NULL;\n");
@@ -1535,7 +1535,7 @@
*/
protected void writeDestructors() throws WrapperFault
{
- try
+ try
{
if (type.isFault())
{
@@ -1555,37 +1555,37 @@
String typename = attribs[i].getTypeName();
Type type = attribs[i].getType();
- boolean isPointerType = false;
- if (type.isSimpleType())
- {
- isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
- }
- else
- {
- isPointerType = CUtils.isPointerType(typename);
- }
+ boolean isPointerType = false;
+ if (type.isSimpleType())
+ {
+ isPointerType = CUtils.isPointerType(CUtils.getclass4qname(type.getBaseType()));
+ }
+ else
+ {
+ isPointerType = CUtils.isPointerType(typename);
+ }
- if(attribs[i].isArray())
+ if(attribs[i].isArray())
{
writer.write("\tif (" + name + "!= NULL)\n");
writer.write("\t{\n");
writer.write("\t\tdelete " + name + ";\n");
writer.write("\t\t" + name + " = NULL;\n");
writer.write("\t}\n");
- }
- else if (attribs[i].isAnyType())
+ }
+ else if (attribs[i].isAnyType())
{
- anyCounter += 1;
- name = name + Integer.toString(anyCounter);
- writer.write("\tif ("+name+") \n\t{\n");
- writer.write("\t\tfor (int i=0; i<"+name+"->_size; i++)\n\t\t{\n");
- writer.write("\t\t\tif ("+name+"->_array[i]) delete [] "+name+"->_array[i];\n");
- writer.write("\t\t}\n");
- writer.write("\t\tdelete "+name+";\n");
- writer.write("\t}\n");
-
- }
- else if (!(attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()))
+ anyCounter += 1;
+ name = name + Integer.toString(anyCounter);
+ writer.write("\tif ("+name+") \n\t{\n");
+ writer.write("\t\tfor (int i=0; i<"+name+"->_size; i++)\n\t\t{\n");
+ writer.write("\t\t\tif ("+name+"->_array[i]) delete [] "+name+"->_array[i];\n");
+ writer.write("\t\t}\n");
+ writer.write("\t\tdelete "+name+";\n");
+ writer.write("\t}\n");
+
+ }
+ else if (!(attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()))
{
writer.write("\tif (" + name + "!= NULL)\n");
writer.write("\t{\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java?rev=386235&r1=386234&r2=386235&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java Wed Mar 15 17:24:11 2006
@@ -81,10 +81,10 @@
String outParamTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returnParam, wscontext);
if ((outParamTypeName.lastIndexOf ("_Array") > 0)
|| (CUtils.isSimpleType(outParamTypeName)
- && (returnParam.isNillable() || returnParam.isOptional())
- && !(CUtils.isPointerType(outParamTypeName))))
+ && (returnParam.isNillable() || returnParam.isOptional())
+ && !(CUtils.isPointerType(outParamTypeName))))
{
- writer.write(
+ writer.write(
"\tSTORAGE_CLASS_INFO "
+ outParamTypeName
+ " * ");
@@ -126,18 +126,18 @@
}
if (nparam.getType().isAttachment())
{
- writer.write("ISoapAttachment *Value" + j);
+ writer.write("ISoapAttachment *Value" + j);
}
else if ((paramTypeName.lastIndexOf ("_Array") > 0)
|| (CUtils.isSimpleType(baseTypeName)
- && (nparam.isNillable() || nparam.isOptional())
- && !(CUtils.isPointerType(baseTypeName))))
+ && (nparam.isNillable() || nparam.isOptional())
+ && !(CUtils.isPointerType(baseTypeName))))
{
- writer.write(paramTypeName + " * Value" + j);
+ writer.write(paramTypeName + " * Value" + j);
}
else
{
- writer.write(paramTypeName + " Value" + j);
+ writer.write(paramTypeName + " Value" + j);
}
}
@@ -168,22 +168,22 @@
writer.write("AXIS_OUT_PARAM " + paramType);
if (CUtils.isSimpleType(baseTypeName))
{
- if ((nparam.isOptional() || nparam.isNillable()) && !CUtils.isPointerType(baseTypeName))
- {
- if (bTypeHasStar)
- {
- writer.write(" *");
- }
- else
- {
- writer.write(" **");
- }
- }
- else if (CUtils.isPointerType(baseTypeName) || !bTypeHasStar)
- {
- writer.write(" *");
- }
- // Else we don't need to anymore '*'
+ if ((nparam.isOptional() || nparam.isNillable()) && !CUtils.isPointerType(baseTypeName))
+ {
+ if (bTypeHasStar)
+ {
+ writer.write(" *");
+ }
+ else
+ {
+ writer.write(" **");
+ }
+ }
+ else if (CUtils.isPointerType(baseTypeName) || !bTypeHasStar)
+ {
+ writer.write(" *");
+ }
+ // Else we don't need to anymore '*'
}
else if(bTypeHasStar)
{
@@ -262,7 +262,7 @@
+ CUtils.CPP_HEADER_SUFFIX
+ "\"\n");
}
- // Method to print the Fault Exception headers
+ // Method to print the Fault Exception headers
//writeFaultHeaders();
writer.write("\n");
}