axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sanj...@apache.org
Subject cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c ParamWriter.java
Date Thu, 01 Jan 2004 06:59:00 GMT
sanjaya     2003/12/31 22:59:00

  Modified:    c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c Tag:
                        CWrapperSupport ParamWriter.java
  Log:
  1.changes to accomodate the signature changes of Type.getElementnames
  and Type.getAttributeNames
  2.changed the check for array/complex/simple types to use Cutils.isSimpleType in getCorrectParmNameConsideringArraysAndComplexTypes
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.2.4.4   +8 -6      ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamWriter.java
  
  Index: ParamWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParamWriter.java,v
  retrieving revision 1.2.4.3
  retrieving revision 1.2.4.4
  diff -u -r1.2.4.3 -r1.2.4.4
  --- ParamWriter.java	16 Dec 2003 10:36:19 -0000	1.2.4.3
  +++ ParamWriter.java	1 Jan 2004 06:59:00 -0000	1.2.4.4
  @@ -67,12 +67,14 @@
   import java.io.IOException;
   import java.util.ArrayList;
   import java.util.Enumeration;
  +import java.util.Iterator;
   
   import javax.xml.namespace.QName;
   
   import org.apache.axis.wsdl.wsdl2ws.WrapperFault;
   import org.apache.axis.wsdl.wsdl2ws.WrapperUtils;
   import org.apache.axis.wsdl.wsdl2ws.cpp.CPPUtils;
  +import org.apache.axis.wsdl.wsdl2ws.c.CUtils;
   import org.apache.axis.wsdl.wsdl2ws.info.Type;
   import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext;
   
  @@ -115,14 +117,14 @@
           ArrayList attribfeilds = new ArrayList();
   		ArrayList elementfeilds = new ArrayList();
   
  -        Enumeration names = type.getAttributeNames();
  -        while (names.hasMoreElements()){
  -			attribfeilds.add(names.nextElement());
  +        Iterator names = type.getAttributeNames();
  +        while (names.hasNext()){
  +			attribfeilds.add(names.next());
           }
           
   		names = type.getElementnames();
  -				while (names.hasMoreElements()){
  -					elementfeilds.add(names.nextElement());
  +				while (names.hasNext()){
  +					elementfeilds.add(names.next());
   		}
           
           
  @@ -178,7 +180,7 @@
    	protected String getCorrectParmNameConsideringArraysAndComplexTypes(QName name,String
classname)throws WrapperFault{
   		//System.out.println(name);
   		Type t = wscontext.getTypemap().getType(name);
  -		if(t !=null){ //array or complex types
  +		if(!CUtils.isSimpleType(name)){ //array or complex types
   			if (t.isArray()){
   				return t.getLanguageSpecificName();
   			}
  
  
  

Mime
View raw message