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 pr...@apache.org on 2005/10/07 14:19:36 UTC
svn commit: r307098 -
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java
Author: prestonf
Date: Fri Oct 7 05:19:34 2005
New Revision: 307098
URL: http://svn.apache.org/viewcvs?rev=307098&view=rev
Log:
Part of the fix for AXISCPP-849 and AXIS-850
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java?rev=307098&r1=307097&r2=307098&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 Fri Oct 7 05:19:34 2005
@@ -155,21 +155,35 @@
if (i == 0) {
writer.write("\n");
}
+
+ String methodName = attribs[i].getParamNameWithoutSymbols();
+
+ if( methodName.endsWith( "_"))
+ {
+ String localMethodName = methodName.substring( 0, methodName.length() - 1);
+
+ if( localMethodName.equals( classname))
+ {
+ methodName = localMethodName;
+ }
+ }
+
if (isElementNillable(i)) {
if ( attribs[i].isAnyType()){
anyCounter += 1;
+
writer
.write("\t"
+ getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
+ " * get"
- + attribs[i].getParamNameWithoutSymbols()
+ + methodName
+ Integer.toString(anyCounter)
+ "();\n");
writer
.write("\t"
+ "void set"
- + attribs[i].getParamNameWithoutSymbols()
+ + methodName
+ Integer.toString(anyCounter)
+ "("
+ getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
@@ -180,13 +194,13 @@
.write("\t"
+ getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
+ " * get"
- + attribs[i].getParamNameWithoutSymbols()
+ + methodName
+ "();\n");
writer
.write("\t"
+ "void set"
- + attribs[i].getParamNameWithoutSymbols()
+ + methodName
+ "("
+ getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
+ " * pInValue);\n\n");
@@ -202,14 +216,14 @@
.write("\t"
+ getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
+ " get"
- + attribs[i].getParamNameWithoutSymbols()
+ + methodName
+ Integer.toString(anyCounter)
+ "();\n");
writer
.write("\t"
+ "void set"
- + attribs[i].getParamNameWithoutSymbols()
+ + methodName
+ Integer.toString(anyCounter)
+ "("
+ getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
@@ -227,7 +241,7 @@
.write("\t"
+ getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
+ " get"
- + attribs[i].getParamNameWithoutSymbols()
+ + methodName
+ "();\n");
/**
@@ -237,7 +251,7 @@
writer
.write("\t"
+ "void set"
- + attribs[i].getParamNameWithoutSymbols()
+ + methodName
+ "("
+ getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
+ " InValue);\n\n");