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 na...@apache.org on 2006/12/23 06:37:17 UTC
svn commit: r489856 - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info:
AttributeInfo.java ParameterInfo.java
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