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 2008/05/06 04:58:00 UTC

svn commit: r653672 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl: DefaultSchemaGenerator.java DocLitBareSchemaGenerator.java

Author: dims
Date: Mon May  5 19:58:00 2008
New Revision: 653672

URL: http://svn.apache.org/viewvc?rev=653672&view=rev
Log:
use Linked versions of HashMap and HashSet to keep the order of iteration intact under other JDK's

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=653672&r1=653671&r2=653672&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java Mon May  5 19:58:00 2008
@@ -246,7 +246,7 @@
 
 
         // since we do not support overload
-        HashMap uniqueMethods = new HashMap();
+        HashMap uniqueMethods = new LinkedHashMap();
         XmlSchemaComplexType methodSchemaType;
         XmlSchemaSequence sequence = null;
 
@@ -521,8 +521,8 @@
             typeTable.addComplexSchema(getQualifiedName(javaType.getPackage()), eltOuter.getQName());
 
 
-            Set propertiesSet = new HashSet();
-            Set propertiesNames = new HashSet();
+            Set propertiesSet = new LinkedHashSet();
+            Set propertiesNames = new LinkedHashSet();
             Field tempProperties[] = javaType.getDeclaredFields();
             BeanExcludeInfo beanExcludeInfo = null;
             if (service.getExcludeInfo() != null) {
@@ -557,7 +557,7 @@
 
             }
             Field[] tempFields = javaType.getDeclaredFields();
-            HashMap FieldMap = new HashMap();
+            HashMap FieldMap = new LinkedHashMap();
             for (int i = 0; i < tempFields.length; i++) {
                 Field tempFiled = tempFields[i];
                 // create a element for the field only if it is public

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java?rev=653672&r1=653671&r2=653672&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DocLitBareSchemaGenerator.java Mon May  5 19:58:00 2008
@@ -43,11 +43,12 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 
 public class DocLitBareSchemaGenerator extends DefaultSchemaGenerator {
 
     private static final Log log = LogFactory.getLog(DocLitBareSchemaGenerator.class);
-    private HashMap processedParameters = new HashMap();
+    private HashMap processedParameters = new LinkedHashMap();
 
     public DocLitBareSchemaGenerator(ClassLoader loader,
                                      String className,
@@ -64,7 +65,7 @@
         Arrays.sort(declaredMethods , new MathodComparator());
 
         // since we do not support overload
-        HashMap uniqueMethods = new HashMap();
+        HashMap uniqueMethods = new LinkedHashMap();
         XmlSchemaComplexType methodSchemaType;
         XmlSchemaSequence sequence;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org