svn commit: r13738 - trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java

Author: bobtarling
Date: 2007-11-09 10:35:12-0800
New Revision: 13738

Modified:
   trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java

Log:
Reinstate ordering to keep ordering not case sensitive

Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java?view=diff&rev=13738&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java&r1=13737&r2=13738
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java	2007-11-09 10:35:12-0800
@@ -128,9 +128,14 @@
             if (name1 == null) {
                 return -1;
             }
-            int comparison = name1.compareTo(name2);
+            int comparison = name1.compareToIgnoreCase(name2);
             if (comparison != 0) {
                 return comparison;
+            } else {
+                comparison = name1.compareTo(name2);
+                if (comparison != 0) {
+                    return comparison;
+                }
             }
         }
         if (i2.hasNext()) {