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 2008/05/29 22:40:45 UTC
svn commit: r661474 - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws:
c/literal/ClientStubWriter.java cpp/literal/ClientStubWriter.java
Author: nadiramra
Date: Thu May 29 13:40:45 2008
New Revision: 661474
URL: http://svn.apache.org/viewvc?rev=661474&view=rev
Log:
simplify generated code in preparation for fixes
Modified:
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/literal/ClientStubWriter.java
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?rev=661474&r1=661473&r2=661474&view=diff
==============================================================================
--- 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 Thu May 29 13:40:45 2008
@@ -80,12 +80,14 @@
{
if (retType.isSimpleType())
{
- outparamType = CUtils.getclass4qname(retType.getBaseType());
+ outparamType = CUtils.getclass4qname(retType.getBaseType());
+ returntypeissimple = true;
}
else
{
- outparamType = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returntype,wscontext);
- returntypeisarray = (outparamType.lastIndexOf("_Array") > 0);
+ outparamType = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returntype, wscontext);
+ returntypeissimple = CUtils.isSimpleType (outparamType);
+ returntypeisarray = (outparamType.lastIndexOf ("_Array") > 0);
}
returntypeisarray |= retType.isArray();
@@ -93,9 +95,8 @@
else
{
outparamType = returntype.getLangName();
- }
-
- returntypeissimple = CUtils.isSimpleType(outparamType);
+ returntypeissimple = CUtils.isSimpleType(outparamType);
+ }
}
//=============================================================================
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?rev=661474&r1=661473&r2=661474&view=diff
==============================================================================
--- 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 Thu May 29 13:40:45 2008
@@ -99,28 +99,29 @@
{
if (retType.isSimpleType())
{
- outparamType = CUtils.getclass4qname(retType.getBaseType());
+ outparamType = CUtils.getclass4qname(retType.getBaseType());
+ returntypeissimple = true;
}
else
{
- outparamType = WrapperUtils.getClassNameFromParamInfoConsideringArrays(returntype,wscontext);
- returntypeisarray = (outparamType.lastIndexOf("_Array") > 0);
+ outparamType = WrapperUtils.getClassNameFromParamInfoConsideringArrays (returntype, wscontext);
+ returntypeissimple = CUtils.isSimpleType (outparamType);
+ returntypeisarray = (outparamType.lastIndexOf ("_Array") > 0);
}
returntypeisarray |= retType.isArray();
}
else
{
- outparamType = returntype.getLangName();
- }
-
- returntypeissimple = CUtils.isSimpleType(outparamType);
+ outparamType = returntype.getLangName ();
+ returntypeissimple = CUtils.isSimpleType (outparamType);
+ }
}
//=============================================================================
// Generate method prototype
//=============================================================================
-
+
CUtils.printMethodComment(writer, "This method wraps the service method " + methodName + ".");
//method signature