Changeset 4459 in josm

Timestamp:

2011-09-24T12:19:54+02:00 (13 years ago)

Author:

bastiK

Message:

applied #6856 - Enable plugins to add actions in popup menus (patch by Don-vip)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/ChangesetDialog.java (modified) (6 diffs)
• dialogs/RelationListDialog.java (modified) (6 diffs)
• dialogs/SelectionListDialog.java (modified) (8 diffs)
• widgets/ListPopupMenu.java (added)

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

@@ -21 +21 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.JCheckBox;
 import javax.swing.JList;
+import javax.swing.JMenuItem;
 import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
@@ -51 +52 @@
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.io.CloseChangesetTask;
+import org.openstreetmap.josm.gui.widgets.ListPopupMenu;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.BugReportExceptionHandler;
@@ -83 +85 @@
     private CloseOpenChangesetsAction closeChangesetAction;
     private LaunchChangesetManagerAction launchChangesetManagerAction;
+    
+    private ChangesetDialogPopup popupMenu;
 
     protected void buildChangesetsLists() {
@@ -188 +192 @@
         selectObjectsAction = new SelectObjectsAction();
         cbInSelectionOnly.addItemListener(selectObjectsAction);
-        lstInActiveDataLayer.getSelectionModel().addListSelectionListener(selectObjectsAction);
-        lstInSelection.getSelectionModel().addListSelectionListener(selectObjectsAction);
 
         // -- read changesets action
         readChangesetAction = new ReadChangesetsAction();
         cbInSelectionOnly.addItemListener(readChangesetAction);
-        lstInActiveDataLayer.getSelectionModel().addListSelectionListener(readChangesetAction);
-        lstInSelection.getSelectionModel().addListSelectionListener(readChangesetAction);
 
         // -- close changesets action
         closeChangesetAction = new CloseOpenChangesetsAction();
         cbInSelectionOnly.addItemListener(closeChangesetAction);
-        lstInActiveDataLayer.getSelectionModel().addListSelectionListener(closeChangesetAction);
-        lstInSelection.getSelectionModel().addListSelectionListener(closeChangesetAction);
 
         // -- show info action
         showChangesetInfoAction = new ShowChangesetInfoAction();
         cbInSelectionOnly.addItemListener(showChangesetInfoAction);
-        lstInActiveDataLayer.getSelectionModel().addListSelectionListener(showChangesetInfoAction);
-        lstInSelection.getSelectionModel().addListSelectionListener(showChangesetInfoAction);
 
         // -- launch changeset manager action
         launchChangesetManagerAction = new LaunchChangesetManagerAction();
         cbInSelectionOnly.addItemListener(launchChangesetManagerAction);
-        lstInActiveDataLayer.getSelectionModel().addListSelectionListener(launchChangesetManagerAction);
-        lstInSelection.getSelectionModel().addListSelectionListener(launchChangesetManagerAction);
+        
+        popupMenu = new ChangesetDialogPopup(lstInActiveDataLayer, lstInSelection);
 
         createLayout(pnl, false, Arrays.asList(new SideButton[] {
@@ -536 +532 @@
                 }
             }
-            ChangesetDialogPopup popup = new ChangesetDialogPopup();
-            popup.show(lst, evt.getX(), evt.getY());
-
-        }
-    }
-
-    class ChangesetDialogPopup extends JPopupMenu {
-        public ChangesetDialogPopup() {
+            popupMenu.show(lst, evt.getX(), evt.getY());
+        }
+    }
+
+    class ChangesetDialogPopup extends ListPopupMenu {
+        public ChangesetDialogPopup(JList ... lists) {
+            super(lists);
             add(selectObjectsAction);
             addSeparator();
@@ -552 +547 @@
         }
     }
+
+    public void addPopupMenuSeparator() {
+        popupMenu.addSeparator();
+    }
+
+    public JMenuItem addPopupMenuAction(Action a) {
+        return popupMenu.add(a);
+    }
 }

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
 import java.awt.Point;
 import java.awt.event.ActionEvent;
@@ -22 +21 @@
 import javax.swing.AbstractAction;
 import javax.swing.AbstractListModel;
+import javax.swing.Action;
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.JList;
-import javax.swing.JPopupMenu;
+import javax.swing.JMenuItem;
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
@@ -56 +56 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.widgets.ListPopupMenu;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -142 +143 @@
         displaylist.getActionMap().put("deleteRelation", deleteAction);
 
-        popupMenu = new RelationDialogPopupMenu();
+        popupMenu = new RelationDialogPopupMenu(displaylist);
     }
 
@@ -777 +778 @@
     }
 
-    class RelationDialogPopupMenu extends JPopupMenu {
-        protected void build() {
+    class RelationDialogPopupMenu extends ListPopupMenu {
+
+        public RelationDialogPopupMenu(JList list) {
+            super(list);
+            
             // -- download members action
             //
-            DownloadMembersAction downloadMembersAction = new DownloadMembersAction();
-            displaylist.addListSelectionListener(downloadMembersAction);
-            add(downloadMembersAction);
+            add(new DownloadMembersAction());
 
             // -- download incomplete members action
             //
-            DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembers = new DownloadSelectedIncompleteMembersAction();
-            displaylist.addListSelectionListener(downloadSelectedIncompleteMembers);
-            add(downloadSelectedIncompleteMembers);
+            add(new DownloadSelectedIncompleteMembersAction());
 
             addSeparator();
@@ -795 +795 @@
             // -- select members action
             //
-            SelectMembersAction selectMembersAction = new SelectMembersAction(false);
-            displaylist.addListSelectionListener(selectMembersAction);
-            add(selectMembersAction);
-
-            selectMembersAction = new SelectMembersAction(true);
-            displaylist.addListSelectionListener(selectMembersAction);
-            add(selectMembersAction);
+            add(new SelectMembersAction(false));
+            add(new SelectMembersAction(true));
 
             // -- select action
             //
-            SelectAction selectAction = new SelectAction(false);
-            displaylist.addListSelectionListener(selectAction);
-            add(selectAction);
-
-            selectAction = new SelectAction(true);
-            displaylist.addListSelectionListener(selectAction);
-            add(selectAction);
-        }
-
-        public RelationDialogPopupMenu() {
-            build();
-        }
+            add(new SelectAction(false));
+            add(new SelectAction(true));
+        }
+    }
+
+    public void addPopupMenuSeparator() {
+        popupMenu.addSeparator();
+    }
+
+    public JMenuItem addPopupMenuAction(Action a) {
+        return popupMenu.add(a);
     }
 

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

@@ -24 +24 @@
 import javax.swing.AbstractAction;
 import javax.swing.AbstractListModel;
+import javax.swing.Action;
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.JList;
@@ -67 +68 @@
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.widgets.ListPopupMenu;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -86 +88 @@
     private EditRelationSelection actEditRelationSelection;
     private DownloadSelectedIncompleteMembersAction actDownloadSelectedIncompleteMembers;
+
+    private SelectionPopup popupMenu;
 
     /**
@@ -134 +138 @@
 
         actZoomToListSelection = new ZoomToListSelection();
-        lstPrimitives.getSelectionModel().addListSelectionListener(actZoomToListSelection);
-
         actSetRelationSelection = new SetRelationSelection();
-        lstPrimitives.getSelectionModel().addListSelectionListener(actSetRelationSelection);
-
         actEditRelationSelection = new EditRelationSelection();
-        lstPrimitives.getSelectionModel().addListSelectionListener(actEditRelationSelection);
-
         actDownloadSelectedIncompleteMembers = new DownloadSelectedIncompleteMembersAction();
-        lstPrimitives.getSelectionModel().addListSelectionListener(actDownloadSelectedIncompleteMembers);
 
         lstPrimitives.addMouseListener(new SelectionPopupMenuLauncher());
         lstPrimitives.addMouseListener(new DblClickHandler());
+        
+        popupMenu = new SelectionPopup(lstPrimitives);
     }
 
@@ -190 +189 @@
      */
     class SelectionPopupMenuLauncher extends PopupMenuLauncher {
-        private SelectionPopup popup = new SelectionPopup();
 
         @Override
@@ -199 +197 @@
                 model.setSelected(Collections.singleton((OsmPrimitive)model.getElementAt(idx)));
             }
-            popup.show(lstPrimitives, evt.getX(), evt.getY());
+            popupMenu.show(lstPrimitives, evt.getX(), evt.getY());
         }
     }
@@ -206 +204 @@
      * The popup menu for the selection list
      */
-    class SelectionPopup extends JPopupMenu {
-        public SelectionPopup() {
+    class SelectionPopup extends ListPopupMenu {
+        public SelectionPopup(JList list) {
+            super(list);
             add(actZoomToJOSMSelection);
             add(actZoomToListSelection);
@@ -216 +215 @@
             add(actDownloadSelectedIncompleteMembers);
         }
+    }
+
+    public void addPopupMenuSeparator() {
+        popupMenu.addSeparator();
+    }
+
+    public JMenuItem addPopupMenuAction(Action a) {
+        return popupMenu.add(a);
     }