Changeset 9657 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java

Timestamp:

2016-01-27T22:18:36+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12410 - new button to refresh relation in relation editor (patch by kolesar, modified for checkstyle, javadoc, unit test)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java (modified) (2 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Component;
 import java.awt.event.ActionEvent;
 
@@ -66 +65 @@
                 //copied from OKAction.run()
                 Main.pref.put("relation.editor.generic.lastrole", tfRole.getText());
-                if (editor.getRelation() == null) {
-                    applyNewRelation(tagModel);
-                } else if (!memberTableModel.hasSameMembersAs(snapshot) || tagModel.isDirty()) {
-                    if (editor.isDirtyRelation()) {
-                        if (confirmClosingBecauseOfDirtyState()) {
-                            if (layer.getConflicts().hasConflictForMy(editor.getRelation())) {
-                                warnDoubleConflict();
-                                return;
-                            }
-                            applyExistingConflictingRelation(tagModel);
-                        } else
-                            return;
-                    } else {
-                        applyExistingNonConflictingRelation(tagModel);
-                    }
-                }
+                if (!applyChanges())
+                    return;
             } 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.
         }
-        if (editor instanceof Component) {
-            ((Component) editor).setVisible(false);
-        }
+        hideEditor();
     }