Changeset 9512 in josm for trunk/src

Timestamp:

2016-01-17T20:47:39+01:00 (9 years ago)

Author:

simon04

Message:

see #12131 - Pressing escape in closing relation confirmation should not discard the changes and close the editor

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• HelpAwareOptionPane.java (modified) (2 diffs)
• dialogs/relation/actions/CancelAction.java (modified) (1 diff)

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

@@ -29 +29 @@
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
@@ -229 +229 @@
 
         if (msg instanceof String) {
-            JosmEditorPane pane = new JosmEditorPane("text/html", (String) msg);
-            pane.setEditable(false);
-            pane.setOpaque(false);
-            msg = pane;
+            msg = new JMultilineLabel(((String) msg), true);
         }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java

@@ -82 +82 @@
                     }
                 }
-            } else if (ret == 2) //Cancel, continue editing
+            } else if (ret == 2 || ret == JOptionPane.CLOSED_OPTION) //Cancel, continue editing
                 return;
             //in case of "No, discard", there is no extra action to be performed here.