Changeset 16189 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-03-21T22:44:38+01:00 (5 years ago)

Author:

simon04

Message:

fix #18692 - Show Duplicate relation in context menu

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• properties/PropertiesDialog.java (modified) (2 diffs)
• relation/ChildRelationBrowser.java (modified) (2 diffs)
• relation/RelationPopupMenus.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -54 +54 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.relation.DeleteRelationsAction;
+import org.openstreetmap.josm.actions.relation.DuplicateRelationAction;
 import org.openstreetmap.josm.actions.relation.EditRelationAction;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -392 +393 @@
             membershipMenu.addSeparator();
         }
-        RelationPopupMenus.setupHandler(membershipMenuHandler, EditRelationAction.class, DeleteRelationsAction.class);
+        RelationPopupMenus.setupHandler(membershipMenuHandler,
+                EditRelationAction.class, DuplicateRelationAction.class, DeleteRelationsAction.class);
         membershipMenu.addSeparator();
         membershipMenu.add(helpRelAction);

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

@@ -41 +41 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.PopupMenuHandler;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.DuplicateRelationAction;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -93 +94 @@
         final JPopupMenu popupMenu = new JPopupMenu();
         final PopupMenuHandler popupMenuHandler = new PopupMenuHandler(popupMenu);
-        RelationPopupMenus.setupHandler(popupMenuHandler);
+        RelationPopupMenus.setupHandler(popupMenuHandler, DuplicateRelationAction.class);
 
         add(buildButtonPanel(), BorderLayout.SOUTH);

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationPopupMenus.java

@@ -10 +10 @@
 import org.openstreetmap.josm.actions.relation.DownloadMembersAction;
 import org.openstreetmap.josm.actions.relation.DownloadSelectedIncompleteMembersAction;
+import org.openstreetmap.josm.actions.relation.DuplicateRelationAction;
 import org.openstreetmap.josm.actions.relation.EditRelationAction;
 import org.openstreetmap.josm.actions.relation.SelectInRelationListAction;
@@ -38 +39 @@
         }
 
+        if (!exclude.contains(DuplicateRelationAction.class)) {
+            menu.addAction(new DuplicateRelationAction());
+        }
+
         if (!exclude.contains(DeleteRelationsAction.class)) {
             menu.addAction(new DeleteRelationsAction());