Changeset 7632 in josm for trunk/src/org

Timestamp:

2014-10-19T03:11:10+02:00 (10 years ago)

Author:

Don-vip

Message:

see #10647 - fix NPE

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• tagging/ac/AutoCompletingComboBox.java (modified) (1 diff)
• widgets/JosmPasswordField.java (modified) (1 diff)
• widgets/JosmTextArea.java (modified) (1 diff)
• widgets/JosmTextField.java (modified) (2 diffs)

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

@@ -177 +177 @@
                     @Override
                     public void focusLost(FocusEvent e) {
-                        Main.map.keyDetector.setEnabled(true);
+                        if (Main.map != null) {
+                            Main.map.keyDetector.setEnabled(true);
+                        }
                     }
                     @Override
                     public void focusGained(FocusEvent e) {
-                        Main.map.keyDetector.setEnabled(false);
+                        if (Main.map != null) {
+                            Main.map.keyDetector.setEnabled(false);
+                        }
                         // save unix system selection (middle mouse paste)
                         Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection();

trunk/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java

@@ -98 +98 @@
     @Override
     public void focusGained(FocusEvent e) {
-        Main.map.keyDetector.setEnabled(false);
+        if (Main.map != null) {
+            Main.map.keyDetector.setEnabled(false);
+        }
     }
 
     @Override
     public void focusLost(FocusEvent e) {
-        Main.map.keyDetector.setEnabled(true);
+        if (Main.map != null) {
+            Main.map.keyDetector.setEnabled(true);
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java

@@ -92 +92 @@
     @Override
     public void focusGained(FocusEvent e) {
-        Main.map.keyDetector.setEnabled(false);
+        if (Main.map != null) {
+            Main.map.keyDetector.setEnabled(false);
+        }
     }
 
     @Override
     public void focusLost(FocusEvent e) {
-        Main.map.keyDetector.setEnabled(true);
+        if (Main.map != null) {
+            Main.map.keyDetector.setEnabled(true);
+        }
     }
 }

trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java

@@ -141 +141 @@
     @Override
     public void focusGained(FocusEvent e) {
-        Main.map.keyDetector.setEnabled(false);
+        if (Main.map != null) {
+            Main.map.keyDetector.setEnabled(false);
+        }
         repaint();
     }
@@ -147 +149 @@
     @Override
     public void focusLost(FocusEvent e) {
-        Main.map.keyDetector.setEnabled(true);
+        if (Main.map != null) {
+            Main.map.keyDetector.setEnabled(true);
+        }
         repaint();
     }