You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2006/12/04 20:34:40 UTC
svn commit: r482311 -
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java
Author: nadiramra
Date: Mon Dec 4 11:34:39 2006
New Revision: 482311
URL: http://svn.apache.org/viewvc?view=rev&rev=482311
Log:
revert to original code that had braces and code aligned correctly.
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubHeaderWriter.java?view=diff&rev=482311&r1=482310&r2=482311
==============================================================================
--- 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 Mon Dec 4 11:34:39 2006
@@ -67,41 +67,24 @@
//write return type
if (0 == noOfOutParams)
- {
writer.write("\tSTORAGE_CLASS_INFO void ");
+ else if (1 == noOfOutParams)
+ {
+ ParameterInfo returnParam =
+ (ParameterInfo) minfo.getOutputParameterTypes().iterator().next();
+ String outParamTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returnParam, wscontext);
+ if ((outParamTypeName.lastIndexOf ("_Array") > 0)
+ || (CUtils.isSimpleType(outParamTypeName)
+ && (returnParam.isNillable() || returnParam.isOptional())
+ && !(CUtils.isPointerType(outParamTypeName))))
+ writer.write("\tSTORAGE_CLASS_INFO " + outParamTypeName + " * ");
+ else
+ writer.write("\tSTORAGE_CLASS_INFO " + outParamTypeName + " ");
}
else
{
- if (1 == noOfOutParams)
- {
- ParameterInfo returnParam =
- (ParameterInfo) minfo
- .getOutputParameterTypes()
- .iterator()
- .next();
- String outParamTypeName = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returnParam, wscontext);
- if ((outParamTypeName.lastIndexOf ("_Array") > 0)
- || (CUtils.isSimpleType(outParamTypeName)
- && (returnParam.isNillable() || returnParam.isOptional())
- && !(CUtils.isPointerType(outParamTypeName))))
- {
- writer.write(
- "\tSTORAGE_CLASS_INFO "
- + outParamTypeName
- + " * ");
- }
- else{
- writer.write(
- "\tSTORAGE_CLASS_INFO "
- + outParamTypeName
- + " ");
- }
- }
- else
- {
- isAllTreatedAsOutParams = true;
- writer.write("\tSTORAGE_CLASS_INFO void ");
- }
+ isAllTreatedAsOutParams = true;
+ writer.write("\tSTORAGE_CLASS_INFO void ");
}
//write return type
writer.write(minfo.getMethodname() + "(");
@@ -120,28 +103,19 @@
String baseTypeName = null;
if (type.isSimpleType())
- {
baseTypeName = CUtils.getclass4qname (type.getBaseType ());
- }
else
- {
baseTypeName = paramTypeName;
- }
+
if (nparam.getType().isAttachment())
- {
writer.write("ISoapAttachment *Value" + j);
- }
else if ((paramTypeName.lastIndexOf ("_Array") > 0)
|| (CUtils.isSimpleType(baseTypeName)
&& (nparam.isNillable() || nparam.isOptional())
&& !(CUtils.isPointerType(baseTypeName))))
- {
writer.write(paramTypeName + " * Value" + j);
- }
else
- {
writer.write(paramTypeName + " Value" + j);
- }
}
if (isAllTreatedAsOutParams)
@@ -155,19 +129,14 @@
String baseTypeName = null;
if (type.isSimpleType())
- {
baseTypeName = CUtils.getclass4qname (type.getBaseType ());
- }
else
- {
baseTypeName = paramType;
- }
+
boolean bTypeHasStar = paramType.endsWith( "*");
if (hasInputParms || 0!=j)
- {
writer.write(", ");
- }
writer.write("AXIS_OUT_PARAM " + paramType);
if (CUtils.isSimpleType(baseTypeName))
@@ -177,27 +146,18 @@
&& !CUtils.isPointerType(baseTypeName))
{
if (bTypeHasStar)
- {
writer.write(" *");
- }
else
- {
writer.write(" **");
- }
- }
+ }
else if (CUtils.isPointerType(baseTypeName) || !bTypeHasStar)
- {
writer.write(" *");
- }
}
else if(bTypeHasStar)
- {
writer.write(" *");
- }
else
- {
writer.write(" **");
- }
+
writer.write(" OutValue" + j);
} // for loop
}
@@ -233,19 +193,13 @@
if(atype.isExternalized())
{
if (atype.isArray())
- {
if (atype.getElementType().equals("string"))
- {
removeSet.add(atype.getLanguageSpecificName());
- }
- }
+
if (atype.getBaseType() != null)
- {
if (atype.getBaseType().getLocalPart().equals("string"))
- {
removeSet.add(atype.getLanguageSpecificName() + "_Array");
- }
- }
+
typeSet.add(atype.getLanguageSpecificName());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org