Changeset 9511 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-01-17T20:41:24+01:00 (8 years ago)

Author:

simon04

Message:

fix #12131 - Confirm closing relation editor window with x top right

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -127 +127 @@
      */
     private JButton sortBelowButton;
+    /**
+     * Action for performing the {@link CancelAction}
+     */
+    private CancelAction cancelAction;
 
     /**
@@ -219 +223 @@
         setSize(findMaxDialogSize());
 
+        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         addWindowListener(
                 new WindowAdapter() {
@@ -224 +229 @@
                     public void windowOpened(WindowEvent e) {
                         cleanSelfReferences();
+                    }
+
+                    @Override
+                    public void windowClosing(WindowEvent e) {
+                        cancel();
                     }
                 }
@@ -248 +258 @@
         memberTableModel.setSelectedMembers(selectedMembers);
         HelpUtil.setHelpContext(getRootPane(), ht("/Dialog/RelationEditor"));
+    }
+
+    protected void cancel() {
+        cancelAction.actionPerformed(null);
     }
 
@@ -274 +288 @@
         JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
         pnl.add(new SideButton(new OKAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this, tfRole)));
-        pnl.add(new SideButton(new CancelAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this, tfRole)));
+        cancelAction = new CancelAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this, tfRole);
+        pnl.add(new SideButton(cancelAction));
         pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/RelationEditor"))));
         return pnl;