Changeset 14685 in josm

Timestamp:

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

Author:

simon04

Message:

fix #14462 - Harmonize relation actions provided in popup menus

Location:

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

Files:

• RelationListDialog.java (modified) (11 diffs)
• SelectionListDialog.java (modified) (5 diffs)
• properties/PropertiesDialog.java (modified) (4 diffs)
• relation/RelationPopupMenus.java (added)

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

@@ -34 +34 @@
 
 import org.openstreetmap.josm.actions.ExpertToggleAction;
-import org.openstreetmap.josm.actions.IPrimitiveAction;
 import org.openstreetmap.josm.actions.relation.AddSelectionToRelations;
 import org.openstreetmap.josm.actions.relation.DeleteRelationsAction;
-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;
@@ -44 +41 @@
 import org.openstreetmap.josm.actions.relation.ExportRelationToGpxAction.Mode;
 import org.openstreetmap.josm.actions.relation.RecentRelationsAction;
-import org.openstreetmap.josm.actions.relation.SelectMembersAction;
+import org.openstreetmap.josm.actions.relation.SelectInRelationListAction;
 import org.openstreetmap.josm.actions.relation.SelectRelationAction;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -73 +70 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
+import org.openstreetmap.josm.gui.dialogs.relation.RelationPopupMenus;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
@@ -99 +97 @@
  */
 public class RelationListDialog extends ToggleDialog
-        implements DataSetListener, NavigatableComponent.ZoomChangeListener, ExpertToggleAction.ExpertModeChangeListener {
+        implements DataSetListener, NavigatableComponent.ZoomChangeListener {
     /** The display list. */
     private final JList<IRelation<?>> displaylist;
@@ -120 +118 @@
     /** the duplicate action */
     private final DuplicateRelationAction duplicateAction = new DuplicateRelationAction();
-    private final DownloadMembersAction downloadMembersAction = new DownloadMembersAction();
-    private final DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembersAction =
-            new DownloadSelectedIncompleteMembersAction();
-    private final SelectMembersAction selectMembersAction = new SelectMembersAction(false);
-    private final SelectMembersAction addMembersToSelectionAction = new SelectMembersAction(true);
+    /** the select relation action */
     private final SelectRelationAction selectRelationAction = new SelectRelationAction(false);
-    private final SelectRelationAction addRelationToSelectionAction = new SelectRelationAction(true);
     /** add all selected primitives to the given relations */
     private final AddSelectionToRelations addSelectionToRelations = new AddSelectionToRelations();
-    private transient JMenuItem addSelectionToRelationMenuItem;
 
     /** export relation to GPX track action */
@@ -245 +237 @@
         SelectionEventManager.getInstance().addSelectionListener(addSelectionToRelations);
         dataChanged(null);
-        ExpertToggleAction.addExpertModeChangeListener(this);
-        expertChanged(ExpertToggleAction.isExpert());
     }
 
@@ -256 +246 @@
         DatasetEventManager.getInstance().removeDatasetListener(this);
         SelectionEventManager.getInstance().removeSelectionListener(addSelectionToRelations);
-        ExpertToggleAction.removeExpertModeChangeListener(this);
     }
 
@@ -632 +621 @@
         List<JMenuItem> checkDisabled = new ArrayList<>();
 
-        // -- select action
-        popupMenuHandler.addAction(selectRelationAction);
-        popupMenuHandler.addAction(addRelationToSelectionAction);
-
-        // -- select members action
-        popupMenuHandler.addAction(selectMembersAction);
-        popupMenuHandler.addAction(addMembersToSelectionAction);
-
-        // -- download members action
-        popupMenuHandler.addSeparator();
-        popupMenuHandler.addAction(downloadMembersAction);
-        popupMenuHandler.addAction(downloadSelectedIncompleteMembersAction);
+        RelationPopupMenus.setupHandler(popupMenuHandler, SelectInRelationListAction.class);
 
         // -- export relation to gpx action
@@ -658 +636 @@
         popupMenuHandler.addAction(deleteRelationsAction).setVisible(false);
 
-        addSelectionToRelationMenuItem = popupMenuHandler.addAction(addSelectionToRelations);
+        ExpertToggleAction.addVisibilitySwitcher(popupMenuHandler.addAction(addSelectionToRelations));
 
         popupMenuHandler.addListener(new PopupMenuListener() {
@@ -664 +642 @@
             public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
                 for (JMenuItem mi: checkDisabled) {
-                    mi.setVisible(((IPrimitiveAction) mi.getAction()).isEnabled());
-
-                    Component sep = popupMenu.getComponent(
-                            Math.max(0, popupMenu.getComponentIndex(mi)-1));
+                    mi.setVisible(mi.getAction().isEnabled());
+                    Component sep = popupMenu.getComponent(Math.max(0, popupMenu.getComponentIndex(mi) - 1));
                     if (!(sep instanceof JMenuItem)) {
                         sep.setVisible(mi.isVisible());
@@ -770 +746 @@
         }
     }
-
-    @Override
-    public void expertChanged(boolean isExpert) {
-        addSelectionToRelationMenuItem.setVisible(isExpert);
-    }
 }

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);
     }
 

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

@@ -50 +50 @@
 
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.actions.relation.DownloadMembersAction;
-import org.openstreetmap.josm.actions.relation.DownloadSelectedIncompleteMembersAction;
-import org.openstreetmap.josm.actions.relation.SelectInRelationListAction;
-import org.openstreetmap.josm.actions.relation.SelectMembersAction;
-import org.openstreetmap.josm.actions.relation.SelectRelationAction;
+import org.openstreetmap.josm.actions.relation.DeleteRelationsAction;
+import org.openstreetmap.josm.actions.relation.EditRelationAction;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -90 +87 @@
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
+import org.openstreetmap.josm.gui.dialogs.relation.RelationPopupMenus;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
@@ -198 +196 @@
     private final JosmAction[] josmActions = new JosmAction[]{addAction, editAction, deleteAction};
 
-    // relation actions
-    private final SelectInRelationListAction setRelationSelectionAction = new SelectInRelationListAction();
-    private final SelectRelationAction selectRelationAction = new SelectRelationAction(false);
-    private final SelectRelationAction addRelationToSelectionAction = new SelectRelationAction(true);
-
-    private final DownloadMembersAction downloadMembersAction = new DownloadMembersAction();
-    private final DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembersAction =
-            new DownloadSelectedIncompleteMembersAction();
-
-    private final SelectMembersAction selectMembersAction = new SelectMembersAction(false);
-    private final SelectMembersAction addMembersToSelectionAction = new SelectMembersAction(true);
-
     private final transient HighlightHelper highlightHelper = new HighlightHelper();
 
@@ -371 +357 @@
             membershipMenu.addSeparator();
         }
-        membershipMenuHandler.addAction(setRelationSelectionAction);
-        membershipMenuHandler.addAction(selectRelationAction);
-        membershipMenuHandler.addAction(addRelationToSelectionAction);
-        membershipMenuHandler.addAction(selectMembersAction);
-        membershipMenuHandler.addAction(addMembersToSelectionAction);
-        membershipMenu.addSeparator();
-        membershipMenuHandler.addAction(downloadMembersAction);
-        membershipMenuHandler.addAction(downloadSelectedIncompleteMembersAction);
+        RelationPopupMenus.setupHandler(membershipMenuHandler, EditRelationAction.class, DeleteRelationsAction.class);
         membershipMenu.addSeparator();
         membershipMenu.add(helpAction);