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

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

@@ -11 +11 @@
 import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor.AddAbortException;
-import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
-import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
-import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.SelectionTable;
-import org.openstreetmap.josm.gui.dialogs.relation.SelectionTableModel;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 /**
@@ -23 +17 @@
  */
 abstract class AddFromSelectionAction extends AbstractRelationEditorAction {
+        private static final long serialVersionUID = 1L;
 
-    protected final SelectionTable selectionTable;
-    protected final SelectionTableModel selectionTableModel;
-
-    protected AddFromSelectionAction(MemberTable memberTable, MemberTableModel memberTableModel, SelectionTable selectionTable,
-            SelectionTableModel selectionTableModel, String actionMapKey, OsmDataLayer layer, IRelationEditor editor) {
-        super(memberTable, memberTableModel, actionMapKey, layer, editor);
-        this.selectionTable = selectionTable;
-        this.selectionTableModel = selectionTableModel;
+    protected AddFromSelectionAction(IRelationEditorActionAccess editorAccess,
+                        IRelationEditorUpdateOn... updateOn) {
+        super(editorAccess, updateOn);
     }
 
     protected boolean isPotentialDuplicate(OsmPrimitive primitive) {
-        return memberTableModel.hasMembersReferringTo(Collections.singleton(primitive));
+        return editorAccess.getMemberTableModel().hasMembersReferringTo(Collections.singleton(primitive));
     }
 
@@ -44 +34 @@
         ConditionalOptionPaneUtil.startBulkOperation("add_primitive_to_relation");
         for (OsmPrimitive primitive : primitives) {
-            if (primitive instanceof Relation && editor.getRelation() != null && editor.getRelation().equals(primitive)) {
+            if (primitive instanceof Relation && editorAccess.getEditor().getRelation() != null && editorAccess.getEditor().getRelation().equals(primitive)) {
                 GenericRelationEditor.warnOfCircularReferences(primitive);
                 continue;