axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nadira...@apache.org
Subject svn commit: r687916 [2/2] - in /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws: ./ c/ c/literal/ cpp/ cpp/literal/ info/
Date Fri, 22 Aug 2008 00:58:14 GMT
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=687916&r1=687915&r2=687916&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
Thu Aug 21 17:58:14 2008
@@ -316,12 +316,12 @@
             }
             else
             {
-                String initValue = CUtils.getInitValue (outparamType);
+                String initValue = CUtils.getInitValueForType (outparamType);
                 if (initValue != null)
                     writer.write (outparamType + " Ret = " + initValue + ";\n");
-                else if (CUtils.getXSDEnumerator( outparamType).equals("XSD_DATETIME")
-                        || CUtils.getXSDEnumerator( outparamType).equals("XSD_DATE")
-                        || CUtils.getXSDEnumerator( outparamType).equals("XSD_TIME"))
+                else if (CUtils.getXSDEnumeratorForType( outparamType).equals("XSD_DATETIME")
+                        || CUtils.getXSDEnumeratorForType( outparamType).equals("XSD_DATE")
+                        || CUtils.getXSDEnumeratorForType( outparamType).equals("XSD_TIME"))
                 {
                     writer.write (outparamType + " Ret;\n");
                     writer.write ("\tmemset(&Ret,0,sizeof(" + outparamType + "));\n");
@@ -416,7 +416,7 @@
                     containedType = CUtils.getSimpleType(qname);
                     writer.write("\t\tm_pCall->addBasicArrayParameter( ");
                     writer.write("Value" + i + ", "
-                            + CUtils.getXSDEnumerator(containedType)
+                            + CUtils.getXSDEnumeratorForType(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.getXSDEnumerator(paramTypeName));
+                            + CUtils.getXSDEnumeratorForType(paramTypeName));
                 }
                 else
                 {
                     writer.write("\t\tm_pCall->addParameter( ");
                     writer.write("(void *) &Value" + i + ", \""
                             + ((ParameterInfo) paramsB.get(i)).getParamNameAsSOAPString()
+ "\", "
-                            + CUtils.getXSDEnumerator(paramTypeName));
+                            + CUtils.getXSDEnumeratorForType(paramTypeName));
                 }
             }
             else
@@ -515,7 +515,7 @@
                     if (CUtils.isSimpleType(qname))
                     {
                         containedType = CUtils.getSimpleType(qname);
-                        writer.write("\n\t\t\tAxis_Array * pReturn" + i + " = m_pCall->getBasicArray(
" + CUtils.getXSDEnumerator (containedType) 
+                        writer.write("\n\t\t\tAxis_Array * pReturn" + i + " = m_pCall->getBasicArray(
" + CUtils.getXSDEnumeratorForType (containedType) 
                                 + ",\"" + paramTagName
                                 + "\", 0);\n\n");
                         writer.write("\t\t\tif( pReturn" + i + " != NULL && OutValue"
+ i + " != NULL)\n");
@@ -598,7 +598,7 @@
                         writer.write( "\t\t\t}\n");
                         writer.write( "\n");
                         writer.write( "\t\t\tAxis::AxisDelete( (void *) pReturn" + i + ",
" 
-                                + CUtils.getXSDEnumerator( currentParaType) + ");\n");
+                                + CUtils.getXSDEnumeratorForType( currentParaType) + ");\n");
                     }
                     else 
                     {
@@ -615,7 +615,7 @@
                         writer.write( "\t\t\t}\n");
                         writer.write( "\n");
                         writer.write( "\t\t\tAxis::AxisDelete( (void *) pReturn" + i + ",
" 
-                                + CUtils.getXSDEnumerator( currentParaType) + ");\n");
+                                + CUtils.getXSDEnumeratorForType( currentParaType) + ");\n");
                     }
                 }
                 else
@@ -647,7 +647,7 @@
             {
                 containedType = CUtils.getSimpleType(qname);
                 writer.write("\t\t\t\tAxis_Array * RetAxisArray = m_pCall->getBasicArray(
"
-                        + CUtils.getXSDEnumerator(containedType) + ",\""
+                        + CUtils.getXSDEnumeratorForType(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");
@@ -683,7 +683,7 @@
                 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.getXSDEnumerator(
outparamType) + ");\n");
+                writer.write ("\t\t\t\t\tAxis::AxisDelete( (void *) pReturn, " + CUtils.getXSDEnumeratorForType(
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/WrapWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java?rev=687916&r1=687915&r2=687916&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 Thu
Aug 21 17:58:14 2008
@@ -335,7 +335,7 @@
             			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.getXSDEnumerator(paraTypeName)
+ ");\n");
+            			writer.write("\t\tAxis::AxisDelete( (void *) value" + i + ", " + CUtils.getXSDEnumeratorForType(paraTypeName)
+ ");\n");
             			writer.write("\t}\n");
         			}
             		else
@@ -353,7 +353,7 @@
             			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.getXSDEnumerator(paraTypeName)
+ ");\n");
+            			writer.write("\t\tAxis::AxisDelete( (void *) pValue" + i + ", " + CUtils.getXSDEnumeratorForType(paraTypeName)
+ ");\n");
             			writer.write("\t}\n");
             		}
             	}
@@ -374,13 +374,13 @@
             			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.getXSDEnumerator(paraTypeName)
+ ");\n");
+            			writer.write("\t\tAxis::AxisDelete( (void *) value" + i + ", " + CUtils.getXSDEnumeratorForType(paraTypeName)
+ ");\n");
             			writer.write("\t}\n");
             		}
             		else
             		{
             		    writer.write("\n\t" + paraTypeName + " v" + i);
-                        String typeInitValue = CUtils.getInitValue(paraTypeName);
+                        String typeInitValue = CUtils.getInitValueForType(paraTypeName);
             		    if (typeInitValue != null)
             		        writer.write(" = " + typeInitValue);
 
@@ -396,7 +396,7 @@
 	            		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.getXSDEnumerator(paraTypeName)
+ " );\n");
+	            		writer.write("\t\tAxis::AxisDelete( (void *) pValue" + i + ", " + CUtils.getXSDEnumeratorForType(paraTypeName)
+ " );\n");
 	            		writer.write("\t}\n");
             		}
             	}
@@ -420,7 +420,7 @@
                                 + "Axis_Array * RetArray"
                                 + i
                                 + " = pIWSDZ->getBasicArray("
-                                + CUtils.getXSDEnumerator(containedType)
+                                + CUtils.getXSDEnumeratorForType(containedType)
                                 + ", \""
                                 + parameterName
                                 + "\",0);\n");
@@ -527,7 +527,7 @@
     	                    "\t\treturn pIWSSZ->addOutputParam(\""
     	                        + methodName
     	                        + "Return\", (void*)ret, "
-    	                        + CUtils.getXSDEnumerator(outparamTypeName)
+    	                        + CUtils.getXSDEnumeratorForType(outparamTypeName)
     	                        + ");\n");
             	}
             	else
@@ -536,7 +536,7 @@
 	                    "\t\treturn pIWSSZ->addOutputParam(\""
 	                        + methodName
 	                        + "Return\", (void*)&ret, "
-	                        + CUtils.getXSDEnumerator(outparamTypeName)
+	                        + CUtils.getXSDEnumeratorForType(outparamTypeName)
 	                        + ");\n");
             	}
             }
@@ -550,7 +550,7 @@
                         containedType = CUtils.getSimpleType(qname);
                         writer.write(
                             "\t\tnStatus = pIWSSZ->addOutputBasicArrayParam(ret,"
-                                + CUtils.getXSDEnumerator(containedType)
+                                + CUtils.getXSDEnumeratorForType(containedType)
                                 + ", \""
                                 + methodName
                                 + "Return\");\n");
@@ -647,7 +647,7 @@
                                         + "\", (void*)out"
                                         + i
                                         + ", "
-                                        + CUtils.getXSDEnumerator(outparamType)
+                                        + CUtils.getXSDEnumeratorForType(outparamType)
                                         + ");\n");
                     		if (param.isOptional())
                     		{
@@ -662,7 +662,7 @@
                                         + "\", (void*)&out"
                                         + i
                                         + ", "
-                                        + CUtils.getXSDEnumerator(outparamType)
+                                        + CUtils.getXSDEnumeratorForType(outparamType)
                                         + ");\n");
                     	}
                     }
@@ -679,7 +679,7 @@
                                     "\t\tpIWSSZ->addOutputBasicArrayParam((Axis_Array*)(&out"
                                         + i
                                         + "),"
-                                        + CUtils.getXSDEnumerator(
+                                        + CUtils.getXSDEnumeratorForType(
                                             containedType)
                                         + ", \""
                                         + returnParamName

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=687916&r1=687915&r2=687916&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 Aug 21 17:58:14 2008
@@ -307,12 +307,12 @@
                 writer.write (outparamType + "* Ret = NULL;\n");
             else
             {
-                String initValue = CUtils.getInitValue (outparamType);
+                String initValue = CUtils.getInitValueForType (outparamType);
                 if (initValue != null)
                     writer.write (outparamType + " Ret = " + initValue + ";\n");
-                else if (CUtils.getXSDEnumerator( outparamType).equals("XSD_DATETIME")
-                        || CUtils.getXSDEnumerator( outparamType).equals("XSD_DATE")
-                        || CUtils.getXSDEnumerator( outparamType).equals("XSD_TIME"))
+                else if (CUtils.getXSDEnumeratorForType( outparamType).equals("XSD_DATETIME")
+                        || CUtils.getXSDEnumeratorForType( outparamType).equals("XSD_DATE")
+                        || CUtils.getXSDEnumeratorForType( outparamType).equals("XSD_TIME"))
                 {
                     writer.write (outparamType + " Ret;\n");
                     writer.write ("\tmemset(&Ret,0,sizeof(" + outparamType + "));\n");
@@ -495,14 +495,14 @@
                         String containedType = CUtils.getSimpleType (qname);
                         writer.write (tab2 + "\t\tm_pCall->addBasicArrayParameter(");
                         writer.write ("Value" + i + ", " +
-                              CUtils.getXSDEnumerator(containedType) + ", cPrefixAndParamName"
+ i);
+                              CUtils.getXSDEnumeratorForType(containedType) + ", cPrefixAndParamName"
+ i);
                     }
                     else if (arrayType != null && arrayType.isSimpleType ())
                     {
                         String containedType = CUtils.getSimpleType (arrayType.getBaseType
());
                         writer.write (tab2 + "\t\tm_pCall->addBasicArrayParameter(");
                         writer.write ("Value" + i + ", " +
-                                  CUtils.getXSDEnumerator(containedType) +
+                                  CUtils.getXSDEnumeratorForType(containedType) +
                                   ", cPrefixAndParamName" + i);
                     }
                     else
@@ -529,13 +529,13 @@
                     {
                         writer.write (tab2 + "\t\tm_pCall->addParameter(");
                         writer.write ("(void*)Value" + i + ", cPrefixAndParamName" + i
-                                  + ", " + CUtils.getXSDEnumerator(paramTypeName));
+                                  + ", " + CUtils.getXSDEnumeratorForType(paramTypeName));
                     }
                     else
                     {
                         writer.write (tab2 + "\t\tm_pCall->addParameter(");
                         writer.write ("(void*)&Value" + i + ", cPrefixAndParamName" +
i
-                                  + ", " + CUtils.getXSDEnumerator(paramTypeName));
+                                  + ", " + CUtils.getXSDEnumeratorForType(paramTypeName));
                     }
                 }
                 else
@@ -650,7 +650,7 @@
                     {
                         containedType = CUtils.getSimpleType (qname);
         
-                        writer.write("\n\t\t\t\tAxis_Array * pReturn" + i + " = m_pCall->getBasicArray("
+ CUtils.getXSDEnumerator (containedType) 
+                        writer.write("\n\t\t\t\tAxis_Array * pReturn" + i + " = m_pCall->getBasicArray("
+ CUtils.getXSDEnumeratorForType (containedType) 
                             + ", \"" + currentType.getParamNameAsSOAPString ()
                             + "\", 0);\n\n");
                         writer.write("\t\t\t\tif( pReturn" + i + " != NULL && OutValue"
+ i + " != NULL)\n");
@@ -735,7 +735,7 @@
                         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.getXSDEnumerator( baseTypeName) + ");\n");
+                        writer.write( "\t\t\t\tAxis::AxisDelete( (void *) pReturn" + i +
", " + CUtils.getXSDEnumeratorForType( baseTypeName) + ");\n");
                     }
                     else 
                     {
@@ -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.getXSDEnumerator( baseTypeName) + ");\n");
+                        writer.write( "\t\t\t\tAxis::AxisDelete( (void *) pReturn" + i +
", " + CUtils.getXSDEnumeratorForType( baseTypeName) + ");\n");
                     }
                 }
                 else if (currentType.isAnyType ())
@@ -800,7 +800,7 @@
             {
                 containedType = CUtils.getSimpleType (qname);
                 writer.write ("\t\t\t\tAxis_Array * RetAxisArray = m_pCall->getBasicArray("

-                        + CUtils.getXSDEnumerator (containedType) 
+                        + CUtils.getXSDEnumeratorForType (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");
@@ -836,7 +836,7 @@
                 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.getXSDEnumerator(
outparamType) + ");\n");
+                writer.write ("\t\t\t\t\tAxis::AxisDelete( (void *) pReturn, " + CUtils.getXSDEnumeratorForType(
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/literal/WrapWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java?rev=687916&r1=687915&r2=687916&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java
(original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java
Thu Aug 21 17:58:14 2008
@@ -181,7 +181,7 @@
                     writer.write("\n\t" + containedType + "_Array * v" + i +" = new " + containedType
+ "_Array();\n");
                     writer.write("\t"
                             + "Axis_Array * RetArray" + i + " = pIWSDZ->getBasicArray("
-                            + CUtils.getXSDEnumerator(containedType)
+                            + CUtils.getXSDEnumeratorForType(containedType)
                             + ", \"" + elementName + "\",0);\n");
                     writer.write ("\tv" + i + "->clone(*RetArray"+ i + ");\n");
                     writer.write ("\tAxis::AxisDelete( (void *)RetArray" + i + ", XSD_ARRAY);\n\n");
@@ -202,7 +202,7 @@
                     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.getXSDEnumerator(paraTypeName)
+ " );\n");
+                    writer.write("\t\tAxis::AxisDelete( (void *) value" + i + ", " + CUtils.getXSDEnumeratorForType(paraTypeName)
+ " );\n");
                     writer.write("\t}\n");
                     if (param.isOptional())
                         writer.write("\t}\n");
@@ -223,7 +223,7 @@
                     writer.write("\t{\n");
                     writer.write("\t\tv" + i + " = new " + paraTypeName + "();\n");
                     writer.write("\t\t*v" + i + " = *pValue" + i + ";\n");
-                    writer.write("\t\tAxis::AxisDelete( (void *) pValue" + i + ", " + CUtils.getXSDEnumerator(paraTypeName)
+ ");\n");
+                    writer.write("\t\tAxis::AxisDelete( (void *) pValue" + i + ", " + CUtils.getXSDEnumeratorForType(paraTypeName)
+ ");\n");
                     writer.write("\t}\n");
                     if (param.isOptional())
                         writer.write("\t}\n");
@@ -231,7 +231,7 @@
                 else
                 {
                     writer.write("\n\t" + paraTypeName + " v" + i);
-                    String typeInitValue = CUtils.getInitValue(paraTypeName);
+                    String typeInitValue = CUtils.getInitValueForType(paraTypeName);
                     if (typeInitValue != null)
                         writer.write(" = " + typeInitValue);
 
@@ -244,7 +244,7 @@
                     writer.write("\t{\n");
                     writer.write("\t\tv" + i + " = *pValue" + i + ";\n");
                     writer.write("\t\tAxis::AxisDelete( (void *) pValue"
-                            + i + ", " + CUtils.getXSDEnumerator(paraTypeName)+ ");\n");
+                            + i + ", " + CUtils.getXSDEnumeratorForType(paraTypeName)+ ");\n");
                     writer.write("\t}\n");
                 }
             }
@@ -259,7 +259,7 @@
                     writer.write("\n\t" + outparamType + "_Array * v" + i +" = new " + outparamType
+ "_Array();\n");
                     writer.write("\t"
                         + "Axis_Array * RetArray" + i + " = pIWSDZ->getBasicArray("
-                        + CUtils.getXSDEnumerator(containedType)
+                        + CUtils.getXSDEnumeratorForType(containedType)
                         + ", \"" + elementName + "\",0);\n");
                     writer.write ("\tv" + i + "->clone(*RetArray"+ i + ");\n");
                     writer.write ("\tAxis::AxisDelete( (void *)RetArray" + i + ", XSD_ARRAY);\n\n");
@@ -270,7 +270,7 @@
                     writer.write("\n\t" + outparamType + " * v" + i +" = new " + outparamType
+ "();\n");
                     writer.write("\t"
                         + "Axis_Array * RetArray" + i + " = pIWSDZ->getBasicArray("
-                        + CUtils.getXSDEnumerator(containedType)
+                        + CUtils.getXSDEnumeratorForType(containedType)
                         + ", \"" + elementName + "\",0);\n");
                     writer.write ("\tv" + i + "->clone(*RetArray"+ i + ");\n");
                     writer.write ("\tAxis::AxisDelete( (void *)RetArray" + i + ", XSD_ARRAY);\n\n");
@@ -356,7 +356,7 @@
                 {
                     String containedType = CUtils.getSimpleType(retType.getName());
                     writer.write("\t\tnStatus = pIWSSZ->addOutputBasicArrayParam(ret,
"
-                            + CUtils.getXSDEnumerator(containedType) + ", \""
+                            + CUtils.getXSDEnumeratorForType(containedType) + ", \""
                             + returnParamName + "\");\n");
                     writer.write("\t\tdelete ret;\n");
                     writer.write("\t\treturn nStatus;\n");
@@ -369,12 +369,12 @@
                             || CUtils.isPointerType(returnParamTypeName))
                     {
                         writer.write("\t\treturn pIWSSZ->addOutputParam(\"" + returnParamName
-                            + "\", (void*)ret, " + CUtils.getXSDEnumerator(outparamType)
+ ");\n");
+                            + "\", (void*)ret, " + CUtils.getXSDEnumeratorForType(outparamType)
+ ");\n");
                     }
                     else
                     {
                         writer.write("\t\treturn pIWSSZ->addOutputParam(\"" + returnParamName
-                            + "\", (void*)&ret, " + CUtils.getXSDEnumerator(outparamType)
+ ");\n");
+                            + "\", (void*)&ret, " + CUtils.getXSDEnumeratorForType(outparamType)
+ ");\n");
                     }
                 }
             }
@@ -387,7 +387,7 @@
                 {
                     containedType = CUtils.getSimpleType(qname);
                     writer.write("\t\tnStatus = pIWSSZ->addOutputBasicArrayParam(ret,
"
-                                + CUtils.getXSDEnumerator(containedType)
+                                + CUtils.getXSDEnumeratorForType(containedType)
                                 + ", \"" + returnParamName + "\");\n");
                     writer.write("\t\tdelete ret;\n");
                     writer.write("\t\treturn nStatus;\n");
@@ -396,7 +396,7 @@
                 {
                     containedType = CUtils.getSimpleType(arrayType.getBaseType());
                     writer.write("\t\tnStatus = pIWSSZ->addOutputBasicArrayParam(ret,
"
-                            + CUtils.getXSDEnumerator(containedType)
+                            + CUtils.getXSDEnumeratorForType(containedType)
                             + ", \"" + returnParamName + "\");\n");
                     writer.write("\t\tdelete ret;\n");
                     writer.write("\t\treturn nStatus;\n");
@@ -472,7 +472,7 @@
                     {
                         String containedType = CUtils.getSimpleType(retType.getName());
                         writer.write("\treturn pIWSSZ->addOutputBasicArrayParam((Axis_Array*)(&out"
+ i + "),"
-                                + CUtils.getXSDEnumerator(containedType)
+                                + CUtils.getXSDEnumeratorForType(containedType)
                                 + ", \"" + returnParamName + "\");\n");
                     }
                     else if (CUtils.isPointerType(outparamType) 
@@ -489,7 +489,7 @@
                         writer.write("\tpIWSSZ->addOutputParam(\""
                                     + returnParamName
                                     + "\", (void*)out" + i + ", "
-                                    + CUtils.getXSDEnumerator(outparamType) + ");\n");
+                                    + CUtils.getXSDEnumeratorForType(outparamType) + ");\n");
                         
                         if (param.isOptional())
                             writer.write("\t}\n");
@@ -499,7 +499,7 @@
                         writer.write("\tpIWSSZ->addOutputParam(\""
                                     + returnParamName
                                     + "\", (void*)&out" + i + ", "
-                                    + CUtils.getXSDEnumerator(outparamType) + ");\n");
+                                    + CUtils.getXSDEnumeratorForType(outparamType) + ");\n");
                     }
                 }
                 else if (returntypeisarray)
@@ -512,14 +512,14 @@
                     {
                         containedType = CUtils.getSimpleType(qname);
                         writer.write("\tpIWSSZ->addOutputBasicArrayParam((Axis_Array*)(&out"
-                                + i + ")," + CUtils.getXSDEnumerator( containedType)
+                                + i + ")," + CUtils.getXSDEnumeratorForType( containedType)
                                 + ", \"" + returnParamName + "\");\n");
                     }
                     else if (arrayType.isSimpleType())
                     {
                         containedType = CUtils.getSimpleType(arrayType.getBaseType());
                         writer.write("\tpIWSSZ->addOutputBasicArrayParam((Axis_Array*)(&out"
-                                + i + ")," + CUtils.getXSDEnumerator(containedType)
+                                + i + ")," + CUtils.getXSDEnumeratorForType(containedType)
                                 + ", \"" + returnParamName + "\");\n");
                     }
                     else

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WSDLInfo.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WSDLInfo.java?rev=687916&r1=687915&r2=687916&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WSDLInfo.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WSDLInfo.java Thu
Aug 21 17:58:14 2008
@@ -856,7 +856,7 @@
                     primitiveBaseTypeQName = baseEType.getQName();
                 
                 classForPrimitiveType =  CUtils.getSimpleType(primitiveBaseTypeQName);
-                initValueForType      =  CUtils.getInitValue(classForPrimitiveType);
+                initValueForType      =  CUtils.getInitValueForType(classForPrimitiveType);
                 
                 // Set the base type for Type
                 typedata.setBaseType(primitiveBaseTypeQName);
@@ -871,54 +871,50 @@
                 // with the anonymous names, and once with the sanitized names. 
                 
                 boolean isPointerType = CUtils.isPointerType(primitiveBaseTypeQName);
-                primitiveXSDType = CUtils.getXSDEnumerator(classForPrimitiveType);
+                primitiveXSDType = CUtils.getXSDEnumeratorForType(classForPrimitiveType);
 
                 if (!isBaseTypePrimitive)
                 {
                     typedata.setRestrictionBaseType(baseTypeLocalpart);
                     if (isPointerType)
-                        CUtils.c_pointerBasedTypes.add(baseTypeLocalpart);
+                        CUtils.addPointerType(baseTypeLocalpart);
                 }
                 if (isPointerType)
-                    CUtils.c_pointerBasedTypes.add(typedataLocalpart);                  
 
+                    CUtils.addPointerType(typedataLocalpart);                    
 
-                methodSuffix = (String)CUtils.c_simpleTypeToMethodSuffixMapper.get(classForPrimitiveType);
-                CUtils.c_qnameToSimpleTypeMapper.put(typedataQName, class4qname);
-                CUtils.c_simpleTypeToQNameMapper.put(class4qname, typedataQName);
-                CUtils.c_simpleTypeToEnumMapper.put(typedataLocalpart, primitiveXSDType);
+                methodSuffix = (String)CUtils.getDeserializerMethodSuffixForType(classForPrimitiveType);
+                CUtils.addDeserializerMethodSuffixForType(typedataLocalpart, primitiveXSDType);
 
                 if (initValueForType != null)
-                    CUtils.c_initValueForSimpleType.put(typedataLocalpart, initValueForType);
-                CUtils.c_simpleTypeToMethodSuffixMapper.put(typedataLocalpart, methodSuffix);
+                    CUtils.addInitValueForType(typedataLocalpart, initValueForType);
+                CUtils.addDeserializerMethodSuffixForType(typedataLocalpart, methodSuffix);
                 
                 if (!isBaseTypePrimitive)
                 {
-                    CUtils.c_simpleTypeToEnumMapper.put(baseTypeLocalpart, primitiveXSDType);
+                    CUtils. addXSDEnumeratorForType(baseTypeLocalpart, primitiveXSDType);
                     if (initValueForType != null)
-                        CUtils.c_initValueForSimpleType.put(baseTypeLocalpart, initValueForType);
-                    CUtils.c_simpleTypeToMethodSuffixMapper.put(baseTypeLocalpart, methodSuffix);
+                        CUtils.addInitValueForType(baseTypeLocalpart, initValueForType);
+                    CUtils.addDeserializerMethodSuffixForType(baseTypeLocalpart, methodSuffix);
                 }
 
                 if (typedataQNameSanitized != null)
                 {
                     if (isPointerType)
-                        CUtils.c_pointerBasedTypes.add(typedataLocalpartSanitized); 
-                    CUtils.c_qnameToSimpleTypeMapper.put(typedataQNameSanitized, class4qnameSanitized);
-                    CUtils.c_simpleTypeToQNameMapper.put(class4qnameSanitized, typedataQNameSanitized);
-                    CUtils.c_simpleTypeToEnumMapper.put(typedataLocalpartSanitized, primitiveXSDType);
+                        CUtils.addPointerType(typedataLocalpartSanitized); 
+                    CUtils. addXSDEnumeratorForType(typedataLocalpartSanitized, primitiveXSDType);
                     if (initValueForType != null)
-                        CUtils.c_initValueForSimpleType.put(typedataLocalpartSanitized, initValueForType);
-                    CUtils.c_simpleTypeToMethodSuffixMapper.put(typedataLocalpartSanitized,
methodSuffix);
+                        CUtils.addInitValueForType(typedataLocalpartSanitized, initValueForType);
+                    CUtils.addDeserializerMethodSuffixForType(typedataLocalpartSanitized,
methodSuffix);
                 }
                 
                 if (baseTypeLocalpartSanitized != null)
                 {
                     if (isPointerType)
-                        CUtils.c_pointerBasedTypes.add(baseTypeLocalpartSanitized);
-                    CUtils.c_simpleTypeToEnumMapper.put(baseTypeLocalpartSanitized, primitiveXSDType);
+                        CUtils.addPointerType(baseTypeLocalpartSanitized);
+                    CUtils. addXSDEnumeratorForType(baseTypeLocalpartSanitized, primitiveXSDType);
                     if (initValueForType != null)
-                        CUtils.c_initValueForSimpleType.put(baseTypeLocalpartSanitized, initValueForType);
-                    CUtils.c_simpleTypeToMethodSuffixMapper.put(baseTypeLocalpartSanitized,
methodSuffix);
+                        CUtils.addInitValueForType(baseTypeLocalpartSanitized, initValueForType);
+                    CUtils.addDeserializerMethodSuffixForType(baseTypeLocalpartSanitized,
methodSuffix);
                 }         
                 
                 // Process the enumeration elements underneath the restriction node



Mime
View raw message