Changeset 2754 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2010-01-07T12:06:22+01:00 (14 years ago)

Author:

stoecker

Message:

fixed translation problems, i18n update

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java

@@ -5 +5 @@
 
 import java.awt.Component;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
-import java.util.logging.Logger;
 
 import javax.swing.Box;
@@ -21 +18 @@
 import javax.swing.JPanel;
 import javax.swing.ListCellRenderer;
-import javax.swing.SwingUtilities;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.I18n;
-import org.xml.sax.SAXException;
 
 public class LanguagePreference implements PreferenceSetting {
-    static private final Logger logger = Logger.getLogger(LanguagePreference.class.getName());
-
     public static class Factory implements PreferenceSettingFactory {
         public PreferenceSetting createPreferenceSetting() {
@@ -52 +41 @@
         langCombo = new JComboBox(model);
         langCombo.setRenderer(new LanguageCellRenderer(langCombo.getRenderer()));
+        model.selectLanguage(Main.pref.get("language"));
 
         LafPreference lafPreference = gui.getSetting(LafPreference.class);
@@ -59 +49 @@
         panel.add(langCombo, GBC.eol().fill(GBC.HORIZONTAL));
         panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
-
-        // this defers loading of available translations to the first time the tab
-        // with the available translations is selected by the user
-        //
-        gui.displaycontent.addChangeListener(
-                new ChangeListener() {
-                    public void stateChanged(ChangeEvent e) {
-                        int i = gui.displaycontent.getSelectedIndex();
-                        String title = gui.displaycontent.getTitleAt(i);
-                        if (title.equals(tr("Look and Feel"))) {
-                            initiallyLoadAvailableTranslations();
-                        }
-                    }
-                }
-        );
     }
 
@@ -87 +62 @@
     }
 
-    /**
-     * Load available translations if not loaded yet.
-     */
-    public void initiallyLoadAvailableTranslations() {
-        if (!translationsLoaded) {
-            reloadAvailableTranslations();
-        }
-        translationsLoaded = true;
-    }
-
-    /**
-     * Asynchronously loads available translations
-     *
-     */
-    protected void reloadAvailableTranslations() {
-        Main.worker.submit(new AvailableTranslationsLoader());
-    }
-
-    /**
-     * Asynchronous task to lookup the available translations.
-     *
-     */
-    private class AvailableTranslationsLoader extends PleaseWaitRunnable {
-        public AvailableTranslationsLoader() {
-            super(tr("Looking up available translations..."));
-        }
-
-        @Override
-        protected void cancel() {
-            // can't cancel
-        }
-
-        @Override
-        protected void realRun() throws SAXException, IOException, OsmTransferException {
-            final List<Locale> locales = new ArrayList<Locale>(
-                    Arrays.asList(I18n.getAvailableTranslations(getProgressMonitor()))
-            );
-            locales.add(0,Locale.ENGLISH);
-            Runnable r = new Runnable() {
-                public void run() {
-                    model.setAvailableLocales(locales);
-                    model.selectLanguage(Main.pref.get("language"));
-                }
-            };
-            try {
-                SwingUtilities.invokeAndWait(r);
-            } catch(InvocationTargetException e) {
-                throw new RuntimeException(e.getCause());
-            } catch(InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        @Override
-        protected void finish() {}
-    }
-
     private static class LanguageComboBoxModel extends DefaultComboBoxModel {
         private final List<Locale> data = new ArrayList<Locale>();
 
-        public LanguageComboBoxModel() {}
-
-        public void setAvailableLocales(List<Locale> locales) {
-            data.clear();
-            if (locales != null) {
-                data.add(null); // the default locale
-                data.addAll(locales);
-            }
-            fireContentsChanged(this, 0, getSize());
+        public LanguageComboBoxModel(){
+            data.add(0,null);
+            data.addAll(Arrays.asList(I18n.getAvailableTranslations()));
         }