Changeset 14380 in josm for trunk/src/org

Timestamp:

2018-10-28T20:30:47+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16906 - RelationEditorActionsTest: fix for non-headless mode (patch by ris)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/ConditionalOptionPaneUtil.java (modified) (5 diffs)
• tools/bugreport/ReportedException.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java

@@ -5 +5 @@
 
 import java.awt.Component;
-import java.awt.GraphicsEnvironment;
 import java.awt.GridBagLayout;
 import java.util.HashMap;
@@ -116 +115 @@
      * @return the option selected by user.
      *         {@link JOptionPane#CLOSED_OPTION} if the dialog was closed.
-     *         {@link JOptionPane#YES_OPTION} if <code>GraphicsEnvironment.isHeadless</code> returns <code>true</code>
      */
     public static int showOptionDialog(String preferenceKey, Component parent, Object message, String title, int optionType,
@@ -124 +122 @@
             return ret;
         MessagePanel pnl = new MessagePanel(message, isInBulkOperation(preferenceKey));
-        if (GraphicsEnvironment.isHeadless()) {
-            // for unit tests
-            ret = JOptionPane.YES_OPTION;
-        } else {
-            ret = JOptionPane.showOptionDialog(parent, pnl, title, optionType, messageType, null, options, defaultOption);
-        }
+        ret = JOptionPane.showOptionDialog(parent, pnl, title, optionType, messageType, null, options, defaultOption);
         if (isYesOrNo(ret)) {
             pnl.getNotShowAgain().store(preferenceKey, ret);
@@ -162 +155 @@
      *
      * @return true, if the selected option is equal to <code>trueOption</code>, otherwise false.
-     *         {@code trueOption} if <code>GraphicsEnvironment.isHeadless</code> returns <code>true</code>
      *
      * @see JOptionPane#INFORMATION_MESSAGE
@@ -174 +166 @@
             return ret == trueOption;
         MessagePanel pnl = new MessagePanel(message, isInBulkOperation(preferenceKey));
-        if (GraphicsEnvironment.isHeadless()) {
-            // for unit tests
-            ret = trueOption;
-        } else {
-            ret = JOptionPane.showConfirmDialog(parent, pnl, title, optionType, messageType);
-        }
+        ret = JOptionPane.showConfirmDialog(parent, pnl, title, optionType, messageType);
         if (isYesOrNo(ret)) {
             pnl.getNotShowAgain().store(preferenceKey, ret);

trunk/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java

@@ -49 +49 @@
     private String methodWarningFrom;
 
-    ReportedException(Throwable exception) {
+    /**
+     * Constructs a new {@code ReportedException}.
+     * @param exception the cause (which is saved for later retrieval by the {@link #getCause()} method)
+     * @since 14380
+     */
+    public ReportedException(Throwable exception) {
         this(exception, Thread.currentThread());
     }
 
-    ReportedException(Throwable exception, Thread caughtOnThread) {
+    /**
+     * Constructs a new {@code ReportedException}.
+     * @param exception the cause (which is saved for later retrieval by the {@link #getCause()} method)
+     * @param caughtOnThread thread where the exception was caugth
+     * @since 14380
+     */
+    public ReportedException(Throwable exception, Thread caughtOnThread) {
         super(exception);