Changeset 14685 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

Timestamp:

2019-01-12T21:19:22+01:00 (5 years ago)

Author:

simon04

Message:

fix #14462 - Harmonize relation actions provided in popup menus

File:

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

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -40 +40 @@
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.AutoScaleAction.AutoScaleMode;
-import org.openstreetmap.josm.actions.relation.DownloadSelectedIncompleteMembersAction;
 import org.openstreetmap.josm.actions.relation.EditRelationAction;
-import org.openstreetmap.josm.actions.relation.SelectInRelationListAction;
 import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -72 +70 @@
 import org.openstreetmap.josm.gui.datatransfer.PrimitiveTransferable;
 import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
+import org.openstreetmap.josm.gui.dialogs.relation.RelationPopupMenus;
 import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
@@ -100 +99 @@
     private final ZoomToJOSMSelectionAction actZoomToJOSMSelection = new ZoomToJOSMSelectionAction();
     private final ZoomToListSelection actZoomToListSelection = new ZoomToListSelection();
-    private final SelectInRelationListAction actSetRelationSelection = new SelectInRelationListAction();
-    private final EditRelationAction actEditRelationSelection = new EditRelationAction();
-    private final DownloadSelectedIncompleteMembersAction actDownloadSelIncompleteMembers = new DownloadSelectedIncompleteMembersAction();
 
     /** the popup menu and its handler */
@@ -216 +212 @@
                 } else if (osm instanceof Relation) {
                     // else open relation editor if applicable
-                    actEditRelationSelection.actionPerformed(null);
+                    EditRelationAction.launchEditor((Relation) osm);
                 }
             } else if (highlightEnabled && MainApplication.isDisplayingMapView() && helper.highlightOnly(model.getElementAt(idx))) {
@@ -235 +231 @@
         handler.addAction(actZoomToListSelection);
         handler.addSeparator();
-        handler.addAction(actSetRelationSelection);
-        handler.addAction(actEditRelationSelection);
-        handler.addSeparator();
-        handler.addAction(actDownloadSelIncompleteMembers);
-        return handler;
+        return RelationPopupMenus.setupHandler(handler);
     }