Ticket #12411: AutoUpdateRelationEditor.patch

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

@@ -31 +31 @@
 import javax.swing.BorderFactory;
 import javax.swing.InputMap;
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -65 +66 @@
 import org.openstreetmap.josm.gui.dialogs.relation.actions.AddSelectedAtStartAction;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.AddSelectedBeforeSelection;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.ApplyAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.AutoUpdateAction;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.CancelAction;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.CopyMembersAction;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.DeleteCurrentRelationAction;
@@ -130 +132 @@
     /**
      * Action for performing the {@link RefreshAction}
      */
-    private RefreshAction refreshAction;
+    public RefreshAction refreshAction;
     /**
      * Action for performing the {@link ApplyAction}
      */
-    private ApplyAction applyAction;
+    public ApplyAction applyAction;
+    /**
+     * Action for performing the {@link AutoUpdateAction}
+     */
+    public AutoUpdateAction autoUpdateAction;
     /**
      * Action for performing the {@link CancelAction}
      */
     private CancelAction cancelAction;
+    /**
+     * Flag used by some actions telling that change event comes from here
+     */
+    public boolean saving;
 
     /**
      * Creates a new relation editor for the given relation. The relation will be saved if the user
@@ -291 +301 @@
     }
 
     /**
+     * Check if automatic update is enabled.
+     * @return true if automatic update is enabled
+     */
+    public boolean isAutoUpdate() {
+        return autoUpdateAction.enabled();
+    }
+
+    /**
+     * Disable automatic update.
+     */
+    public void disableAutoUpdate() {
+        autoUpdateAction.disable();
+    }
+
+    /**
      * Creates the toolbar
      *
      * @return the toolbar
@@ -306 +331 @@
         DeleteCurrentRelationAction deleteAction = new DeleteCurrentRelationAction(getLayer(), this);
         addPropertyChangeListener(deleteAction);
         tb.add(deleteAction);
+        tb.add(new JCheckBox(autoUpdateAction = new AutoUpdateAction(this)));
         return tb;
     }
 

src/org/openstreetmap/josm/gui/dialogs/relation/actions/ApplyAction.java

@@ -50 +50 @@
     }
 
     @Override
-    protected void updateEnabledState() {
-        setEnabled(isEditorDirty());
-    }
+    public void updateEnabledState() {
+        if (getEditor().saving) return;
+        boolean enable = isEditorDirty();
+        if (enable && getEditor().isAutoUpdate()) {
+            actionPerformed(null);
+        } else {
+            setEnabled(enable);
+        }
+     }
 
     @Override
     public void propertyChange(PropertyChangeEvent evt) {

src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java

@@ -64 +64 @@
             }
             return;
         }
-        if (isEditorDirty() && confirmDiscardDirtyData() != 0)
+        if (isEditorDirty() && confirmDiscardDirtyData() != 0) {
+            getEditor().disableAutoUpdate();
             return;
+        }
         editor.reloadDataFromRelation();
     }
 
     @Override
     public void updateEnabledState() {
+        if (getEditor().saving) return;
         Relation relation = editor.getRelation();
         Relation snapshot = editor.getRelationSnapshot();
-        setEnabled(snapshot != null && (
+        boolean enable = snapshot != null && (
             !relation.hasEqualTechnicalAttributes(snapshot) ||
             !relation.hasEqualSemanticAttributes(snapshot)
-        ));
+        );
+        if (enable && getEditor().isAutoUpdate()) {
+            actionPerformed(null);
+        } else {
+            setEnabled(enable);
+        }
     }
 
     protected int confirmDiscardDirtyData() {

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

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
 import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
@@ -165 +166 @@
     }
 
     protected boolean applyChanges() {
+        GenericRelationEditor editor = getEditor();
+        editor.saving = true;
+        boolean ret = doApplyChanges();
+        editor.saving = false;
+        if (!ret) editor.disableAutoUpdate();
+        return ret;
+    }
+
+    protected boolean doApplyChanges() {
         if (editor.getRelation() == null) {
             applyNewRelation(tagModel);
         } else if (isEditorDirty()) {
@@ -196 +206 @@
         Relation snapshot = editor.getRelationSnapshot();
         return (snapshot != null && !memberTableModel.hasSameMembersAs(snapshot)) || tagModel.isDirty();
     }
+
+    protected GenericRelationEditor getEditor() {
+        return (GenericRelationEditor) editor;
+    }
 }