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 ga...@apache.org on 2006/03/22 22:18:20 UTC
svn commit: r387949 -
/webservices/axis/trunk/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
Author: gawor
Date: Wed Mar 22 13:18:18 2006
New Revision: 387949
URL: http://svn.apache.org/viewcvs?rev=387949&view=rev
Log:
process elements first. matches the order in the process() function. all tests pass
Modified:
webservices/axis/trunk/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
Modified: webservices/axis/trunk/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java?rev=387949&r1=387948&r2=387949&view=diff
==============================================================================
--- webservices/axis/trunk/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java (original)
+++ webservices/axis/trunk/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java Wed Mar 22 13:18:18 2006
@@ -717,27 +717,6 @@
+ "_";
}
- // Process the attributes
- Vector attributes = te.getContainedAttributes();
- if (attributes != null) {
- for (int j = 0; j < attributes.size(); j += 1) {
- ContainedAttribute attr = (ContainedAttribute) attributes.get(j);
-
- String name = getAttributeName(attr);
- String typeName = attr.getType().getName();
-
- // TODO - What about MinOccurs and Nillable?
- // Do they make sense here?
- if (attr.getOptional()) {
- typeName = Utils.getWrapperType(typeName);
- }
-
- paramTypes.add(typeName);
- paramNames.add(JavaUtils.getUniqueValue(
- helper.reservedPropNames, name));
- }
- }
-
// Process the elements
Vector elements = te.getContainedElements();
@@ -759,6 +738,28 @@
}
}
}
+
+ // Process the attributes
+ Vector attributes = te.getContainedAttributes();
+ if (attributes != null) {
+ for (int j = 0; j < attributes.size(); j += 1) {
+ ContainedAttribute attr = (ContainedAttribute) attributes.get(j);
+
+ String name = getAttributeName(attr);
+ String typeName = attr.getType().getName();
+
+ // TODO - What about MinOccurs and Nillable?
+ // Do they make sense here?
+ if (attr.getOptional()) {
+ typeName = Utils.getWrapperType(typeName);
+ }
+
+ paramTypes.add(typeName);
+ paramNames.add(JavaUtils.getUniqueValue(
+ helper.reservedPropNames, name));
+ }
+ }
+
}
if (isMixed && !isAny && !parentIsAny && !parentIsMixed) {