Changeset 14027 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAfterSelection.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/AddSelectedAfterSelection.java (modified) (5 diffs)

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

@@ -7 +7 @@
 
 import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor.AddAbortException;
-import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
-import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.SelectionTableModel;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
@@ -18 +15 @@
  */
 public class AddSelectedAfterSelection extends AddFromSelectionAction {
+        private static final long serialVersionUID = 1L;
 
     /**
@@ -25 +23 @@
      * @param editor relation editor
      */
-    public AddSelectedAfterSelection(MemberTableModel memberTableModel, SelectionTableModel selectionTableModel, IRelationEditor editor) {
-        super(null, memberTableModel, null, selectionTableModel, null, null, editor);
+    public AddSelectedAfterSelection(IRelationEditorActionAccess editorAccess) {
+        super(editorAccess, IRelationEditorUpdateOn.MEMBER_TABLE_SELECTION, IRelationEditorUpdateOn.SELECTION_TABLE_CHANGE);
         putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset after the last selected member"));
         new ImageProvider("dialogs/conflict", "copyaftercurrentright").getResource().attachImageIcon(this, true);
@@ -34 +32 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(selectionTableModel.getRowCount() > 0 && memberTableModel.getSelectionModel().getMinSelectionIndex() >= 0);
+                setEnabled(getSelectionTableModel().getRowCount() > 0
+                                && getMemberTableModel().getSelectionModel().getMinSelectionIndex() >= 0);
     }
 
@@ -40 +39 @@
     public void actionPerformed(ActionEvent e) {
         try {
-            memberTableModel.addMembersAfterIdx(filterConfirmedPrimitives(selectionTableModel.getSelection()),
-                    memberTableModel.getSelectionModel().getMaxSelectionIndex());
+                getMemberTableModel().addMembersAfterIdx(filterConfirmedPrimitives(getSelectionTableModel().getSelection()),
+                                getMemberTableModel().getSelectionModel().getMaxSelectionIndex());
         } catch (AddAbortException ex) {
             Logging.trace(ex);