Changeset 14013 in josm for trunk/src

Timestamp:

2018-07-08T01:29:16+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16453 - fix NPE and warnings

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• I18n.java (modified) (2 diffs)
• KeyboardUtils.java (modified) (4 diffs)
• Shortcut.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -90 +90 @@
     /** Map (english/locale) of plural strings **/
     private static volatile Map<String, String[]> pstrings;
+    private static Locale originalLocale = Locale.getDefault();
     private static Map<String, PluralMode> languages = new HashMap<>();
     static {
@@ -635 +636 @@
         return new HashMap<>(pstrings);
     }
+
+    /**
+     * Returns the original default locale found when the JVM started.
+     * Used to guess real language/country of current user disregarding language chosen in JOSM preferences.
+     * @return the original default locale found when the JVM started
+     * @since 14013
+     */
+    public static Locale getOriginalLocale() {
+        return originalLocale;
+    }
 }

trunk/src/org/openstreetmap/josm/tools/KeyboardUtils.java

@@ -160 +160 @@
      */
     public static List<Character> getCharactersForKey(char row, int column, Locale l) {
+        if (l == null) {
+            l = I18n.getOriginalLocale();
+        }
         if ('E' == row && 0 == column) {
             List<Character> result = new ArrayList<>();
@@ -258 +261 @@
                 result.add('*');
                 break;
+            default:
+                // Do nothing
             }
 
@@ -286 +291 @@
                 result.add('º'); // https://en.wikipedia.org/wiki/Ordinal_indicator
                 break;
+            default:
+                // Do nothing
             }
 
@@ -348 +355 @@
                 addThaiCharacters(map);
                 break;
+            default:
+                // Do nothing
         }
 

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Toolkit;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;