Changeset 14027 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RemoveSelectedAction.java

Timestamp:

2018-07-12T23:02:02+02:00 (6 years ago)

Author:

michael2402

Message:

See #16388: New mechanism for plugins to register relation editor actions.

File:

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

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

@@ -7 +7 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.SelectionTableModel;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -17 +14 @@
  */
 public class RemoveSelectedAction extends AddFromSelectionAction {
+        private static final long serialVersionUID = 1L;
 
     /**
@@ -24 +22 @@
      * @param layer OSM data layer
      */
-    public RemoveSelectedAction(MemberTableModel memberTableModel, SelectionTableModel selectionTableModel, OsmDataLayer layer) {
-        super(null, memberTableModel, null, selectionTableModel, null, layer, null);
+    public RemoveSelectedAction(IRelationEditorActionAccess editorAccess) {
+        super(editorAccess, IRelationEditorUpdateOn.SELECTION_TABLE_CHANGE);
         putValue(SHORT_DESCRIPTION, tr("Remove all members referring to one of the selected objects"));
         new ImageProvider("dialogs/relation", "deletemembers").getResource().attachImageIcon(this, true);
@@ -33 +31 @@
     @Override
     protected void updateEnabledState() {
-        DataSet ds = layer.data;
+        DataSet ds = getLayer().data;
         if (ds == null || ds.selectionEmpty()) {
             setEnabled(false);
@@ -39 +37 @@
         }
         // only enable the action if we have members referring to the selected primitives
-        setEnabled(memberTableModel.hasMembersReferringTo(ds.getSelected()));
+        setEnabled(editorAccess.getMemberTableModel().hasMembersReferringTo(ds.getSelected()));
     }
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        memberTableModel.removeMembersReferringTo(selectionTableModel.getSelection());
+        editorAccess.getMemberTableModel().removeMembersReferringTo(getSelectionTableModel().getSelection());
     }
 }