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 am...@apache.org on 2007/01/10 06:39:25 UTC
svn commit: r494723 -
/webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
Author: amilas
Date: Tue Jan 9 21:39:24 2007
New Revision: 494723
URL: http://svn.apache.org/viewvc?view=rev&rev=494723
Log:
renamed the variable when it is already present in supper class when handling complex type restriction.
Modified:
webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
Modified: webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java?view=diff&rev=494723&r1=494722&r2=494723
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java (original)
+++ webservices/axis2/branches/java/1_1/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java Tue Jan 9 21:39:24 2007
@@ -569,7 +569,14 @@
String xmlName = name.getLocalPart();
XSLTUtils.addAttribute(model, "name", xmlName, property);
XSLTUtils.addAttribute(model, "nsuri", name.getNamespaceURI(), property);
+
String javaName = makeUniqueJavaClassName(propertyNames, xmlName);
+ // in a restriction if this element already there and array status have changed
+ // then we have to generate a new name for this
+ if (parentMetaInf != null && metainf.isRestriction() && !missingQNames.contains(name) &&
+ (parentMetaInf.getArrayStatusForQName(name) && !metainf.getArrayStatusForQName(name))) {
+ javaName = makeUniqueJavaClassName(propertyNames, xmlName);
+ }
XSLTUtils.addAttribute(model, "javaname", javaName, property);
if (parentMetaInf != null && metainf.isRestriction() && missingQNames.contains(name)) {
@@ -815,11 +822,11 @@
}
}
//adding missing QNames to the end of list.
-// if (!missingQNames.isEmpty()) {
-// for (int i = 0; i < missingQNames.size(); i++) {
-// qName.add(missingQNames.get(i));
-// }
-// }
+ if (!missingQNames.isEmpty()) {
+ for (int i = 0; i < missingQNames.size(); i++) {
+ qName.add(missingQNames.get(i));
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org