axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info ParameterInfo.java Type.java
Date Fri, 27 Aug 2004 00:22:40 GMT
samisa      2004/08/26 17:22:40

  Modified:    c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
                        ClientStubWriter.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
                        ClientStubWriter.java
               c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info
                        ParameterInfo.java Type.java
  Log:
  Fixed the ANON_TOKEN probelm appearing in case of complex arrays
  
  Revision  Changes    Path
  1.51      +1 -1      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
  
  Index: ClientStubWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- ClientStubWriter.java	16 Aug 2004 09:22:50 -0000	1.50
  +++ ClientStubWriter.java	27 Aug 2004 00:22:40 -0000	1.51
  @@ -322,7 +322,7 @@
   						writer.write("\t\t\t\t" + currentParamName + " = ("+currentParaType+"&)m_pCall->getBasicArray("+CUtils.getXSDTypeForBasicType(containedType)+",
\""+currentType.getParamName()+"\", 0);\n");
   					}
   					else{
  -						containedType = qname.getLocalPart();
  +						//containedType = qname.getLocalPart();
   						writer.write("\t\t\t\t" + currentParamName + " = ("+currentParaType+"&)m_pCall->getCmplxArray((void*)
Axis_DeSerialize_"+containedType);
   						writer.write("\t\t\t\t, (void*) Axis_Create_"+containedType+", (void*) Axis_Delete_"+containedType+",
(void*) Axis_GetSize_"+containedType+", \""+currentType.getParamName()+"\", Axis_URI_"+containedType+");\n");
   					}
  
  
  
  1.40      +4 -2      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
  
  Index: ClientStubWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- ClientStubWriter.java	24 Aug 2004 14:53:44 -0000	1.39
  +++ ClientStubWriter.java	27 Aug 2004 00:22:40 -0000	1.40
  @@ -476,7 +476,8 @@
   					else{
   						containedType = qname.getLocalPart();
   						writer.write("\t\t\t" + currentParamName + " = ("+currentParaType+"&)m_pCall->getCmplxArray((void*)
Axis_DeSerialize_"+containedType);
  -						writer.write(", (void*) Axis_Create_"+containedType+", (void*) Axis_Delete_"+containedType+",
(void*) Axis_GetSize_"+containedType+", \""+currentType.getElementName().getLocalPart()+"\",
Axis_URI_"+containedType+");\n");
  +						//writer.write(", (void*) Axis_Create_"+containedType+", (void*) Axis_Delete_"+containedType+",
(void*) Axis_GetSize_"+containedType+", \""+currentType.getElementName().getLocalPart()+"\",
Axis_URI_"+containedType+");\n");
  +						writer.write(", (void*) Axis_Create_"+containedType+", (void*) Axis_Delete_"+containedType+",
(void*) Axis_GetSize_"+containedType+", \""+currentType.getElementNameAsString()+"\", Axis_URI_"+containedType+");\n");
   					}
   				}
   				else if(typeissimple){
  @@ -509,7 +510,8 @@
   			else{
   				containedType = qname.getLocalPart();
   				writer.write("\tRetArray = ("+outparamType+"&)m_pCall->getCmplxArray((void*)
Axis_DeSerialize_"+containedType);
  -				writer.write(", (void*) Axis_Create_"+containedType+", (void*) Axis_Delete_"+containedType+",
(void*) Axis_GetSize_"+containedType+", \""+returntype.getElementName().getLocalPart()+"\",
Axis_URI_"+containedType+");\n\t\t}\n");
  +				//writer.write(", (void*) Axis_Create_"+containedType+", (void*) Axis_Delete_"+containedType+",
(void*) Axis_GetSize_"+containedType+", \""+returntype.getElementName().getLocalPart()+"\",
Axis_URI_"+containedType+");\n\t\t}\n");
  +				writer.write(", (void*) Axis_Create_"+containedType+", (void*) Axis_Delete_"+containedType+",
(void*) Axis_GetSize_"+containedType+", \""+returntype.getElementNameAsString()+"\", Axis_URI_"+containedType+");\n\t\t}\n");
   			}
   			writer.write("\t}\n\tm_pCall->unInitialize();\n");
   			writer.write("\treturn RetArray;\n");
  
  
  
  1.10      +9 -0      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java
  
  Index: ParameterInfo.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ParameterInfo.java	23 Aug 2004 00:45:31 -0000	1.9
  +++ ParameterInfo.java	27 Aug 2004 00:22:40 -0000	1.10
  @@ -45,6 +45,15 @@
   		// TODO: design review needed
   		// 		- If type and name are equals add "_Ref" ie : ref="..."
   		String result;
  +
  +                if (attribName.lastIndexOf(SymbolTable.ANON_TOKEN) > 1 )
  +                {
  +                    attribName =attribName.substring(attribName.lastIndexOf(SymbolTable.ANON_TOKEN)+1,attribName.length());
  +                }
  +                // Samisa: This second call to TypeMap.resoleveWSDL2LanguageNameClashes
  +                // is made to make sure after replacinf ANON_TOKEN it is still not a keyword
  +                attribName = TypeMap.resoleveWSDL2LanguageNameClashes(attribName, WrapperConstants.LANGUAGE_CPP);
  +
   		if (isReference())
   			result = attribName + "_Ref";
   		else
  
  
  
  1.22      +14 -0     ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/Type.java
  
  Index: Type.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/Type.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Type.java	20 Aug 2004 13:03:39 -0000	1.21
  +++ Type.java	27 Aug 2004 00:22:40 -0000	1.22
  @@ -144,6 +144,20 @@
       }
   
       /**
  +     * @return String 
  +     */
  +    public String getLocalPartOfName() {
  +        String attribName = name.getLocalPart();
  +        if (attribName.lastIndexOf(SymbolTable.ANON_TOKEN) > 1 )
  +        {
  +            attribName =attribName.substring(attribName.lastIndexOf(SymbolTable.ANON_TOKEN)+1,attribName.length());
  +        }
  +        attribName = TypeMap.resoleveWSDL2LanguageNameClashes(attribName,this.language);
  +
  +        return attribName;
  +    }
  +
  +    /**
        * Sets the name.
        * @param name The name to set
        */
  
  
  

Mime
View raw message