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/08/21 01:50:35 UTC
svn commit: r687511 [3/4] - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws: ./ c/
c/literal/ cpp/ cpp/literal/ info/
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java?rev=687511&r1=687510&r2=687511&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java Wed Aug 20 16:50:34 2008
@@ -98,8 +98,8 @@
Type elementType = elemi.getType();
- if (CUtils.getBasicTypeForQName(elementType.getName()) != null)
- extensionBaseAttrib.setTypeName(CUtils.getBasicTypeForQName(elementType.getName()));
+ if (CUtils.getSimpleType(elementType.getName()) != null)
+ extensionBaseAttrib.setTypeName(CUtils.getSimpleType(elementType.getName()));
else
{
extensionBaseAttrib.setTypeName(elementType.getLanguageSpecificName());
@@ -135,7 +135,7 @@
this.attribs[i] = new ParameterInfo();
this.attribs[i].setParamName(attr.getName(), wscontext.getTypemap());
if (CUtils.isSimpleType(attr.getType().getName()))
- this.attribs[i].setTypeName(CUtils.getBasicTypeForQName(attr.getType().getName()));
+ this.attribs[i].setTypeName(CUtils.getSimpleType(attr.getType().getName()));
else
{
this.attribs[i].setTypeName(attr.getType().getLanguageSpecificName());
@@ -157,7 +157,7 @@
this.attribs[i].setAnyType(true);
if (CUtils.isSimpleType(elementType.getName()))
- this.attribs[i].setTypeName(CUtils.getBasicTypeForQName(elementType.getName()));
+ this.attribs[i].setTypeName(CUtils.getSimpleType(elementType.getName()));
else
{
this.attribs[i].setTypeName(elementType.getLanguageSpecificName());
@@ -182,7 +182,7 @@
this.attribs[i].setArray(true);
if (CUtils.isSimpleType(arrayType.getName()))
{
- this.attribs[i].setTypeName(CUtils.getBasicTypeForQName(arrayType.getName()));
+ this.attribs[i].setTypeName(CUtils.getSimpleType(arrayType.getName()));
this.attribs[i].setSimpleType(true);
}
else
@@ -210,9 +210,9 @@
if (attrib.isArray())
{
if (attrib.isSimpleType())
- return CUtils.getBasicArrayNameforType(attrib.getTypeName());
+ return CUtils.getArrayNameforSimpleType(attrib.getTypeName());
else
- return CUtils.getCmplxArrayNameforType(attrib.getSchemaName());
+ return CUtils.getArrayNameForComplexType(attrib.getSchemaName());
}
else if (!(attrib.isSimpleType() || attrib.getType().isSimpleType()))
return attrib.getTypeName() + "*";
@@ -223,7 +223,7 @@
if (attrib.isSimpleType())
isPtrType = CUtils.isPointerType(attrib.getTypeName());
else
- isPtrType = CUtils.isPointerType(CUtils.getBasicTypeForQName(attrib.getType().getBaseType()));
+ isPtrType = CUtils.isPointerType(CUtils.getSimpleType(attrib.getType().getBaseType()));
if (isPtrType)
return attrib.getTypeName();
@@ -250,7 +250,7 @@
}
else if (attribs[index].getType().isSimpleType())
{
- if (!CUtils.isPointerType(CUtils.getBasicTypeForQName(attribs[index].getType().getBaseType())))
+ if (!CUtils.isPointerType(CUtils.getSimpleType(attribs[index].getType().getBaseType())))
bNillable = attribs[index].isNillable();
}
}
@@ -270,7 +270,7 @@
}
else if (attribs[index].getType().isSimpleType())
{
- if (!CUtils.isPointerType(CUtils.getBasicTypeForQName(attribs[index].getType().getBaseType())))
+ if (!CUtils.isPointerType(CUtils.getSimpleType(attribs[index].getType().getBaseType())))
bOptional = attribs[index].isOptional();
}
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java?rev=687511&r1=687510&r2=687511&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java Wed Aug 20 16:50:34 2008
@@ -98,13 +98,6 @@
}
}
- if (CUtils.isSimpleType(qname) && !CUtils.isDefinedSimpleType(qname))
- {
- throw new WrapperFault(
- "No need to create an Array for simple type " + qname + "\n"
- + "It seems that some thing wrong with symbolTable population");
- }
-
ArrayParamHeaderWriter writer = (new ArrayParamHeaderWriter(wscontext, type));
if (!writer.isSimpleTypeArray())
{
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?rev=687511&r1=687510&r2=687511&view=diff
==============================================================================
--- 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 Wed Aug 20 16:50:34 2008
@@ -77,7 +77,7 @@
if (!CUtils.isPointerType(typeName))
writer.write("&");
writer.write("(param->" + extensionBaseAttrib.getParamNameAsMember() + "), "
- + CUtils.getXSDTypeForBasicType(typeName) + ");\n");
+ + CUtils.getXSDEnumerator(typeName) + ");\n");
}
else
{
@@ -161,7 +161,7 @@
String basicType = null;
if (!attribs[i].isSimpleType() && type.isSimpleType())
- basicType = CUtils.getBasicTypeForQName(type.getBaseType());
+ basicType = CUtils.getSimpleType(type.getBaseType());
else
basicType = attribs[i].getTypeName();
@@ -172,14 +172,14 @@
writer.write("\taxiscSoapSerializerSerializeAsAttribute(pSZ,\""
+ attribs[i].getParamNameAsSOAPString() + "\", 0, (void*)(param->"
+ attribs[i].getParamNameAsMember() + "), "
- + CUtils.getXSDTypeForBasicType(basicType) + ");\n");
+ + CUtils.getXSDEnumerator(basicType) + ");\n");
}
else
{
writer.write("\taxiscSoapSerializerSerializeAsAttribute(pSZ,\""
+ attribs[i].getParamNameAsSOAPString() + "\", 0, (void*)&(param->"
+ attribs[i].getParamNameAsMember() + "), "
- + CUtils.getXSDTypeForBasicType(attribs[i].getTypeName()) + ");\n");
+ + CUtils.getXSDEnumerator(attribs[i].getTypeName()) + ");\n");
}
}
@@ -265,13 +265,13 @@
{
String baseTypeName = null;
if (!attribs[i].isSimpleType() && attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName(attribs[i].getType().getBaseType());
+ baseTypeName = CUtils.getSimpleType(attribs[i].getType().getBaseType());
else
baseTypeName = attribs[i].getTypeName();
writer.write("\taxiscSoapSerializerSerializeBasicArray(pSZ, (const Axisc_Array *)param->" + attribs[i].getParamNameAsMember()
+ ", " + namespace + ","
- + CUtils.getXSDTypeForBasicType(baseTypeName) + ", \""
+ + CUtils.getXSDEnumerator(baseTypeName) + ", \""
+ attribs[i].getParamNameAsSOAPString() + "\");\n");
}
else
@@ -295,7 +295,7 @@
String typeName = attribs[i].getTypeName();
String baseTypeName = null;
if (attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName (attribs[i].getType().getBaseType ());
+ baseTypeName = CUtils.getSimpleType (attribs[i].getType().getBaseType ());
else
baseTypeName = typeName;
@@ -314,7 +314,7 @@
writer.write("\taxiscSoapSerializerSerializeAsElement(pSZ, \""
+ attribs[i].getElementNameAsSOAPString() + "\", " + namespace
+ ", (void*)" + ampersand + "(param->" + attribs[i].getParamNameAsMember() + "), "
- + CUtils.getXSDTypeForBasicType(baseTypeName) + ");\n");
+ + CUtils.getXSDEnumerator(baseTypeName) + ");\n");
}
else
{
@@ -435,7 +435,7 @@
writer.write("\t{\n"); // ==== begin scope
writer.write("\t\tvoid* pCharDataAs;\n\n");
String typeName = extensionBaseAttrib.getTypeName();
- String xsdType = CUtils.getXSDTypeForBasicType(typeName);
+ String xsdType = CUtils.getXSDEnumerator(typeName);
writer.write("\t\taxiscSoapDeSerializerGetChardataAs(pDZ, &pCharDataAs, " + xsdType + ");\n");
writer.write("\t\tparam->" + extensionBaseAttrib.getParamNameAsMember() + " = ");
@@ -607,7 +607,7 @@
{
String baseTypeName = null;
if (!attribs[i].isSimpleType() && attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName(attribs[i].getType().getBaseType());
+ baseTypeName = CUtils.getSimpleType(attribs[i].getType().getBaseType());
else
baseTypeName = attribs[i].getTypeName();
@@ -621,7 +621,7 @@
writer.write(tab2 + "param->" + attribs[i].getParamNameAsMember()
+ " = (" + baseTypeName + "_Array *)"
+ "axiscSoapDeSerializerGetBasicArray(pDZ, "
- + CUtils.getXSDTypeForBasicType(baseTypeName) + ", \""
+ + CUtils.getXSDEnumerator(baseTypeName) + ", \""
+ attribs[i].getParamNameAsSOAPString() + "\",0);\n");
}
else
@@ -651,7 +651,7 @@
Type type = attribs[i].getType();
boolean isPointerType = false;
if (type.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(type.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getSimpleType(type.getBaseType()));
else
isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
@@ -666,7 +666,7 @@
writer.write(tab2 + "param->"
+ attribs[i].getParamNameAsMember() + " = "
+ "axiscSoapDeSerializer"
- + CUtils.getDeserializerMethodNameForType(
+ + CUtils.getDeserializerMethodName(
attribs[i].getTypeName(), attribs[i].isAttribute()) + "(pDZ, \""
+ soapTagName + "\",0);\n");
}
@@ -679,7 +679,7 @@
writer.write(tab2 + "\t" + attribs[i].getTypeName() + " * "
+ attribs[i].getParamNameAsMember() + " = "
+ "axiscSoapDeSerializer"
- + CUtils.getDeserializerMethodNameForType(attribs[i].getTypeName(), attribs[i].isAttribute())
+ + CUtils.getDeserializerMethodName(attribs[i].getTypeName(), attribs[i].isAttribute())
+ "(pDZ, \"" + elementNameToSearchFor + "\",0);\n");
writer.write(tab2 + "\tif (" + attribs[i].getParamNameAsMember() + " != NULL)\n");
@@ -687,14 +687,14 @@
writer.write(tab2 + "\t\tparam->" + attribs[i].getParamNameAsMember() + " = *"
+ attribs[i].getParamNameAsMember() + ";\n");
- if (CUtils.getXSDTypeForBasicType( attribs[i].getTypeName()).equals("XSDC_HEXBINARY")
- || CUtils.getXSDTypeForBasicType( attribs[i].getTypeName()).equals("XSDC_BASE64BINARY"))
+ if (CUtils.getXSDEnumerator( attribs[i].getTypeName()).equals("XSDC_HEXBINARY")
+ || CUtils.getXSDEnumerator( attribs[i].getTypeName()).equals("XSDC_BASE64BINARY"))
{
writer.write(tab2 + "\t\t" + attribs[i].getParamNameAsMember() + "->__ptr = NULL;\n");
}
writer.write(tab2 + "\t\taxiscAxisDelete( (void *) " + attribs[i].getParamNameAsMember()
- + ", " + CUtils.getXSDTypeForBasicType( attribs[i].getTypeName()) + ");\n");
+ + ", " + CUtils.getXSDEnumerator( attribs[i].getTypeName()) + ");\n");
writer.write(tab2 + "\t}\n");
writer.write(tab2 + "}\n"); // end local scope
@@ -844,7 +844,7 @@
String baseTypeName = null;
if (!attribs[i].isSimpleType() && attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName(attribs[i].getType().getBaseType());
+ baseTypeName = CUtils.getSimpleType(attribs[i].getType().getBaseType());
else
baseTypeName = attribs[i].getTypeName();
@@ -852,7 +852,7 @@
+ " = (" + baseTypeName + "_Array *)axiscAxisNew(XSDC_ARRAY, 0);\n");
writer.write("\t\tpTemp->" + attribs[i].getParamNameAsMember() + "->m_Type = "
- + CUtils.getXSDTypeForBasicType(baseTypeName) + ";\n");
+ + CUtils.getXSDEnumerator(baseTypeName) + ";\n");
}
else
{
@@ -910,12 +910,12 @@
String baseTypeName = null;
if (!attribs[i].isSimpleType() && attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName(attribs[i].getType().getBaseType());
+ baseTypeName = CUtils.getSimpleType(attribs[i].getType().getBaseType());
else
baseTypeName = attribs[i].getTypeName();
- if (CUtils.getXSDTypeForBasicType( baseTypeName).equals("XSDC_HEXBINARY")
- || CUtils.getXSDTypeForBasicType( baseTypeName).equals("XSDC_BASE64BINARY"))
+ if (CUtils.getXSDEnumerator( baseTypeName).equals("XSDC_HEXBINARY")
+ || CUtils.getXSDEnumerator( baseTypeName).equals("XSDC_BASE64BINARY"))
{
// need to delete the pointer
String dot = ".";
@@ -935,7 +935,7 @@
if (attribs[i].isArray())
passedInBaseType = "XSDC_ARRAY";
else
- passedInBaseType = CUtils.getXSDTypeForBasicType(baseTypeName);
+ passedInBaseType = CUtils.getXSDEnumerator(baseTypeName);
writer.write("\t\tif (param->" + attribs[i].getParamNameAsMember() + " != NULL)\n");
writer.write("\t\t\taxiscAxisDelete(param->" + attribs[i].getParamNameAsMember()
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?rev=687511&r1=687510&r2=687511&view=diff
==============================================================================
--- 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 Wed Aug 20 16:50:34 2008
@@ -279,7 +279,7 @@
}
else
{
- String initValue = CUtils.getInitValueForBasicType(outparamTypeName);
+ String initValue = CUtils.getInitValue(outparamTypeName);
if (initValue != null)
writer.write(outparamTypeName + " Ret = " + initValue + ";\n");
else if (outparamTypeName.equals("xsdc__dateTime")
@@ -354,10 +354,10 @@
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getBasicTypeForQName(qname);
+ containedType = CUtils.getSimpleType(qname);
writer.write("\taxiscCallAddBasicArrayParameter(call, ");
writer.write("(Axisc_Array *)Value" + i + ", "
- + CUtils.getXSDTypeForBasicType(containedType)
+ + CUtils.getXSDEnumerator(containedType)
+ ", \""
+ ((ParameterInfo) paramsB.get(i)).getParamNameAsSOAPString()
+ "\"");
@@ -386,7 +386,7 @@
+ ", \""
+ ((ParameterInfo) paramsB.get(i))
.getParamNameAsSOAPString() + "\", "
- + CUtils.getXSDTypeForBasicType(paramTypeName));
+ + CUtils.getXSDEnumerator(paramTypeName));
}
else
{
@@ -396,7 +396,7 @@
+ ", \""
+ ((ParameterInfo) paramsB.get(i))
.getParamNameAsSOAPString() + "\", "
- + CUtils.getXSDTypeForBasicType(paramTypeName));
+ + CUtils.getXSDEnumerator(paramTypeName));
}
}
else
@@ -454,10 +454,10 @@
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getBasicTypeForQName(qname);
+ containedType = CUtils.getSimpleType(qname);
writer.write("\n\t\tAxisc_Array * pReturn" + i
+ " = axiscCallGetBasicArray(call, "
- + CUtils.getXSDTypeForBasicType (containedType)
+ + CUtils.getXSDEnumerator (containedType)
+ ",\"" + currentType.getParamNameAsSOAPString() + "\",0);\n\n");
writer.write("\t\tif( OutValue" + i + " != NULL)\n");
writer.write("\t\t{\n");
@@ -535,11 +535,11 @@
writer.write( "\t\t\t\t}\n");
writer.write( "\t\t\t}\n");
writer.write( "\n");
- writer.write( "\t\t\taxiscAxisDelete( (void *) pReturn" + i + ", " + CUtils.getXSDTypeForBasicType( currentParaType) + ");\n");
+ writer.write( "\t\t\taxiscAxisDelete( (void *) pReturn" + i + ", " + CUtils.getXSDEnumerator( currentParaType) + ");\n");
}
else
{
- writer.write( "\t\t" + currentParaType + " * pReturn" + i + " = axiscCall" + CUtils.getDeserializerMethodNameForType( currentParaType, false) + "(call, \"" + currentType.getParamNameAsSOAPString() + "\", 0);\n");
+ writer.write( "\t\t" + currentParaType + " * pReturn" + i + " = axiscCall" + CUtils.getDeserializerMethodName( currentParaType, false) + "(call, \"" + currentType.getParamNameAsSOAPString() + "\", 0);\n");
writer.write( "\n");
writer.write( "\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
writer.write( "\t\t{\n");
@@ -547,7 +547,7 @@
writer.write( "\t\t\t*OutValue" + i + " = *pReturn" + i + ";\n");
writer.write( "\t\t}\n");
writer.write( "\n");
- writer.write( "\t\taxiscAxisDelete(pReturn" + i + ", " + CUtils.getXSDTypeForBasicType( currentParaType) + ");\n");
+ writer.write( "\t\taxiscAxisDelete(pReturn" + i + ", " + CUtils.getXSDEnumerator( currentParaType) + ");\n");
}
}
else
@@ -580,9 +580,9 @@
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getBasicTypeForQName(qname);
+ containedType = CUtils.getSimpleType(qname);
writer.write("\t\t\tRetArray = (" + containedType + "_Array *)axiscCallGetBasicArray(call, "
- + CUtils.getXSDTypeForBasicType(containedType) + ",\""
+ + CUtils.getXSDEnumerator(containedType) + ",\""
+ paramTagName + "\",0);\n");
}
else
@@ -609,7 +609,7 @@
writer.write(" *");
writer.write(" pReturn = axiscCall"
- + CUtils.getDeserializerMethodNameForType(outparamTypeName,
+ + CUtils.getDeserializerMethodName(outparamTypeName,
false) + "(call, \"" + paramTagName + "\", 0);\n\n");
writer.write("\t\t\tif( pReturn)\n");
writer.write("\t\t\t{\n");
@@ -622,7 +622,7 @@
else
{
writer.write("\t\t\t\tRet = *pReturn;\n");
- writer.write("\t\t\t\taxiscAxisDelete(pReturn, " + CUtils.getXSDTypeForBasicType(outparamTypeName) + ");\n");
+ writer.write("\t\t\t\taxiscAxisDelete(pReturn, " + CUtils.getXSDEnumerator(outparamTypeName) + ");\n");
}
writer.write("\t\t\t}\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java?rev=687511&r1=687510&r2=687511&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java Wed Aug 20 16:50:34 2008
@@ -115,7 +115,7 @@
if (!CUtils.isSimpleType(baseType))
return;
- String baseTypeName = CUtils.getBasicTypeForQName(baseType);
+ String baseTypeName = CUtils.getSimpleType(baseType);
String langTypeName;
// User defined simple type based on another user-defined simple type
@@ -428,7 +428,7 @@
String basicType = attribs[i].getTypeName();
Type theType = attribs[i].getType();
- if (theType.isRestriction() && !CUtils.isPrimitiveBasicType(basicType))
+ if (theType.isRestriction() && !CUtils.isPrimitiveType(basicType))
typeSet.add(basicType);
else if (!attribs[i].isSimpleType())
{
@@ -450,7 +450,7 @@
if (extBaseType.lastIndexOf("*") > -1)
extBaseType = extBaseType.substring(0, extBaseType.lastIndexOf("*"));
- if (!CUtils.isPrimitiveBasicType(extBaseType))
+ if (!CUtils.isPrimitiveType(extBaseType))
typeSet.add(extBaseType);
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java?rev=687511&r1=687510&r2=687511&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java Wed Aug 20 16:50:34 2008
@@ -106,7 +106,7 @@
String baseTypeName = null;
if (type.isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ baseTypeName = CUtils.getSimpleType (type.getBaseType ());
else
baseTypeName = paramTypeName;
@@ -132,7 +132,7 @@
String baseTypeName = null;
if (type.isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ baseTypeName = CUtils.getSimpleType (type.getBaseType ());
else
baseTypeName = paramType;
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=687511&r1=687510&r2=687511&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 Wed Aug 20 16:50:34 2008
@@ -132,7 +132,7 @@
{
if (type.isSimpleType ())
{
- baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ baseTypeName = CUtils.getSimpleType (type.getBaseType ());
paramTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
}
else
@@ -182,7 +182,7 @@
{
if (type.isSimpleType ())
{ //schema defined simpleType
- baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ baseTypeName = CUtils.getSimpleType (type.getBaseType ());
paramTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
}
else
@@ -235,7 +235,7 @@
ParameterInfo param = (ParameterInfo) paramsC.get (i);
String paramType = CUtils.getClassNameFromParamInfoConsideringArrays (param, wscontext);
if (type.isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName(type.getBaseType());
+ baseTypeName = CUtils.getSimpleType(type.getBaseType());
else
baseTypeName = paramType;
@@ -301,12 +301,12 @@
writer.write(outparamType + "* Ret = NULL;\n");
else
{
- String initValue = CUtils.getInitValueForBasicType(outparamType);
+ String initValue = CUtils.getInitValue(outparamType);
if (initValue != null)
writer.write(outparamType + " Ret = " + initValue + ";\n");
- else if (CUtils.getXSDTypeForBasicType( outparamType).equals("XSDC_DATETIME")
- || CUtils.getXSDTypeForBasicType( outparamType).equals("XSDC_DATE")
- || CUtils.getXSDTypeForBasicType( outparamType).equals("XSDC_TIME"))
+ else if (CUtils.getXSDEnumerator( outparamType).equals("XSDC_DATETIME")
+ || CUtils.getXSDEnumerator( outparamType).equals("XSDC_DATE")
+ || CUtils.getXSDEnumerator( outparamType).equals("XSDC_TIME"))
{
writer.write(outparamType + " Ret;\n");
writer.write("\tmemset(&Ret,0,sizeof(" + outparamType + "));\n");
@@ -402,7 +402,7 @@
if (type != null)
{
if (type.isSimpleType())
- paramTypeName = CUtils.getBasicTypeForQName(type.getBaseType());
+ paramTypeName = CUtils.getSimpleType(type.getBaseType());
else
{
paramTypeName = type.getLanguageSpecificName();
@@ -483,17 +483,17 @@
if (CUtils.isSimpleType (qname))
{
// Array of simple type
- String containedType = CUtils.getBasicTypeForQName (qname);
+ String containedType = CUtils.getSimpleType (qname);
writer.write ("\t\taxiscCallAddBasicArrayParameter(call,");
writer.write ("(Axisc_Array *)Value" + i + ", " +
- CUtils.getXSDTypeForBasicType(containedType) + ", cPrefixAndParamName" + i);
+ CUtils.getXSDEnumerator(containedType) + ", cPrefixAndParamName" + i);
}
else if (arrayType != null && arrayType.isSimpleType ())
{
- String containedType = CUtils.getBasicTypeForQName (arrayType.getBaseType ());
+ String containedType = CUtils.getSimpleType (arrayType.getBaseType ());
writer.write ("\t\taxiscCallAddBasicArrayParameter(call,");
writer.write ("(Axisc_Array *)Value" + i + ", " +
- CUtils.getXSDTypeForBasicType(containedType) +
+ CUtils.getXSDEnumerator(containedType) +
", cPrefixAndParamName" + i);
}
else
@@ -520,13 +520,13 @@
{
writer.write ("\t\taxiscCallAddParameter(call,");
writer.write ("(void*)Value" + i + ", cPrefixAndParamName" + i
- + ", " + CUtils.getXSDTypeForBasicType(paramTypeName));
+ + ", " + CUtils.getXSDEnumerator(paramTypeName));
}
else
{
writer.write ("\t\taxiscCallAddParameter(call,");
writer.write ("(void*)&Value" + i + ", cPrefixAndParamName" + i
- + ", " + CUtils.getXSDTypeForBasicType(paramTypeName));
+ + ", " + CUtils.getXSDEnumerator(paramTypeName));
}
}
else
@@ -605,7 +605,7 @@
{
if (type.isSimpleType ())
{
- baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ baseTypeName = CUtils.getSimpleType (type.getBaseType ());
currentParaType = CUtils.getClassNameFromParamInfoConsideringArrays(currentType, wscontext);
}
else
@@ -641,10 +641,10 @@
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getBasicTypeForQName(qname);
+ containedType = CUtils.getSimpleType(qname);
writer.write("\n\t\t\tOutValue" + i + " = axiscCallGetBasicArray(call, "
- + CUtils.getXSDTypeForBasicType (containedType)
+ + CUtils.getXSDEnumerator (containedType)
+ ", \"" + currentType.getParamNameAsSOAPString ()
+ "\", 0);\n\n");
}
@@ -702,7 +702,7 @@
writer.write( "\t\t\t" + currentParaType + " pReturn" + i + " = "
+ "axiscCall"
- + CUtils.getDeserializerMethodNameForType( baseTypeName, false)
+ + CUtils.getDeserializerMethodName( baseTypeName, false)
+ "(call, \"" + currentType.getParamNameAsSOAPString() + "\", 0);\n");
writer.write( "\n");
writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
@@ -727,13 +727,13 @@
writer.write( "\t\t\t\t}\n");
writer.write( "\t\t\t}\n");
writer.write( "\n");
- writer.write( "\t\t\taxiscAxisDelete( (void *) pReturn" + i + ", " + CUtils.getXSDTypeForBasicType( baseTypeName) + ");\n");
+ writer.write( "\t\t\taxiscAxisDelete( (void *) pReturn" + i + ", " + CUtils.getXSDEnumerator( baseTypeName) + ");\n");
}
else
{
writer.write( "\t\t\t" + currentParaType + " * pReturn" + i + " = "
+ "axiscCall"
- + CUtils.getDeserializerMethodNameForType( baseTypeName, false)
+ + CUtils.getDeserializerMethodName( baseTypeName, false)
+ "(call, \"" + currentType.getParamNameAsSOAPString() + "\", 0);\n");
writer.write( "\n");
writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
@@ -741,7 +741,7 @@
if (currentType.isNillable() || currentType.isOptional())
{
writer.write( "\t\t\t\tif( *OutValue" + i + " == NULL)\n");
- writer.write( "\t\t\t\t\t*OutValue" + i + " = axiscAxisNew(" + CUtils.getXSDTypeForBasicType( baseTypeName) + ", 0);\n");
+ writer.write( "\t\t\t\t\t*OutValue" + i + " = axiscAxisNew(" + CUtils.getXSDEnumerator( baseTypeName) + ", 0);\n");
writer.write( "\n");
writer.write( "\t\t\t\t*");
}
@@ -752,13 +752,13 @@
writer.write( "\t\t\t}\n");
writer.write( "\n");
- if (CUtils.getXSDTypeForBasicType( baseTypeName).equals("XSDC_HEXBINARY")
- || CUtils.getXSDTypeForBasicType( baseTypeName).equals("XSDC_BASE64BINARY"))
+ if (CUtils.getXSDEnumerator( baseTypeName).equals("XSDC_HEXBINARY")
+ || CUtils.getXSDEnumerator( baseTypeName).equals("XSDC_BASE64BINARY"))
{
writer.write( "\t\t\tpReturn" + i + "->__ptr = NULL;\n");
}
- writer.write( "\t\t\taxiscAxisDelete( (void *) pReturn" + i + ", " + CUtils.getXSDTypeForBasicType( baseTypeName) + ");\n");
+ writer.write( "\t\t\taxiscAxisDelete( (void *) pReturn" + i + ", " + CUtils.getXSDEnumerator( baseTypeName) + ");\n");
}
writer.write("\t\t\t}\n"); // end scope
}
@@ -800,9 +800,9 @@
String containedType = null;
if (CUtils.isSimpleType (qname))
{
- containedType = CUtils.getBasicTypeForQName (qname);
+ containedType = CUtils.getSimpleType (qname);
writer.write ("\t\t\tRetArray =(" + containedType + "_Array *) axiscCallGetBasicArray(call, "
- + CUtils.getXSDTypeForBasicType (containedType)
+ + CUtils.getXSDEnumerator (containedType)
+ ", \"" + returntype.getParamNameAsSOAPString () + "\", 0);\n");
}
else
@@ -826,7 +826,7 @@
if (returntype.isNillable () || returntype.isOptional() || CUtils.isPointerType(outparamType))
{
writer.write( "\t\t\tRet = axiscCall"
- + CUtils.getDeserializerMethodNameForType( outparamType, false)
+ + CUtils.getDeserializerMethodName( outparamType, false)
+ "(call, \"" + returntype.getParamNameAsSOAPString() + "\", 0);\n");
writer.write( "\t\t}\n");
}
@@ -834,7 +834,7 @@
{
writer.write ("\t\t\t" + outparamType + " * pReturn = "
+ "axiscCall"
- + CUtils.getDeserializerMethodNameForType(outparamType, false)
+ + CUtils.getDeserializerMethodName(outparamType, false)
+ "(call, \"" + returntype.getElementNameAsSOAPString() + "\", 0);\n");
writer.write ("\t\t\tif(pReturn)\n");
@@ -842,14 +842,14 @@
writer.write ("\t\t\t\tRet = *pReturn;\n");
- if (CUtils.getXSDTypeForBasicType( outparamType).equals("XSDC_HEXBINARY")
- || CUtils.getXSDTypeForBasicType( outparamType).equals("XSDC_BASE64BINARY"))
+ if (CUtils.getXSDEnumerator( outparamType).equals("XSDC_HEXBINARY")
+ || CUtils.getXSDEnumerator( outparamType).equals("XSDC_BASE64BINARY"))
{
writer.write( "\t\t\t\tpReturn->__ptr = NULL;\n");
}
writer.write ("\t\t\t\taxiscAxisDelete( (void *) pReturn, "
- + CUtils.getXSDTypeForBasicType( outparamType) + ");\n");
+ + CUtils.getXSDEnumerator( outparamType) + ");\n");
writer.write ("\t\t\t}\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java?rev=687511&r1=687510&r2=687511&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java Wed Aug 20 16:50:34 2008
@@ -91,13 +91,6 @@
}
}
- if (CUtils.isSimpleType(qname) && !CUtils.isDefinedSimpleType(qname))
- {
- throw new WrapperFault(
- "No need to create an Array for simple type " + qname + "\n"
- + "It seems that some thing wrong with symbolTable population");
- }
-
ArrayParamHeaderWriter writer = (new ArrayParamHeaderWriter(wscontext, type));
if (!writer.isSimpleTypeArray())
{
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?rev=687511&r1=687510&r2=687511&view=diff
==============================================================================
--- 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 Wed Aug 20 16:50:34 2008
@@ -201,7 +201,7 @@
boolean isPointerType = false;
if (attributeType.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(attributeType.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getSimpleType(attributeType.getBaseType()));
else
isPointerType = CUtils.isPointerType(getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i]));
@@ -285,7 +285,7 @@
if (!CUtils.isPointerType(typeName))
writer.write("&");
writer.write("(param->" + extensionBaseAttrib.getParamNameAsMember() + "), "
- + CUtils.getXSDTypeForBasicType(typeName) + ");\n");
+ + CUtils.getXSDEnumerator(typeName) + ");\n");
}
else
{
@@ -377,7 +377,7 @@
String basicType = null;
if (!attribs[i].isSimpleType() && attrType.isSimpleType())
- basicType = CUtils.getBasicTypeForQName(attrType.getBaseType());
+ basicType = CUtils.getSimpleType(attrType.getBaseType());
else
basicType = attribs[i].getTypeName();
@@ -388,14 +388,14 @@
writer.write("\tpSZ->serializeAsAttribute(\""
+ soapTagName + "\", 0, (void*)(param->"
+ attribs[i].getParamNameAsMember() + "), "
- + CUtils.getXSDTypeForBasicType(basicType) + ");\n");
+ + CUtils.getXSDEnumerator(basicType) + ");\n");
}
else
{
writer.write("\tpSZ->serializeAsAttribute(\""
+ soapTagName + "\", 0, (void*)&(param->"
+ attribs[i].getParamNameAsMember() + "), "
- + CUtils.getXSDTypeForBasicType(attribs[i].getTypeName()) + ");\n");
+ + CUtils.getXSDEnumerator(attribs[i].getTypeName()) + ");\n");
}
}
@@ -481,13 +481,13 @@
{
String baseTypeName = null;
if (!attribs[i].isSimpleType() && attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName(attribs[i].getType().getBaseType());
+ baseTypeName = CUtils.getSimpleType(attribs[i].getType().getBaseType());
else
baseTypeName = attribs[i].getTypeName();
writer.write("\tpSZ->serializeBasicArray(param->" + attribs[i].getParamNameAsMember()
+ ", " + namespace + ","
- + CUtils.getXSDTypeForBasicType(baseTypeName) + ", \""
+ + CUtils.getXSDEnumerator(baseTypeName) + ", \""
+ attribs[i].getParamNameAsSOAPString() + "\");\n");
}
else
@@ -510,7 +510,7 @@
String typeName = attribs[i].getTypeName();
String baseTypeName = null;
if (attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName (attribs[i].getType().getBaseType ());
+ baseTypeName = CUtils.getSimpleType (attribs[i].getType().getBaseType ());
else
baseTypeName = typeName;
@@ -529,7 +529,7 @@
writer.write("\tpSZ->serializeAsElement(\""
+ attribs[i].getElementNameAsSOAPString() + "\", " + namespace
+ ", (void*)" + ampersand + "(param->" + attribs[i].getParamNameAsMember() + "), "
- + CUtils.getXSDTypeForBasicType(baseTypeName) + ");\n");
+ + CUtils.getXSDEnumerator(baseTypeName) + ");\n");
}
else
{
@@ -651,7 +651,7 @@
{
writer.write("\tvoid* pCharDataAs;\n");
String typeName = extensionBaseAttrib.getTypeName();
- String xsdType = CUtils.getXSDTypeForBasicType(typeName);
+ String xsdType = CUtils.getXSDEnumerator(typeName);
writer.write("\tpIWSDZ->getChardataAs(&pCharDataAs, " + xsdType + ");\n");
writer.write("\tparam->" + extensionBaseAttrib.getParamNameAsMember() + " = ");
@@ -832,12 +832,12 @@
{
String baseTypeName = null;
if (!attribs[i].isSimpleType() && attribs[i].getType().isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName(attribs[i].getType().getBaseType());
+ baseTypeName = CUtils.getSimpleType(attribs[i].getType().getBaseType());
else
baseTypeName = attribs[i].getTypeName();
writer.write(tab2 + "Axis_Array * array" + arrayCount + " = pIWSDZ->getBasicArray("
- + CUtils.getXSDTypeForBasicType(baseTypeName) + ", \""
+ + CUtils.getXSDEnumerator(baseTypeName) + ", \""
+ attribs[i].getParamNameAsSOAPString()
+ "\",0);\n");
writer.write(tab2 + "if(param->" + attribs[i].getParamNameAsMember() + " == NULL)\n");
@@ -874,27 +874,27 @@
Type type = attribs[i].getType();
boolean isPointerType = false;
if (type.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(type.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getSimpleType(type.getBaseType()));
else
isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
String typeName = attribs[i].getTypeName();
String baseTypeName = null;
if (type.isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ baseTypeName = CUtils.getSimpleType (type.getBaseType ());
else
baseTypeName = typeName;
if( isPointerType)
{
writer.write(tab2 + typeName + " pValue" + i + " = pIWSDZ->" +
- CUtils.getDeserializerMethodNameForType(baseTypeName, attribs[i].isAttribute()) +
+ CUtils.getDeserializerMethodName(baseTypeName, attribs[i].isAttribute()) +
"(\"" + soapTagName + "\", 0);\n");
}
else
{
writer.write(tab2 + typeName + " * pValue" + i + " = pIWSDZ->" +
- CUtils.getDeserializerMethodNameForType(baseTypeName, attribs[i].isAttribute()) +
+ CUtils.getDeserializerMethodName(baseTypeName, attribs[i].isAttribute()) +
"(\"" + soapTagName + "\", 0);\n");
}
@@ -917,7 +917,7 @@
writer.write(tab2 + "{\n");
writer.write(tab2 + "\tparam->set" + attribs[i].getMethodName() + "(*pValue" + i + ");\n");
writer.write(tab2 + "\tAxis::AxisDelete((void *)pValue" + i
- + ", " + CUtils.getXSDTypeForBasicType( attribs[i].getTypeName()) + ");\n");
+ + ", " + CUtils.getXSDEnumerator( attribs[i].getTypeName()) + ");\n");
writer.write(tab2 + "}\n");
}
@@ -1160,7 +1160,7 @@
Type type = attribs[i].getType();
boolean isPointerType = false;
if (type.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(type.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getSimpleType(type.getBaseType()));
else
isPointerType = CUtils.isPointerType(attribs[i].getTypeName());
@@ -1214,7 +1214,7 @@
Type type = attribs[i].getType();
boolean isPointerType = false;
if (type.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(type.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getSimpleType(type.getBaseType()));
else
isPointerType = CUtils.isPointerType(typename);
@@ -1305,7 +1305,7 @@
{
CUtils.printMethodComment(writer, "Function used to check whether object has allowed values. Not implemented yet.");
- boolean isPtrType = CUtils.isPointerType( CUtils.getBasicTypeForQName( type.getBaseType()));
+ boolean isPtrType = CUtils.isPointerType( CUtils.getSimpleType( type.getBaseType()));
writer.write("int Check_Restrictions_" + classname + "(" + classname + " value)\n");
writer.write("{\n");
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?rev=687511&r1=687510&r2=687511&view=diff
==============================================================================
--- 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 Wed Aug 20 16:50:34 2008
@@ -316,12 +316,12 @@
}
else
{
- String initValue = CUtils.getInitValueForBasicType (outparamType);
+ String initValue = CUtils.getInitValue (outparamType);
if (initValue != null)
writer.write (outparamType + " Ret = " + initValue + ";\n");
- else if (CUtils.getXSDTypeForBasicType( outparamType).equals("XSD_DATETIME")
- || CUtils.getXSDTypeForBasicType( outparamType).equals("XSD_DATE")
- || CUtils.getXSDTypeForBasicType( outparamType).equals("XSD_TIME"))
+ else if (CUtils.getXSDEnumerator( outparamType).equals("XSD_DATETIME")
+ || CUtils.getXSDEnumerator( outparamType).equals("XSD_DATE")
+ || CUtils.getXSDEnumerator( outparamType).equals("XSD_TIME"))
{
writer.write (outparamType + " Ret;\n");
writer.write ("\tmemset(&Ret,0,sizeof(" + outparamType + "));\n");
@@ -413,10 +413,10 @@
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getBasicTypeForQName(qname);
+ containedType = CUtils.getSimpleType(qname);
writer.write("\t\tm_pCall->addBasicArrayParameter( ");
writer.write("Value" + i + ", "
- + CUtils.getXSDTypeForBasicType(containedType)
+ + CUtils.getXSDEnumerator(containedType)
+ ", \""
+ ((ParameterInfo) paramsB.get(i)).getParamNameAsSOAPString()
+ "\"");
@@ -440,14 +440,14 @@
writer.write("\t\tm_pCall->addParameter( ");
writer.write("(void *) Value" + i + ", \""
+ ((ParameterInfo) paramsB.get(i)).getParamNameAsSOAPString() + "\", "
- + CUtils.getXSDTypeForBasicType(paramTypeName));
+ + CUtils.getXSDEnumerator(paramTypeName));
}
else
{
writer.write("\t\tm_pCall->addParameter( ");
writer.write("(void *) &Value" + i + ", \""
+ ((ParameterInfo) paramsB.get(i)).getParamNameAsSOAPString() + "\", "
- + CUtils.getXSDTypeForBasicType(paramTypeName));
+ + CUtils.getXSDEnumerator(paramTypeName));
}
}
else
@@ -514,8 +514,8 @@
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getBasicTypeForQName(qname);
- writer.write("\n\t\t\tAxis_Array * pReturn" + i + " = m_pCall->getBasicArray( " + CUtils.getXSDTypeForBasicType (containedType)
+ containedType = CUtils.getSimpleType(qname);
+ writer.write("\n\t\t\tAxis_Array * pReturn" + i + " = m_pCall->getBasicArray( " + CUtils.getXSDEnumerator (containedType)
+ ",\"" + paramTagName
+ "\", 0);\n\n");
writer.write("\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
@@ -572,7 +572,7 @@
xsdType += " *";
writer.write( "\t\t\t" + currentParaType + " pReturn" + i
- + " = m_pCall->" + CUtils.getDeserializerMethodNameForType( currentParaType, false)
+ + " = m_pCall->" + CUtils.getDeserializerMethodName( currentParaType, false)
+ "( \"" + paramTagName + "\", 0);\n");
writer.write( "\n");
writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
@@ -598,12 +598,12 @@
writer.write( "\t\t\t}\n");
writer.write( "\n");
writer.write( "\t\t\tAxis::AxisDelete( (void *) pReturn" + i + ", "
- + CUtils.getXSDTypeForBasicType( currentParaType) + ");\n");
+ + CUtils.getXSDEnumerator( currentParaType) + ");\n");
}
else
{
writer.write( "\t\t\t" + currentParaType + " * pReturn" + i + " = m_pCall->"
- + CUtils.getDeserializerMethodNameForType( currentParaType, false)
+ + CUtils.getDeserializerMethodName( currentParaType, false)
+ "( \"" + paramTagName + "\", 0);\n");
writer.write( "\n");
writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
@@ -615,7 +615,7 @@
writer.write( "\t\t\t}\n");
writer.write( "\n");
writer.write( "\t\t\tAxis::AxisDelete( (void *) pReturn" + i + ", "
- + CUtils.getXSDTypeForBasicType( currentParaType) + ");\n");
+ + CUtils.getXSDEnumerator( currentParaType) + ");\n");
}
}
else
@@ -645,9 +645,9 @@
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getBasicTypeForQName(qname);
+ containedType = CUtils.getSimpleType(qname);
writer.write("\t\t\t\tAxis_Array * RetAxisArray = m_pCall->getBasicArray( "
- + CUtils.getXSDTypeForBasicType(containedType) + ",\""
+ + CUtils.getXSDEnumerator(containedType) + ",\""
+ paramTagName + "\",0);\n");
writer.write ("\t\t\t\tRetArray->clone( *RetAxisArray);\n");
writer.write ("\t\t\t\tAxis::AxisDelete( (void *) RetAxisArray, XSD_ARRAY);\n");
@@ -672,18 +672,18 @@
if (returntype.isNillable () || CUtils.isPointerType(outparamType))
{
writer.write( "\t\t\t\tRet = m_pCall->"
- + CUtils.getDeserializerMethodNameForType( outparamType, false)
+ + CUtils.getDeserializerMethodName( outparamType, false)
+ "(\"" + returntype.getParamNameAsSOAPString() + "\", 0);\n");
}
else
{
writer.write ("\t\t\t\t" + outparamType + " * pReturn = m_pCall->" +
- CUtils.getDeserializerMethodNameForType(outparamType, false) + "(\"" +
+ CUtils.getDeserializerMethodName(outparamType, false) + "(\"" +
returntype.getElementNameAsSOAPString() + "\", 0);\n");
writer.write ("\t\t\t\tif(pReturn)\n");
writer.write ("\t\t\t\t{\n");
writer.write ("\t\t\t\t\tRet = *pReturn;\n");
- writer.write ("\t\t\t\t\tAxis::AxisDelete( (void *) pReturn, " + CUtils.getXSDTypeForBasicType( outparamType) + ");\n");
+ writer.write ("\t\t\t\t\tAxis::AxisDelete( (void *) pReturn, " + CUtils.getXSDEnumerator( outparamType) + ");\n");
writer.write ("\t\t\t\t}\n");
// TODO If we unexpectedly receive a nill value, when nillable="false" we should do something appropriate, perhaps as below:
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java?rev=687511&r1=687510&r2=687511&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java Wed Aug 20 16:50:34 2008
@@ -123,7 +123,7 @@
boolean isPointerType = false;
if (type.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(type.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getSimpleType(type.getBaseType()));
else
isPointerType = CUtils.isPointerType(getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i]));
@@ -166,7 +166,7 @@
if (!CUtils.isSimpleType(baseType))
return;
- String baseTypeName = CUtils.getBasicTypeForQName(baseType);
+ String baseTypeName = CUtils.getSimpleType(baseType);
String langTypeName;
// User defined simple type based on another user-defined simple type
@@ -404,7 +404,7 @@
Type type = attribs[i].getType();
boolean isPointerType;
if (type.isSimpleType())
- isPointerType = CUtils.isPointerType(CUtils.getBasicTypeForQName(type.getBaseType()));
+ isPointerType = CUtils.isPointerType(CUtils.getSimpleType(type.getBaseType()));
else
isPointerType = CUtils.isPointerType(paramType);
@@ -553,7 +553,7 @@
String basicType = attribs[i].getTypeName();
Type theType = attribs[i].getType();
- if (theType.isRestriction() && !CUtils.isPrimitiveBasicType(basicType))
+ if (theType.isRestriction() && !CUtils.isPrimitiveType(basicType))
typeSet.add(basicType);
else if (!attribs[i].isSimpleType())
{
@@ -575,7 +575,7 @@
if (extBaseType.lastIndexOf("*") > -1)
extBaseType = extBaseType.substring(0, extBaseType.lastIndexOf("*"));
- if (!CUtils.isPrimitiveBasicType(extBaseType))
+ if (!CUtils.isPrimitiveType(extBaseType))
typeSet.add(extBaseType);
}
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?rev=687511&r1=687510&r2=687511&view=diff
==============================================================================
--- 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 Wed Aug 20 16:50:34 2008
@@ -328,14 +328,14 @@
+ " value"
+ i
+ " = pIWSDZ->"
- + CUtils.getDeserializerMethodNameForType(paraTypeName, false)
+ + CUtils.getDeserializerMethodName(paraTypeName, false)
+ "(\""
+ parameterName + "\",0);\n");
writer.write("\tif (value" + i + ")\n");
writer.write("\t{\n");
writer.write("\t\tv" + i + " = new char[ strlen( value" + i + " ) + 1 ];\n");
writer.write("\t\tstrcpy( v" + i + ", value" + i + " );\n");
- writer.write("\t\tAxis::AxisDelete( (void *) value" + i + ", " + CUtils.getXSDTypeForBasicType(paraTypeName) + ");\n");
+ writer.write("\t\tAxis::AxisDelete( (void *) value" + i + ", " + CUtils.getXSDEnumerator(paraTypeName) + ");\n");
writer.write("\t}\n");
}
else
@@ -346,14 +346,14 @@
+ "* pValue"
+ i
+ " = pIWSDZ->"
- + CUtils.getDeserializerMethodNameForType(paraTypeName, false)
+ + CUtils.getDeserializerMethodName(paraTypeName, false)
+ "(\""
+ parameterName + "\",0);\n");
writer.write("\tif (pValue" + i + ")\n");
writer.write("\t{\n");
writer.write("\t\tv" + i + " = new " + paraTypeName + "();");
writer.write("\t\t*v" + i + " = *pValue" + i + ";\n");
- writer.write("\t\tAxis::AxisDelete( (void *) pValue" + i + ", " + CUtils.getXSDTypeForBasicType(paraTypeName) + ");\n");
+ writer.write("\t\tAxis::AxisDelete( (void *) pValue" + i + ", " + CUtils.getXSDEnumerator(paraTypeName) + ");\n");
writer.write("\t}\n");
}
}
@@ -367,20 +367,20 @@
+ " value"
+ i
+ " = pIWSDZ->"
- + CUtils.getDeserializerMethodNameForType(paraTypeName, false)
+ + CUtils.getDeserializerMethodName(paraTypeName, false)
+ "(\""
+ parameterName + "\",0);\n");
writer.write("\tif (value" + i + ")\n");
writer.write("\t{\n");
writer.write("\t\tv" + i + " = new char[ strlen( value" + i + " ) + 1 ];\n");
writer.write("\t\tstrcpy( v" + i + ", value" + i + " );\n");
- writer.write("\t\tAxis::AxisDelete( (void *) value" + i + ", " + CUtils.getXSDTypeForBasicType(paraTypeName) + ");\n");
+ writer.write("\t\tAxis::AxisDelete( (void *) value" + i + ", " + CUtils.getXSDEnumerator(paraTypeName) + ");\n");
writer.write("\t}\n");
}
else
{
writer.write("\n\t" + paraTypeName + " v" + i);
- String typeInitValue = CUtils.getInitValueForBasicType(paraTypeName);
+ String typeInitValue = CUtils.getInitValue(paraTypeName);
if (typeInitValue != null)
writer.write(" = " + typeInitValue);
@@ -390,13 +390,13 @@
+ " * pValue"
+ i
+ " = pIWSDZ->"
- + CUtils.getDeserializerMethodNameForType(paraTypeName, false)
+ + CUtils.getDeserializerMethodName(paraTypeName, false)
+ "(\""
+ parameterName + "\",0);\n");
writer.write("\tif (pValue" + i + ")\n");
writer.write("\t{\n");
writer.write("\t\tv" + i + " = *pValue" + i + ";\n");
- writer.write("\t\tAxis::AxisDelete( (void *) pValue" + i + ", " + CUtils.getXSDTypeForBasicType(paraTypeName) + " );\n");
+ writer.write("\t\tAxis::AxisDelete( (void *) pValue" + i + ", " + CUtils.getXSDEnumerator(paraTypeName) + " );\n");
writer.write("\t}\n");
}
}
@@ -412,7 +412,7 @@
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getBasicTypeForQName(qname);
+ containedType = CUtils.getSimpleType(qname);
writer.write("\n\t" + containedType + "_Array * v" + i +" = new " + containedType + "_Array();\n");
writer.write(
@@ -420,7 +420,7 @@
+ "Axis_Array * RetArray"
+ i
+ " = pIWSDZ->getBasicArray("
- + CUtils.getXSDTypeForBasicType(containedType)
+ + CUtils.getXSDEnumerator(containedType)
+ ", \""
+ parameterName
+ "\",0);\n");
@@ -527,7 +527,7 @@
"\t\treturn pIWSSZ->addOutputParam(\""
+ methodName
+ "Return\", (void*)ret, "
- + CUtils.getXSDTypeForBasicType(outparamTypeName)
+ + CUtils.getXSDEnumerator(outparamTypeName)
+ ");\n");
}
else
@@ -536,7 +536,7 @@
"\t\treturn pIWSSZ->addOutputParam(\""
+ methodName
+ "Return\", (void*)&ret, "
- + CUtils.getXSDTypeForBasicType(outparamTypeName)
+ + CUtils.getXSDEnumerator(outparamTypeName)
+ ");\n");
}
}
@@ -547,10 +547,10 @@
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getBasicTypeForQName(qname);
+ containedType = CUtils.getSimpleType(qname);
writer.write(
"\t\tnStatus = pIWSSZ->addOutputBasicArrayParam(ret,"
- + CUtils.getXSDTypeForBasicType(containedType)
+ + CUtils.getXSDEnumerator(containedType)
+ ", \""
+ methodName
+ "Return\");\n");
@@ -647,7 +647,7 @@
+ "\", (void*)out"
+ i
+ ", "
- + CUtils.getXSDTypeForBasicType(outparamType)
+ + CUtils.getXSDEnumerator(outparamType)
+ ");\n");
if (param.isOptional())
{
@@ -662,7 +662,7 @@
+ "\", (void*)&out"
+ i
+ ", "
- + CUtils.getXSDTypeForBasicType(outparamType)
+ + CUtils.getXSDEnumerator(outparamType)
+ ");\n");
}
}
@@ -674,12 +674,12 @@
String containedType = null;
if (CUtils.isSimpleType(qname))
{
- containedType = CUtils.getBasicTypeForQName(qname);
+ containedType = CUtils.getSimpleType(qname);
writer.write(
"\t\tpIWSSZ->addOutputBasicArrayParam((Axis_Array*)(&out"
+ i
+ "),"
- + CUtils.getXSDTypeForBasicType(
+ + CUtils.getXSDEnumerator(
containedType)
+ ", \""
+ returnParamName
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?rev=687511&r1=687510&r2=687511&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 Aug 20 16:50:34 2008
@@ -102,7 +102,7 @@
String baseTypeName = null;
if (type.isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ baseTypeName = CUtils.getSimpleType (type.getBaseType ());
else
baseTypeName = paramTypeName;
@@ -128,7 +128,7 @@
String baseTypeName = null;
if (type.isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ baseTypeName = CUtils.getSimpleType (type.getBaseType ());
else
baseTypeName = paramType;
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=687511&r1=687510&r2=687511&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 Wed Aug 20 16:50:34 2008
@@ -149,7 +149,7 @@
{
if (type.isSimpleType ())
{
- baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ baseTypeName = CUtils.getSimpleType (type.getBaseType ());
paramTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
}
else
@@ -199,7 +199,7 @@
{
if (type.isSimpleType ())
{ //schema defined simpleType
- baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ baseTypeName = CUtils.getSimpleType (type.getBaseType ());
paramTypeName = CUtils.getClassNameFromParamInfoConsideringArrays(paramtype, wscontext);
}
else
@@ -252,7 +252,7 @@
ParameterInfo param = (ParameterInfo) paramsC.get (i);
String paramType = CUtils.getClassNameFromParamInfoConsideringArrays (param, wscontext);
if (type.isSimpleType())
- baseTypeName = CUtils.getBasicTypeForQName(type.getBaseType());
+ baseTypeName = CUtils.getSimpleType(type.getBaseType());
else
baseTypeName = paramType;
@@ -307,12 +307,12 @@
writer.write (outparamType + "* Ret = NULL;\n");
else
{
- String initValue = CUtils.getInitValueForBasicType (outparamType);
+ String initValue = CUtils.getInitValue (outparamType);
if (initValue != null)
writer.write (outparamType + " Ret = " + initValue + ";\n");
- else if (CUtils.getXSDTypeForBasicType( outparamType).equals("XSD_DATETIME")
- || CUtils.getXSDTypeForBasicType( outparamType).equals("XSD_DATE")
- || CUtils.getXSDTypeForBasicType( outparamType).equals("XSD_TIME"))
+ else if (CUtils.getXSDEnumerator( outparamType).equals("XSD_DATETIME")
+ || CUtils.getXSDEnumerator( outparamType).equals("XSD_DATE")
+ || CUtils.getXSDEnumerator( outparamType).equals("XSD_TIME"))
{
writer.write (outparamType + " Ret;\n");
writer.write ("\tmemset(&Ret,0,sizeof(" + outparamType + "));\n");
@@ -410,7 +410,7 @@
if (type != null)
{
if (type.isSimpleType ())
- paramTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ paramTypeName = CUtils.getSimpleType (type.getBaseType ());
else
{
paramTypeName = type.getLanguageSpecificName ();
@@ -492,17 +492,17 @@
if (CUtils.isSimpleType (qname))
{
// Array of simple type
- String containedType = CUtils.getBasicTypeForQName (qname);
+ String containedType = CUtils.getSimpleType (qname);
writer.write (tab2 + "\t\tm_pCall->addBasicArrayParameter(");
writer.write ("Value" + i + ", " +
- CUtils.getXSDTypeForBasicType(containedType) + ", cPrefixAndParamName" + i);
+ CUtils.getXSDEnumerator(containedType) + ", cPrefixAndParamName" + i);
}
else if (arrayType != null && arrayType.isSimpleType ())
{
- String containedType = CUtils.getBasicTypeForQName (arrayType.getBaseType ());
+ String containedType = CUtils.getSimpleType (arrayType.getBaseType ());
writer.write (tab2 + "\t\tm_pCall->addBasicArrayParameter(");
writer.write ("Value" + i + ", " +
- CUtils.getXSDTypeForBasicType(containedType) +
+ CUtils.getXSDEnumerator(containedType) +
", cPrefixAndParamName" + i);
}
else
@@ -529,13 +529,13 @@
{
writer.write (tab2 + "\t\tm_pCall->addParameter(");
writer.write ("(void*)Value" + i + ", cPrefixAndParamName" + i
- + ", " + CUtils.getXSDTypeForBasicType(paramTypeName));
+ + ", " + CUtils.getXSDEnumerator(paramTypeName));
}
else
{
writer.write (tab2 + "\t\tm_pCall->addParameter(");
writer.write ("(void*)&Value" + i + ", cPrefixAndParamName" + i
- + ", " + CUtils.getXSDTypeForBasicType(paramTypeName));
+ + ", " + CUtils.getXSDEnumerator(paramTypeName));
}
}
else
@@ -612,7 +612,7 @@
{
if (type.isSimpleType ())
{
- baseTypeName = CUtils.getBasicTypeForQName (type.getBaseType ());
+ baseTypeName = CUtils.getSimpleType (type.getBaseType ());
currentParaType = CUtils.getClassNameFromParamInfoConsideringArrays(currentType, wscontext);
}
else
@@ -648,9 +648,9 @@
if (CUtils.isSimpleType (qname))
{
- containedType = CUtils.getBasicTypeForQName (qname);
+ containedType = CUtils.getSimpleType (qname);
- writer.write("\n\t\t\t\tAxis_Array * pReturn" + i + " = m_pCall->getBasicArray(" + CUtils.getXSDTypeForBasicType (containedType)
+ writer.write("\n\t\t\t\tAxis_Array * pReturn" + i + " = m_pCall->getBasicArray(" + CUtils.getXSDEnumerator (containedType)
+ ", \"" + currentType.getParamNameAsSOAPString ()
+ "\", 0);\n\n");
writer.write("\t\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
@@ -711,7 +711,7 @@
xsdType += " *";
}
- writer.write( "\t\t\t\t" + currentParaType + " pReturn" + i + " = m_pCall->" + CUtils.getDeserializerMethodNameForType( baseTypeName, false) + "( \"" + currentType.getParamNameAsSOAPString() + "\", 0);\n");
+ writer.write( "\t\t\t\t" + currentParaType + " pReturn" + i + " = m_pCall->" + CUtils.getDeserializerMethodName( baseTypeName, false) + "( \"" + currentType.getParamNameAsSOAPString() + "\", 0);\n");
writer.write( "\n");
writer.write( "\t\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
writer.write( "\t\t\t\t\t{\n");
@@ -735,11 +735,11 @@
writer.write( "\t\t\t\t\t}\n");
writer.write( "\t\t\t\t}\n");
writer.write( "\n");
- writer.write( "\t\t\t\tAxis::AxisDelete( (void *) pReturn" + i + ", " + CUtils.getXSDTypeForBasicType( baseTypeName) + ");\n");
+ writer.write( "\t\t\t\tAxis::AxisDelete( (void *) pReturn" + i + ", " + CUtils.getXSDEnumerator( baseTypeName) + ");\n");
}
else
{
- writer.write( "\t\t\t\t" + currentParaType + " * pReturn" + i + " = m_pCall->" + CUtils.getDeserializerMethodNameForType( baseTypeName, false) + "( \"" + currentType.getParamNameAsSOAPString() + "\", 0);\n");
+ writer.write( "\t\t\t\t" + currentParaType + " * pReturn" + i + " = m_pCall->" + CUtils.getDeserializerMethodName( baseTypeName, false) + "( \"" + currentType.getParamNameAsSOAPString() + "\", 0);\n");
writer.write( "\n");
writer.write( "\t\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
writer.write( "\t\t\t\t{\n");
@@ -757,7 +757,7 @@
writer.write( "*OutValue" + i + " = *pReturn" + i + ";\n");
writer.write( "\t\t\t\t}\n");
writer.write( "\n");
- writer.write( "\t\t\t\tAxis::AxisDelete( (void *) pReturn" + i + ", " + CUtils.getXSDTypeForBasicType( baseTypeName) + ");\n");
+ writer.write( "\t\t\t\tAxis::AxisDelete( (void *) pReturn" + i + ", " + CUtils.getXSDEnumerator( baseTypeName) + ");\n");
}
}
else if (currentType.isAnyType ())
@@ -798,9 +798,9 @@
String containedType = null;
if (CUtils.isSimpleType (qname))
{
- containedType = CUtils.getBasicTypeForQName (qname);
+ containedType = CUtils.getSimpleType (qname);
writer.write ("\t\t\t\tAxis_Array * RetAxisArray = m_pCall->getBasicArray("
- + CUtils.getXSDTypeForBasicType (containedType)
+ + CUtils.getXSDEnumerator (containedType)
+ ", \"" + returntype.getParamNameAsSOAPString () + "\", 0);\n");
writer.write ("\t\t\t\tRetArray->clone(*RetAxisArray);\n");
writer.write ("\t\t\t\tAxis::AxisDelete( (void *)RetAxisArray, XSD_ARRAY);\n");
@@ -825,18 +825,18 @@
if (returntype.isNillable () || returntype.isOptional() || CUtils.isPointerType(outparamType))
{
writer.write( "\t\t\t\tRet = m_pCall->"
- + CUtils.getDeserializerMethodNameForType( outparamType, false)
+ + CUtils.getDeserializerMethodName( outparamType, false)
+ "(\"" + returntype.getParamNameAsSOAPString() + "\", 0);\n");
}
else
{
writer.write ("\t\t\t\t" + outparamType + " * pReturn = m_pCall->" +
- CUtils.getDeserializerMethodNameForType(outparamType, false) + "(\"" +
+ CUtils.getDeserializerMethodName(outparamType, false) + "(\"" +
returntype.getElementNameAsSOAPString() + "\", 0);\n");
writer.write ("\t\t\t\tif(pReturn)\n");
writer.write ("\t\t\t\t{\n");
writer.write ("\t\t\t\t\tRet = *pReturn;\n");
- writer.write ("\t\t\t\t\tAxis::AxisDelete( (void *) pReturn, " + CUtils.getXSDTypeForBasicType( outparamType) + ");\n");
+ writer.write ("\t\t\t\t\tAxis::AxisDelete( (void *) pReturn, " + CUtils.getXSDEnumerator( outparamType) + ");\n");
writer.write ("\t\t\t\t}\n");
// TODO If we unexpectedly receive a nill value, when nillable="false" we should do something appropriate, perhaps as below: