Changeset 8984 in josm for trunk

Timestamp:

2015-11-03T00:39:05+01:00 (9 years ago)

Author:

Don-vip

Message:

see #12038 - add non regression test

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/PurgeAction.java (modified) (2 diffs)
• test/data/regress/12038 (added)
• test/data/regress/12038/data.osm (added)
• test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java (added)

trunk/src/org/openstreetmap/josm/actions/PurgeAction.java

@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.GraphicsEnvironment;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
@@ -202 +203 @@
         }
 
-        ExtendedDialog confirmDlg = new ExtendedDialog(Main.parent, tr("Confirm Purging"), new String[] {tr("Purge"), tr("Cancel")});
-        confirmDlg.setContent(buildPanel(modified), false);
-        confirmDlg.setButtonIcons(new String[] {"ok", "cancel"});
-
-        int answer = confirmDlg.showDialog().getValue();
-        if (answer != 1)
-            return;
-
-        Main.pref.put("purge.clear_undo_redo", cbClearUndoRedo.isSelected());
+        boolean clearUndoRedo = false;
+
+        if (!GraphicsEnvironment.isHeadless()) {
+            ExtendedDialog confirmDlg = new ExtendedDialog(Main.parent, tr("Confirm Purging"),
+                    new String[] {tr("Purge"), tr("Cancel")});
+            confirmDlg.setContent(buildPanel(modified), false);
+            confirmDlg.setButtonIcons(new String[] {"ok", "cancel"});
+
+            int answer = confirmDlg.showDialog().getValue();
+            if (answer != 1)
+                return;
+
+            clearUndoRedo = cbClearUndoRedo.isSelected();
+            Main.pref.put("purge.clear_undo_redo", clearUndoRedo);
+        }
 
         Main.main.undoRedo.add(new PurgeCommand(Main.main.getEditLayer(), toPurgeChecked, makeIncomplete));
 
-        if (cbClearUndoRedo.isSelected()) {
+        if (clearUndoRedo) {
             Main.main.undoRedo.clean();
             getCurrentDataSet().clearSelectionHistory();