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 pr...@apache.org on 2005/11/15 18:50:27 UTC
svn commit: r344401 - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp:
ArrayParamHeaderWriter.java literal/ParmHeaderFileWriter.java
Author: prestonf
Date: Tue Nov 15 09:50:18 2005
New Revision: 344401
URL: http://svn.apache.org/viewcvs?rev=344401&view=rev
Log:
Part of the fix for AXISCPP-149. This covers all of the complex types.
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java?rev=344401&r1=344400&r2=344401&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ArrayParamHeaderWriter.java Tue Nov 15 09:50:18 2005
@@ -220,8 +220,8 @@
{
try
{
- writer.write("\t\tvoid set(" + attribs[0].getTypeName() + "** array, const int size);\n");
- writer.write("\t\tconst "+ attribs[0].getTypeName() + "** get(int & size) const;\n");
+ writer.write("\t\tvoid set( class " + attribs[0].getTypeName() + "** array, const int size);\n");
+ writer.write("\t\tconst class "+ attribs[0].getTypeName() + "** get(int & size) const;\n");
writer.write("\t\tvoid clone(" + classname + " & original);\n");
writer.write("\t\tvoid clear();\n");
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java?rev=344401&r1=344400&r2=344401&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java Tue Nov 15 09:50:18 2005
@@ -262,22 +262,33 @@
attribs[i].setParamName( CUtils.sanitiseAttributeName( classname, attribs[i].getParamName()));
// FJP Nillable vv
- if (isElementNillable(i) || attribs[i].isArray()) {
+ if (isElementNillable(i) || attribs[i].isArray()) {
if(attribs[i].isAnyType()){
anyCounter += 1;
- writer
+ writer
.write("\t"
+ getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
+ " * " + attribs[i].getParamName()
+ Integer.toString(anyCounter)
+ ";\n");
-
}
else{
- writer.write("\t"
- + getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
- + " * " + attribs[i].getParamName()
- + ";\n");
+ if( attribs[i].isArray())
+ {
+ writer.write("\tclass "
+ + getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
+ + " * " + attribs[i].getParamName()
+ + ";\n");
+
+ }
+ else
+ {
+ writer.write("\t"
+ + getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
+ + " * " + attribs[i].getParamName()
+ + ";\n");
+
+ }
}
} else {
// FJP Nillable ^^