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 su...@apache.org on 2003/11/27 12:21:36 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c BeanParamWriter.java WrapWriter.java
susantha 2003/11/27 03:21:36
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c Tag:
Release-2003_10_26-bugfixes_branch
BeanParamWriter.java WrapWriter.java
Log:
Fixed few code generation bugs in the WSDL2Ws tool
Revision Changes Path
No revision
No revision
1.4.4.3 +1 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/Attic/BeanParamWriter.java
Index: BeanParamWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/Attic/BeanParamWriter.java,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -u -r1.4.4.2 -r1.4.4.3
--- BeanParamWriter.java 27 Nov 2003 11:05:46 -0000 1.4.4.2
+++ BeanParamWriter.java 27 Nov 2003 11:21:36 -0000 1.4.4.3
@@ -255,7 +255,7 @@
String containedType = null;
if (CPPUtils.isSimpleType(qname)){
containedType = CPPUtils.getclass4qname(qname);
- writer.write("\t\t\tdelete [] (("+containedType+"*)pTemp->"+attribs[i][0]+".m_Array);\n");
+ writer.write("\t\t\tdelete [] ("+containedType+"*)(pTemp->"+attribs[i][0]+".m_Array);\n");
}
else{
containedType = qname.getLocalPart();
1.9.2.4 +10 -10 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/WrapWriter.java
Index: WrapWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/WrapWriter.java,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -r1.9.2.3 -r1.9.2.4
--- WrapWriter.java 27 Nov 2003 11:05:46 -0000 1.9.2.3
+++ WrapWriter.java 27 Nov 2003 11:21:36 -0000 1.9.2.4
@@ -222,7 +222,7 @@
else{
outparamType = returntype.getLangName();
}
- returntypeissimple = CPPUtils.isSimpleType(outparamType);
+ returntypeissimple = CUtils.isSimpleType(outparamType);
}
//create and populate variables for each parameter
String paraTypeName;
@@ -241,7 +241,7 @@
for (int i = 0; i < paramsB.size(); i++) {
if (i>0) writer.write(",");
paraTypeName = ((ParameterInfo)paramsB.get(i)).getLangName();
- if((CPPUtils.isSimpleType(paraTypeName))){
+ if((CUtils.isSimpleType(paraTypeName))){
//for simple types
writer.write(paraTypeName);
}else if((type = this.wscontext.getTypemap().getType(((ParameterInfo)paramsB.get(i)).getSchemaName())) != null && type.isArray()){
@@ -265,14 +265,14 @@
writer.write("\tpIWSSZ->createSoapMethod(\""+methodName+"Response\", pIWSSZ->getNewNamespacePrefix(), \""+wscontext.getWrapInfo().getTargetNameSpaceOfWSDL()+"\");\n");
for (int i = 0; i < paramsB.size(); i++) {
paraTypeName = ((ParameterInfo)paramsB.get(i)).getLangName();
- if((CPPUtils.isSimpleType(((ParameterInfo)paramsB.get(i)).getLangName()))){
+ if((CUtils.isSimpleType(((ParameterInfo)paramsB.get(i)).getLangName()))){
//for simple types
writer.write("\t"+paraTypeName+" v"+i+" = pIWSDZ->"+CPPUtils.getParameterGetValueMethodName(paraTypeName)+"();\n");
}else if((type = this.wscontext.getTypemap().getType(((ParameterInfo)paramsB.get(i)).getSchemaName())) != null && type.isArray()){
QName qname = type.getTypNameForAttribName("item");
String containedType = null;
- if (CPPUtils.isSimpleType(qname)){
- containedType = CPPUtils.getclass4qname(qname);
+ if (CUtils.isSimpleType(qname)){
+ containedType = CUtils.getclass4qname(qname);
writer.write("\t"+paraTypeName+" v"+i+";\n");
writer.write("\tv"+i+".m_Size = pIWSDZ->GetArraySize();\n");
writer.write("\tif (v"+i+".m_Size < 1) return AXIS_FAIL;\n");
@@ -296,13 +296,13 @@
writer.write("\tif (AXIS_SUCCESS != pIWSDZ->GetStatus())\n\t{\n");
for (int i = 0; i < paramsB.size(); i++) {
paraTypeName = ((ParameterInfo)paramsB.get(i)).getLangName();
- if((CPPUtils.isSimpleType(((ParameterInfo)paramsB.get(i)).getLangName()))){
+ if((CUtils.isSimpleType(((ParameterInfo)paramsB.get(i)).getLangName()))){
//for simple types nothing is done
}else if((type = this.wscontext.getTypemap().getType(((ParameterInfo)paramsB.get(i)).getSchemaName())) != null && type.isArray()){
QName qname = type.getTypNameForAttribName("item");
String containedType = null;
- if (CPPUtils.isSimpleType(qname)){ //array of simple types
- containedType = CPPUtils.getclass4qname(qname);
+ if (CUtils.isSimpleType(qname)){ //array of simple types
+ containedType = CUtils.getclass4qname(qname);
writer.write("\t\tdelete [] v"+i+".m_Array;\n");
}
else{
@@ -333,8 +333,8 @@
}else if(returntypeisarray){
QName qname = retType.getTypNameForAttribName("item");
String containedType = null;
- if (CPPUtils.isSimpleType(qname)){
- containedType = CPPUtils.getclass4qname(qname);
+ if (CUtils.isSimpleType(qname)){
+ containedType = CUtils.getclass4qname(qname);
writer.write("\treturn pIWSSZ->AddOutputParam(\""+methodName+"Return\", (Axis_Array*)(&ret),"+CPPUtils.getXSDTypeForBasicType(containedType)+");\n");
}
else{