Changeset 11986 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2017-04-23T19:14:12+02:00 (7 years ago)

Author:

Don-vip

Message:

add unit test for Main.postConstructorProcessCmdLine

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -10 +10 @@
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.GraphicsEnvironment;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -596 +597 @@
                     msg = null;
                 }
-                Main.map.statusLine.setHelpText(msg);
-                JOptionPane.showMessageDialog(
-                        Main.parent,
-                        msg,
-                        tr("Warning"),
-                        JOptionPane.WARNING_MESSAGE
-                );
-            } else {
+                if (Main.map != null) {
+                    Main.map.statusLine.setHelpText(msg);
+                }
+                if (!GraphicsEnvironment.isHeadless()) {
+                    JOptionPane.showMessageDialog(
+                            Main.parent,
+                            msg,
+                            tr("Warning"),
+                            JOptionPane.WARNING_MESSAGE
+                    );
+                }
+            } else if (Main.map != null) {
                 Main.map.statusLine.setHelpText(tr("Found {0} matches", foundMatches));
             }