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

Timestamp:

2016-01-27T22:18:36+01:00 (8 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/ApplyAction.java (modified) (3 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Component;
 import java.awt.event.ActionEvent;
 
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+
+import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
@@ -18 +24 @@
  * @since 9496
  */
-public class ApplyAction extends SavingAction {
+public class ApplyAction extends SavingAction implements PropertyChangeListener, TableModelListener {
 
     /**
@@ -34 +40 @@
         putValue(SMALL_ICON, ImageProvider.get("save"));
         putValue(NAME, tr("Apply"));
-        setEnabled(true);
+        updateEnabledState();
+        memberTableModel.addTableModelListener(this);
+        tagModel.addPropertyChangeListener(this);
     }
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (editor.getRelation() == null) {
-            applyNewRelation(tagModel);
-        } else if (!memberTableModel.hasSameMembersAs(editor.getRelationSnapshot()) || tagModel.isDirty()) {
-            if (editor.isDirtyRelation()) {
-                if (confirmClosingBecauseOfDirtyState()) {
-                    if (layer.getConflicts().hasConflictForMy(editor.getRelation())) {
-                        warnDoubleConflict();
-                        return;
-                    }
-                    applyExistingConflictingRelation(tagModel);
-                    if (editor instanceof Component) {
-                        ((Component) editor).setVisible(false);
-                    }
-                }
-            } else {
-                applyExistingNonConflictingRelation(tagModel);
-            }
+        if (applyChanges()) {
+            ((GenericRelationEditor) editor).reloadDataFromRelation();
         }
     }
+
+    @Override
+    protected void updateEnabledState() {
+        setEnabled(isEditorDirty());
+    }
+
+    @Override
+    public void propertyChange(PropertyChangeEvent evt) {
+        updateEnabledState();
+    }
+
+    @Override
+    public void tableChanged(TableModelEvent e) {
+        updateEnabledState();
+    }
 }