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/03/22 13:24:14 UTC
cvs commit: ws-axis/java/src/org/apache/axis/wsdl/toJava JavaBeanWriter.java
dims 2005/03/22 04:24:14
Modified: java/src/org/apache/axis/wsdl/toJava JavaBeanWriter.java
Log:
Fix for AXIS-1873 - JavaBeanWriter reorders variable names in generated constructors
Fix for AXIS-1865 - Axis 1.2 RC3 wsdl2Java problem
Revision Changes Path
1.75 +6 -15 ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
Index: JavaBeanWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- JavaBeanWriter.java 21 Mar 2005 12:37:20 -0000 1.74
+++ JavaBeanWriter.java 22 Mar 2005 12:24:13 -0000 1.75
@@ -555,25 +555,16 @@
return;
}
- // Sort by variable name.
- TreeMap map = new TreeMap();
- for (int i = 0; i < names.size(); i += 2) {
- map.put(names.get(i + 1),names.get(i));
- }
-
- Iterator iterator = map.entrySet().iterator();
pw.println(" public " + className + "(");
- while (iterator.hasNext()) {
- Map.Entry entry = (Map.Entry) iterator.next();
- String typeName = (String) entry.getValue();
- String variable = (String) entry.getKey();
+ for (int i = 0; i < names.size(); i += 2) {
+ String typeName = (String) names.get(i);
+ String variable = (String) names.get(i + 1);
pw.print(" " + typeName + " "
+ variable);
- if (iterator.hasNext()) {
- pw.println(",");
- } else {
+ if (i >= names.size() - 2) {
pw.println(") {");
- break;
+ } else {
+ pw.println(",");
}
}