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 di...@apache.org on 2005/12/11 08:44:32 UTC
svn commit: r355938 -
/webservices/axis/trunk/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
Author: dims
Date: Sat Dec 10 23:44:27 2005
New Revision: 355938
URL: http://svn.apache.org/viewcvs?rev=355938&view=rev
Log:
attributes first, then elements
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=355938&r1=355937&r2=355938&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 Sat Dec 10 23:44:27 2005
@@ -717,28 +717,6 @@
+ "_";
}
- // Process the elements
- Vector elements = te.getContainedElements();
-
- if (elements != null) {
- for (int j = 0; j < elements.size(); j++) {
- ElementDecl elem = (ElementDecl) elements.get(j);
-
- if (elem.getAnyElement()) {
- if (!gotAny) {
- gotAny = true;
- paramTypes.add("org.apache.axis.message.MessageElement []");
- paramNames.add(Constants.ANYCONTENT);
- }
- } else {
- paramTypes.add(processTypeName(elem,elem.getType().getName()));
- String name = elem.getName() == null ? ("param" + i) : elem.getName();
- paramNames.add(JavaUtils.getUniqueValue(
- helper.reservedPropNames, name));
- }
- }
- }
-
// Process the attributes
Vector attributes = te.getContainedAttributes();
if (attributes != null) {
@@ -760,6 +738,27 @@
}
}
+ // Process the elements
+ Vector elements = te.getContainedElements();
+
+ if (elements != null) {
+ for (int j = 0; j < elements.size(); j++) {
+ ElementDecl elem = (ElementDecl) elements.get(j);
+
+ if (elem.getAnyElement()) {
+ if (!gotAny) {
+ gotAny = true;
+ paramTypes.add("org.apache.axis.message.MessageElement []");
+ paramNames.add(Constants.ANYCONTENT);
+ }
+ } else {
+ paramTypes.add(processTypeName(elem,elem.getType().getName()));
+ String name = elem.getName() == null ? ("param" + i) : elem.getName();
+ paramNames.add(JavaUtils.getUniqueValue(
+ helper.reservedPropNames, name));
+ }
+ }
+ }
}
if (isMixed && !isAny && !parentIsAny && !parentIsMixed) {