svn commit: r14188 - trunk/src/app/src/org/argouml/ui/SettingsTabAppearance.java

Author: mvw
Date: 2008-03-09 13:26:51-0800
New Revision: 14188

Modified:
   trunk/src/app/src/org/argouml/ui/SettingsTabAppearance.java

Log:
Fix for issue 4638: Show the correct language after first installation of ArgoUML - show the default language as "unselected" in the combo.

Modified: trunk/src/app/src/org/argouml/ui/SettingsTabAppearance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/ui/SettingsTabAppearance.java?view=diff&rev=14188&p1=trunk/src/app/src/org/argouml/ui/SettingsTabAppearance.java&p2=trunk/src/app/src/org/argouml/ui/SettingsTabAppearance.java&r1=14187&r2=14188
==============================================================================
--- trunk/src/app/src/org/argouml/ui/SettingsTabAppearance.java	(original)
+++ trunk/src/app/src/org/argouml/ui/SettingsTabAppearance.java	2008-03-09 13:26:51-0800
@@ -108,11 +108,13 @@
 
         JLabel languageLabel =
             new JLabel(Translator.localize("label.language"));
-        Collection c = MyLocale.getLocales();
+        Collection<MyLocale> c = MyLocale.getLocales();
         language = new JComboBox(c.toArray());
         Object o = MyLocale.getDefault(c);
         if (o != null) {
             language.setSelectedItem(o);
+        } else {
+            language.setSelectedIndex(-1);
         }
         language.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -252,21 +254,17 @@
         return displayString.toString();
     }
 
-    static Collection getLocales() {
-        Iterator i = Arrays.asList(Translator.getLocales()).iterator();
-        Collection c = new ArrayList();
-        while (i.hasNext()) {
-            Locale locale = (Locale) i.next();
+    static Collection<MyLocale> getLocales() {
+        Collection<MyLocale> c = new ArrayList<MyLocale>();
+        for (Locale locale : Arrays.asList(Translator.getLocales())) {
             c.add(new MyLocale(locale));
         }
         return c;
     }
 
-    static MyLocale getDefault(Collection c) {
+    static MyLocale getDefault(Collection<MyLocale> c) {
         Locale locale = Locale.getDefault();
-        Iterator i = c.iterator();
-        while (i.hasNext()) {
-            MyLocale ml = (MyLocale) i.next();
+        for (MyLocale ml : c) {
             if (locale.equals(ml.getLocale())) {
                 return ml;
             }