axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nadira...@apache.org
Subject svn commit: r501960 - /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
Date Wed, 31 Jan 2007 19:40:15 GMT
Author: nadiramra
Date: Wed Jan 31 11:40:14 2007
New Revision: 501960

URL: http://svn.apache.org/viewvc?view=rev&rev=501960
Log:
AXISCPP-796 "_string" instead of "string".

Modified:
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java

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?view=diff&rev=501960&r1=501959&r2=501960
==============================================================================
--- 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 Jan 31 11:40:14 2007
@@ -401,7 +401,7 @@
                     writer.write("Value" + i + ", "
                             + CUtils.getXSDTypeForBasicType(containedType)
                             + ", \""
-                            + ((ParameterInfo) paramsB.get(i)).getParamName()
+                            + ((ParameterInfo) paramsB.get(i)).getParamNameAsSOAPElement()
                             + "\"");
                 }
                 else
@@ -411,7 +411,7 @@
                     writer.write("Value" + i
                             + ",(void *) Axis_Serialize_" + containedType
                             + ",(void *) Axis_Delete_" + containedType
-                            + ",\"" + ((ParameterInfo) paramsB.get(i)).getParamName() + "\""
+                            + ",\"" + ((ParameterInfo) paramsB.get(i)).getParamNameAsSOAPElement()
+ "\""
                             + ",Axis_URI_" + containedType);
                 }
             }
@@ -422,14 +422,14 @@
                 {
                     writer.write("\t\tm_pCall->addParameter( ");
                     writer.write("(void *) Value" + i + ", \""
-                            + ((ParameterInfo) paramsB.get(i)).getParamName() + "\", "
+                            + ((ParameterInfo) paramsB.get(i)).getParamNameAsSOAPElement()
+ "\", "
                             + CUtils.getXSDTypeForBasicType(paramTypeName));
                 }
                 else
                 {
                     writer.write("\t\tm_pCall->addParameter( ");
                     writer.write("(void *) &Value" + i + ", \""
-                            + ((ParameterInfo) paramsB.get(i)).getParamName() + "\", "
+                            + ((ParameterInfo) paramsB.get(i)).getParamNameAsSOAPElement()
+ "\", "
                             + CUtils.getXSDTypeForBasicType(paramTypeName));
                 }
             }
@@ -440,7 +440,7 @@
                 writer.write("Value" + i 
                         + ",(void *) Axis_Serialize_" + paramTypeName 
                         + ",(void *) Axis_Delete_" + paramTypeName 
-                        + ",\"" + ((ParameterInfo) paramsB.get(i)).getParamName()
+                        + ",\""  + ((ParameterInfo) paramsB.get(i)).getParamNameAsSOAPElement()
                         + "\",Axis_URI_" + paramTypeName);
             }
 
@@ -460,13 +460,8 @@
         String paramTagName = "";
         
         if( returntype != null)
-        {
-            paramTagName = returntype.getParamName();
+            paramTagName = returntype.getParamNameAsSOAPElement();
 
-            if( paramTagName.charAt(0) == '_')
-                paramTagName = paramTagName.substring( 1);
-        }
-        
         if (isAllTreatedAsOutParams)
         {
             String currentParamName;
@@ -474,6 +469,8 @@
             for (int i = 0; i < paramsC.size(); i++)
             {
                 ParameterInfo currentType = (ParameterInfo) paramsC.get(i);
+                paramTagName = currentType.getParamNameAsSOAPElement();
+                    
                 type = wscontext.getTypemap().getType(currentType.getSchemaName());
                 if (type != null)
                 {
@@ -498,7 +495,7 @@
                     {
                         containedType = CUtils.getclass4qname(qname);
                         writer.write("\n\t\t\tAxis_Array * pReturn" + i + " = m_pCall->getBasicArray(
" + CUtils.getXSDTypeForBasicType (containedType) 
-                                + ",\"" + currentType.getParamName()
+                                + ",\"" + paramTagName
                                 + "\", 0);\n\n");
                         writer.write("\t\t\tif( pReturn" + i + " != NULL && OutValue"
+ i + " != NULL)\n");
                         writer.write("\t\t\t{\n");
@@ -555,7 +552,7 @@
                         
                         writer.write( "\t\t\t" + currentParaType + " pReturn" + i 
                                 + " = m_pCall->" + CUtils.getParameterGetValueMethodName(
currentParaType, false) 
-                                + "( \"" + currentType.getParamName() + "\", 0);\n");
+                                + "( \"" + paramTagName + "\", 0);\n");
                         writer.write( "\n");
                         writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue"
+ i + " != NULL)\n");
                         writer.write( "\t\t\t\t{\n");
@@ -586,7 +583,7 @@
                     {
                         writer.write( "\t\t\t" + currentParaType + " * pReturn" + i + " =
m_pCall->" 
                                + CUtils.getParameterGetValueMethodName( currentParaType,
false) 
-                               + "( \"" + currentType.getParamName() + "\", 0);\n");
+                                + "( \"" + paramTagName + "\", 0);\n");
                         writer.write( "\n");
                         writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue"
+ i + " != NULL)\n");
                         writer.write( "\t\t\t{\n");
@@ -607,7 +604,7 @@
                                     + " *) m_pCall->getCmplxObject( (void *) Axis_DeSerialize_"
+ currentParaType
                                     + ",(void *) Axis_Create_" + currentParaType
                                     + ",(void *) Axis_Delete_" + currentParaType
-                                    + ",\"" + currentType.getParamName() + "\",0);\n");
+                                    + ",\"" + paramTagName + "\",0);\n");
                 }
             } // end for-loop for paramsC
             



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message