From aff5fcf5d3bd944c435dc5800a625c29be284ed5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 30 Mar 2018 14:24:13 +0100 Subject: [PATCH v2 14/28] remove some isHeadless checks which were preventing large amounts of code being run in some tests --- .../gui/io/AsynchronousUploadPrimitivesTask.java | 11 +++----- .../preferences/advanced/ExportProfileAction.java | 6 ++--- .../gui/preferences/advanced/PreferencesTable.java | 31 +++++++++------------- .../gui/preferences/plugin/PluginPreference.java | 17 +++++------- 4 files changed, 26 insertions(+), 39 deletions(-) diff --git a/src/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTask.java b/src/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTask.java index 319037b53..09ab221aa 100644 --- a/src/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTask.java +++ b/src/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTask.java @@ -3,7 +3,6 @@ package org.openstreetmap.josm.gui.io; import static org.openstreetmap.josm.tools.I18n.tr; -import java.awt.GraphicsEnvironment; import java.util.Optional; import javax.swing.JOptionPane; @@ -85,12 +84,10 @@ public final class AsynchronousUploadPrimitivesTask extends UploadPrimitivesTask OsmDataLayer dataLayer, APIDataSet apiDataSet, Changeset changeset) { synchronized (AsynchronousUploadPrimitivesTask.class) { if (asynchronousUploadPrimitivesTask != null) { - if (!GraphicsEnvironment.isHeadless()) { - GuiHelper.runInEDTAndWait(() -> - JOptionPane.showMessageDialog(MainApplication.parent, - tr("A background upload is already in progress. " + - "Kindly wait for it to finish before uploading new changes"))); - } + GuiHelper.runInEDTAndWait(() -> + JOptionPane.showMessageDialog(MainApplication.parent, + tr("A background upload is already in progress. " + + "Kindly wait for it to finish before uploading new changes"))); return Optional.empty(); } else { // Create an asynchronous upload task diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java b/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java index 84cb9694f..36fd57cc6 100644 --- a/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java +++ b/src/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileAction.java @@ -55,10 +55,8 @@ public class ExportProfileAction extends AbstractAction { } } if (keys.isEmpty()) { - if (!GraphicsEnvironment.isHeadless()) { - JOptionPane.showMessageDialog(Main.parent, - tr("All the preferences of this group are default, nothing to save"), tr("Warning"), JOptionPane.WARNING_MESSAGE); - } + JOptionPane.showMessageDialog(Main.parent, + tr("All the preferences of this group are default, nothing to save"), tr("Warning"), JOptionPane.WARNING_MESSAGE); return; } File f = askUserForCustomSettingsFile(); diff --git a/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java b/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java index 8f63f0ef4..1abd118e1 100644 --- a/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java +++ b/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java @@ -7,7 +7,6 @@ import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Color; import java.awt.Component; import java.awt.Font; -import java.awt.GraphicsEnvironment; import java.awt.GridBagLayout; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -95,14 +94,12 @@ public class PreferencesTable extends JTable { */ public boolean editPreference(final JComponent gui) { if (getSelectedRowCount() != 1) { - if (!GraphicsEnvironment.isHeadless()) { - JOptionPane.showMessageDialog( - gui, - tr("Please select the row to edit."), - tr("Warning"), - JOptionPane.WARNING_MESSAGE - ); - } + JOptionPane.showMessageDialog( + gui, + tr("Please select the row to edit."), + tr("Warning"), + JOptionPane.WARNING_MESSAGE + ); return false; } final PrefEntry e = (PrefEntry) model.getValueAt(getSelectedRow(), 1); @@ -196,7 +193,7 @@ public class PreferencesTable extends JTable { PrefEntry pe = null; boolean ok = false; - if (!GraphicsEnvironment.isHeadless() && askAddSetting(gui, p)) { + if (askAddSetting(gui, p)) { if (rbString.isSelected()) { StringSetting sSetting = new StringSetting(null); pe = new PrefEntry(tkey.getText(), sSetting, sSetting, false); @@ -281,14 +278,12 @@ public class PreferencesTable extends JTable { */ public void resetPreferences(final JComponent gui) { if (getSelectedRowCount() == 0) { - if (!GraphicsEnvironment.isHeadless()) { - JOptionPane.showMessageDialog( - gui, - tr("Please select the row to delete."), - tr("Warning"), - JOptionPane.WARNING_MESSAGE - ); - } + JOptionPane.showMessageDialog( + gui, + tr("Please select the row to delete."), + tr("Warning"), + JOptionPane.WARNING_MESSAGE + ); return; } for (int row : getSelectedRows()) { diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java index 3392bad3c..9d4b3ed20 100644 --- a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java +++ b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java @@ -6,7 +6,6 @@ import static org.openstreetmap.josm.tools.I18n.trn; import java.awt.BorderLayout; import java.awt.Component; -import java.awt.GraphicsEnvironment; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.GridLayout; @@ -158,15 +157,13 @@ public final class PluginPreference extends DefaultTabPreferenceSetting { sb.append(tr("Please restart JOSM to activate the downloaded plugins.")); } sb.append(""); - if (!GraphicsEnvironment.isHeadless()) { - GuiHelper.runInEDTAndWait(() -> HelpAwareOptionPane.showOptionDialog( - parent, - sb.toString(), - tr("Update plugins"), - !failed.isEmpty() ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE, - HelpUtil.ht("/Preferences/Plugins") - )); - } + GuiHelper.runInEDTAndWait(() -> HelpAwareOptionPane.showOptionDialog( + parent, + sb.toString(), + tr("Update plugins"), + !failed.isEmpty() ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE, + HelpUtil.ht("/Preferences/Plugins") + )); } private JPanel buildSearchFieldPanel() { -- 2.11.0