svn commit: r16975 - trunk/src/argouml-app/src/org/argouml/uml/generator: . ui

Author: penyaskito
Date: 2009-03-26 14:06:19-0700
New Revision: 16975

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/generator/Language.java
   trunk/src/argouml-app/src/org/argouml/uml/generator/ui/ClassGenerationDialog.java

Log:
Fix for issue 5743: Patch for ordering language names alphabetically in "generate all classes" window.
Patch supplied by shurakai (Christian Heinrich). Thanks!
Reviewers: thn, penyaskito

Modified: trunk/src/argouml-app/src/org/argouml/uml/generator/Language.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/generator/Language.java?view=diff&pathrev=16975&r1=16974&r2=16975
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/generator/Language.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/generator/Language.java	2009-03-26 14:06:19-0700
@@ -31,7 +31,7 @@
  * 
  * @author Daniele Tamino
  */
-public class Language {
+public class Language implements Comparable<Language> {
 
     private String name;
     private String title;
@@ -82,6 +82,16 @@
     public Language(String theName) {
         this(theName, theName, null);
     }
+    
+    /**
+     * Compares the current object with another object.
+     * 
+     * @param o The object one compares to
+     * @return int
+     */
+    public int compareTo(Language o) {
+        return (this.getName().compareToIgnoreCase(o.getName()));
+    }
 
     /**
      * @return Returns the icon.

Modified: trunk/src/argouml-app/src/org/argouml/uml/generator/ui/ClassGenerationDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/generator/ui/ClassGenerationDialog.java?view=diff&pathrev=16975&r1=16974&r2=16975
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/generator/ui/ClassGenerationDialog.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/generator/ui/ClassGenerationDialog.java	2009-03-26 14:06:19-0700
@@ -55,6 +55,7 @@
 
 import org.apache.log4j.Logger;
 import org.argouml.i18n.Translator;
+import org.argouml.model.Facade;
 import org.argouml.model.Model;
 import org.argouml.notation.Notation;
 import org.argouml.uml.generator.CodeGenerator;
@@ -254,24 +255,10 @@
     }
 
     private void buildLanguages() {
-        ArrayList<Language> tmp = new ArrayList<Language>(GeneratorManager
+        languages = new ArrayList<Language>(GeneratorManager
                 .getInstance().getLanguages());
 
-        languages = new ArrayList<Language>();
-
-        for (int i = 0, length = tmp.size(); i < length; i++) {
-            Language current = tmp.get(i);
-            int index = languages.size();
-
-            for (int j = 0, length_j = languages.size(); j < length_j; j++) {
-                if (current.getName().compareToIgnoreCase(
-                        languages.get(j).getName()) < 0) {
-                    index = j;
-                    break;
-                }
-            }
-            languages.add(index, current);
-        }
+        Collections.sort(languages);
     }
 
     private static Collection<String> getClasspathEntries() {

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1435138

To unsubscribe from this discussion, e-mail: [[email protected]].