Changeset 5825 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2013-04-04T18:44:54+02:00 (11 years ago)

Author:

akks

Message:

fix #8574: relation list dialog side buttons din not work
Сontext menu unification (see #7846): relation list and membership table of properties dialog

Location:

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

Files:

• RelationListDialog.java (modified) (2 diffs)
• SelectionListDialog.java (modified) (6 diffs)
• properties/PropertiesDialog.java (modified) (4 diffs)

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

@@ -605 +605 @@
     private final void setupPopupMenuHandler() {
         
-        // -- download members action
-        popupMenuHandler.addAction(downloadMembersAction);
-
-        // -- download incomplete members action
-        popupMenuHandler.addAction(downloadSelectedIncompleteMembersAction);
-
-        popupMenuHandler.addSeparator();
+        // -- select action
+        popupMenuHandler.addAction(selectRelationAction);
+        popupMenuHandler.addAction(addRelationToSelectionAction);
 
         // -- select members action
@@ -617 +613 @@
         popupMenuHandler.addAction(addMembersToSelectionAction);
 
-        // -- select action
-        popupMenuHandler.addAction(selectRelationAction);
-        popupMenuHandler.addAction(addRelationToSelectionAction);
-
         popupMenuHandler.addSeparator();
-
+        // -- download members action
+        popupMenuHandler.addAction(downloadMembersAction);
+
+        // -- download incomplete members action
+        popupMenuHandler.addAction(downloadSelectedIncompleteMembersAction);
+
+        popupMenuHandler.addSeparator();
+        popupMenuHandler.addAction(editAction).setVisible(false);
+        popupMenuHandler.addAction(duplicateAction).setVisible(false);
+        popupMenuHandler.addAction(deleteRelationsAction).setVisible(false);
+        
         popupMenuHandler.addAction(addSelectionToRelations);
     }

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

@@ -81 +81 @@
 public class SelectionListDialog extends ToggleDialog  {
     private JList lstPrimitives;
-    private SelectionListModel model;
-
-    private SelectAction actSelect;
-    private SearchAction actSearch;
-    private ZoomToJOSMSelectionAction actZoomToJOSMSelection;
-    private ZoomToListSelection actZoomToListSelection;
-    private SelectInRelationListAction actSetRelationSelection;
-    private EditRelationAction actEditRelationSelection;
-    private DownloadSelectedIncompleteMembersAction actDownloadSelectedIncompleteMembers;
+    private DefaultListSelectionModel selectionModel  = new DefaultListSelectionModel();
+    private SelectionListModel model = new SelectionListModel(selectionModel);
+
+    private SelectAction actSelect = new SelectAction();
+    private SearchAction actSearch = new SearchAction();
+    private ZoomToJOSMSelectionAction actZoomToJOSMSelection = new ZoomToJOSMSelectionAction();
+    private ZoomToListSelection actZoomToListSelection = new ZoomToListSelection();
+    private SelectInRelationListAction actSetRelationSelection = new SelectInRelationListAction();
+    private EditRelationAction actEditRelationSelection = new EditRelationAction();
+    private DownloadSelectedIncompleteMembersAction actDownloadSelectedIncompleteMembers = new DownloadSelectedIncompleteMembersAction();
 
     /** the popup menu and its handler */
@@ -99 +100 @@
      */
     protected void buildContentPanel() {
-        DefaultListSelectionModel selectionModel  = new DefaultListSelectionModel();
-        model = new SelectionListModel(selectionModel);
         lstPrimitives = new JList(model);
         lstPrimitives.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
@@ -108 +107 @@
 
         // the select action
-        final SideButton selectButton = new SideButton(actSelect = new SelectAction());
+        final SideButton selectButton = new SideButton(actSelect);
         lstPrimitives.getSelectionModel().addListSelectionListener(actSelect);
         selectButton.createArrow(new ActionListener() {
@@ -118 +117 @@
 
         // the search button
-        final SideButton searchButton = new SideButton(actSearch = new SearchAction());
+        final SideButton searchButton = new SideButton(actSearch);
         searchButton.createArrow(new ActionListener() {
             @Override
@@ -141 +140 @@
         buildContentPanel();
         model.addListDataListener(new TitleUpdater());
-        actZoomToJOSMSelection = new ZoomToJOSMSelectionAction();
         model.addListDataListener(actZoomToJOSMSelection);
-
-        actZoomToListSelection = new ZoomToListSelection();
-        actSetRelationSelection = new SelectInRelationListAction();
-        actEditRelationSelection = new EditRelationAction();
-        actDownloadSelectedIncompleteMembers = new DownloadSelectedIncompleteMembersAction();
 
         popupMenu = new ListPopupMenu(lstPrimitives);
@@ -219 +212 @@
     }
 
-    private final PopupMenuHandler setupPopupMenuHandler() {
+    private PopupMenuHandler setupPopupMenuHandler() {
         PopupMenuHandler handler = new PopupMenuHandler(popupMenu);
         handler.addAction(actZoomToJOSMSelection);

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

@@ -49 +49 @@
 import org.openstreetmap.josm.Main;
 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;
@@ -162 +164 @@
 
     // 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 SelectRelationAction addRelationToSelectionAction = new SelectRelationAction(true);
+    
+    private final SelectMembersAction selectMembersAction = new SelectMembersAction(false);
     private final SelectMembersAction addMembersToSelectionAction = new SelectMembersAction(true);
-    private final SelectRelationAction selectRelationAction = new SelectRelationAction(false);
     
     /**
@@ -376 +383 @@
     private void setupMembershipMenu() {
         // setting up the membership table
+        membershipMenuHandler.addAction(setRelationSelectionAction);
+        membershipMenuHandler.addAction(selectRelationAction);
         membershipMenuHandler.addAction(addRelationToSelectionAction);
-        membershipMenuHandler.addAction(selectRelationAction);
+        membershipMenuHandler.addAction(selectMembersAction);
         membershipMenuHandler.addAction(addMembersToSelectionAction);
+        membershipMenu.addSeparator();
+        membershipMenuHandler.addAction(downloadMembersAction);
         membershipMenuHandler.addAction(downloadSelectedIncompleteMembersAction);
         membershipMenu.addSeparator();
@@ -695 +706 @@
     // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Methods that are called by plugins to extend fuctionalty ">
+    // <editor-fold defaultstate="collapsed" desc="Methods that are called by plugins to extend fuctionality ">
     
     /**