ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info Type.java
Date Tue, 03 Aug 2004 03:21:42 GMT
damitha     2004/08/02 20:21:42

  Modified:    c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info Type.java
  Log:
  Fixed the Latest jars problem for complex type
  
  Revision  Changes    Path
  1.14      +10 -6     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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Type.java	9 Apr 2004 08:49:34 -0000	1.13
  +++ Type.java	3 Aug 2004 03:21:42 -0000	1.14
  @@ -111,6 +111,7 @@
           else{
           	//remove any funny Charactors
   			this.languageSpecificName = this.languageSpecificName.replaceAll("/","_");  
  +
   			this.languageSpecificName = this.languageSpecificName.replaceAll(":","_");
   			// JBY : add this one more clean?
   			// This arrived in case of inner type declaration. And for compilation
  @@ -175,6 +176,10 @@
    */
   	public void setTypeNameForElementName(ElementInfo element) {
   		String attribName = TypeMap.resoleveWSDL2LanguageNameClashes(element.getName().getLocalPart(),this.language);
  +		if (attribName.lastIndexOf('>') > 1 )
  +            	{
  + 		    attribName =attribName.substring(attribName.lastIndexOf('>')+1,attribName.length());

  +		}                		
   		if (hasOrder)
   			this.attribOrder.add(attribName);
   		this.elements.put(attribName, element);
  @@ -182,10 +187,9 @@
   	}
   
   	public ElementInfo getElementForElementName(String attribName) {
  -		return (ElementInfo) this.elements.get(attribName);
  +	       return (ElementInfo) this.elements.get(attribName);
   	}
   
  -
       public void setAttribOrder(Vector order) {
           this.attribOrder = order;
       }
  @@ -281,7 +285,7 @@
        * @see java.lang.Object#toString()
        */
       public String toString() {
  -       String str = "---------"+this.name+"------------\n" +
       	"languageSpecificName
= " + this.languageSpecificName +"\n";
  +       String str = "---------"+this.name+"------------\n" +	"languageSpecificName = "
+ this.languageSpecificName +"\n";
          	if(enumerationdata != null){
   			str = str + "enumerationType = "+((TypeEntry)enumerationdata.get(0)).getQName()+"\n(";
   			for(int i = 1;i<enumerationdata.size();i++)	
  @@ -292,15 +296,15 @@
   	       	str = str + "Elements[\n";
   	       	Iterator c = elements.values().iterator();
   			while(c.hasNext())	
  -					str = str +","+ c.next()+"\n";
  -	       	str = str + "]\n";
  +			str = str +","+ c.next()+"\n";
  +         	       	str = str + "]\n";
   	       	
   			c = attributes.keySet().iterator();
   			str = str + "Attributes[\n";
   
   			while(c.hasNext()){	
   				String name = (String)c.next();
  -					str = str +",("+ name+","+attributes.get(name)+")";
  +				str = str +",("+ name+","+attributes.get(name)+")";
   			}		
   			str = str + "]\n";
   	       	
  
  
  

Mime
View raw message