Changeset 8463 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-06-04T00:15:53+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11209 - switch input method as soon as option selected + detect potential errors and implement fallbacks and logs

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/properties/TagEditHelper.java (modified) (1 diff)
• tagging/ac/AutoCompletingComboBox.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -520 +520 @@
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    boolean sel=((JCheckBoxMenuItem) e.getSource()).getState();
-                    PROPERTY_FIX_TAG_LOCALE.put(sel);
+                    boolean use=((JCheckBoxMenuItem) e.getSource()).getState();
+                    PROPERTY_FIX_TAG_LOCALE.put(use);
+                    keys.setFixedLocale(use);
                 }
             });

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

@@ -314 +314 @@
         useFixedLocale = f;
         if (useFixedLocale) {
-            privateInputContext.selectInputMethod(new Locale("en", "US"));
+            Locale oldLocale = privateInputContext.getLocale();
+            Main.info("Using English input method");
+            if (!privateInputContext.selectInputMethod(new Locale("en", "US"))) {
+                // Unable to use English keyboard layout, disable the feature
+                Main.warn("Unable to use English input method");
+                useFixedLocale = false;
+                if (oldLocale != null) {
+                    Main.info("Restoring input method to " + oldLocale);
+                    if (!privateInputContext.selectInputMethod(oldLocale)) {
+                        Main.warn("Unable to restore input method to " + oldLocale);
+                    }
+                }
+            }
         }
     }