Changeset 18177 in josm for trunk/src

Timestamp:

2021-08-25T21:36:32+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20403 - Relation editor: Enable select relation button of new relation once it is saved

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions

Files:

• SavingAction.java (modified) (4 diffs)
• SelectAction.java (modified) (1 diff)

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

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationDialogManager;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
@@ -161 +162 @@
 
     protected boolean applyChanges() {
-        if (editorAccess.getEditor().getRelation() == null) {
+        IRelationEditor editor = editorAccess.getEditor();
+        if (editor.getRelation() == null) {
             applyNewRelation(getTagModel());
         } else if (isEditorDirty()) {
-            if (editorAccess.getEditor().isDirtyRelation()) {
+            if (editor.isDirtyRelation()) {
                 if (confirmClosingBecauseOfDirtyState()) {
-                    if (getLayer().getConflicts().hasConflictForMy(editorAccess.getEditor().getRelation())) {
+                    if (getLayer().getConflicts().hasConflictForMy(editor.getRelation())) {
                         warnDoubleConflict();
                         return false;
@@ -179 +181 @@
             }
         }
-        editorAccess.getEditor().setRelation(editorAccess.getEditor().getRelation());
+        editor.setRelation(editor.getRelation());
         return true;
     }
@@ -188 +190 @@
             editorAccess.getEditor().setRelation(null);
         }
-
     }
 

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

@@ -21 +21 @@
      */
     public SelectAction(IRelationEditorActionAccess editorAccess) {
-        super(editorAccess);
+        super(editorAccess, IRelationEditorUpdateOn.TAG_CHANGE);
         putValue(NAME, tr("Select"));
         putValue(SHORT_DESCRIPTION, tr("Select the currently edited relation"));