Changeset 9512 in josm for trunk/src


Ignore:
Timestamp:
2016-01-17T20:47:39+01:00 (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java

    r9078 r9512  
    2929import org.openstreetmap.josm.gui.help.HelpUtil;
    3030import org.openstreetmap.josm.gui.util.GuiHelper;
    31 import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
     31import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
    3232import org.openstreetmap.josm.tools.ImageProvider;
    3333import org.openstreetmap.josm.tools.InputMapUtils;
     
    229229
    230230        if (msg instanceof String) {
    231             JosmEditorPane pane = new JosmEditorPane("text/html", (String) msg);
    232             pane.setEditable(false);
    233             pane.setOpaque(false);
    234             msg = pane;
     231            msg = new JMultilineLabel(((String) msg), true);
    235232        }
    236233
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java

    r9496 r9512  
    8282                    }
    8383                }
    84             } else if (ret == 2) //Cancel, continue editing
     84            } else if (ret == 2 || ret == JOptionPane.CLOSED_OPTION) //Cancel, continue editing
    8585                return;
    8686            //in case of "No, discard", there is no extra action to be performed here.
Note: See TracChangeset for help on using the changeset viewer.