Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 84387 invoked from network); 23 Dec 2006 05:38:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Dec 2006 05:38:09 -0000 Received: (qmail 87960 invoked by uid 500); 23 Dec 2006 05:38:16 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 87834 invoked by uid 500); 23 Dec 2006 05:38:16 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 87823 invoked by uid 99); 23 Dec 2006 05:38:16 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Dec 2006 21:38:16 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Dec 2006 21:38:08 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id C0BDC1A981A; Fri, 22 Dec 2006 21:37:17 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r489856 - in /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info: AttributeInfo.java ParameterInfo.java Date: Sat, 23 Dec 2006 05:37:17 -0000 To: axis-cvs@ws.apache.org From: nadiramra@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061223053717.C0BDC1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nadiramra Date: Fri Dec 22 21:37:16 2006 New Revision: 489856 URL: http://svn.apache.org/viewvc?view=rev&rev=489856 Log: code simplification Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/AttributeInfo.java webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/AttributeInfo.java URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/AttributeInfo.java?view=diff&rev=489856&r1=489855&r2=489856 ============================================================================== --- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/AttributeInfo.java (original) +++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/AttributeInfo.java Fri Dec 22 21:37:16 2006 @@ -37,7 +37,6 @@ private String typeName; private String typeNamespace; private String className; - private String attribNameAsMember; private String methodName; //this variable states whether the attribute is an xsd:choice @@ -62,7 +61,7 @@ str = str + "typeName = " + typeName + "\n"; str = str + "typeNamespace = " + typeNamespace + "\n"; str = str + "className =" + className + "\n"; - str = str + "attribNameAsMember =" + attribNameAsMember + "\n"; + str = str + "attribNameAsMember =" + getParamNameAsMember() + "\n"; str = str + "choiceElement = " + choiceElement + "\n"; str = str + "allElement =" + allElement + "\n"; str = str + "nsQualified =" + nsQualified + "\n"; @@ -166,25 +165,13 @@ // TODO - probably can remove since we sanitize attribute name. public String getParamNameAsMember() { - this.attribNameAsMember = super.getParamNameWithoutSymbols(); + String attribNameAsMember = super.getParamNameWithoutSymbols(); // need to deal with _Ref stuff :( if (this.className != null && this.className.equals(attribNameAsMember)) - this.attribNameAsMember = "m_" + this.attribNameAsMember; + attribNameAsMember = "m_" + attribNameAsMember; - return this.attribNameAsMember; - } - - public void setParamName(String paramName) - { - super.setParamName(paramName); - - // TODO - probably can remove since we sanitize attribute name. - // make sure attributes does not have the same name as class name - if (this.className != null && this.className.equals(attribName)) - this.attribNameAsMember = "m_" + attribName; - else - this.attribNameAsMember = attribName; + return attribNameAsMember; } //getter and setter for choiceElement Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java?view=diff&rev=489856&r1=489855&r2=489856 ============================================================================== --- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java (original) +++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java Fri Dec 22 21:37:16 2006 @@ -119,10 +119,9 @@ } // To avoid the '-' in attribute name. + // TODO - not needed, get rid of this. public String getParamNameWithoutSymbols() { - // TODO: design review needed - // - If type and name are equals add "_Ref" ie : ref="..." String result = this.getParamName(); char[] symbols = TypeMap.getSymbols(); --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org