Changeset 4484 in josm

Timestamp:

Oct 2, 2011 10:14:54 PM (20 months ago)

Author:

Don-vip

Message:

see #6856 - Enable plugins to add actions in popup menus (PropertiesDialog)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (10 diffs)

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

@@ -40 +40 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.Box;
 import javax.swing.DefaultListCellRenderer;
@@ -47 +48 @@
 import javax.swing.JLabel;
 import javax.swing.JList;
+import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -163 +165 @@
     // button in the upper right corner of this dialog
     public static JPanel pluginHook = new JPanel();
+    
+    private JPopupMenu propertyMenu;
+    private JPopupMenu membershipMenu;
 
     private final Map<String, Map<String, Integer>> valueCount = new TreeMap<String, Map<String, Integer>>();
@@ -610 +615 @@
 
         // setting up the properties table
+        propertyMenu = new JPopupMenu();
+        propertyMenu.add(copyValueAction);
+        propertyMenu.add(copyKeyValueAction);
+        propertyMenu.add(copyAllKeyValueAction);
+        propertyMenu.addSeparator();
+        propertyMenu.add(helpAction);
+        
         propertyData.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});
         propertyTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -620 +632 @@
                 if (row > -1) {
                     propertyTable.changeSelection(row, 0, false, false);
-                    JPopupMenu menu = new JPopupMenu();
-                    menu.add(copyValueAction);
-                    menu.add(copyKeyValueAction);
-                    menu.add(copyAllKeyValueAction);
-                    menu.addSeparator();
-                    menu.add(helpAction);
-                    menu.show(propertyTable, p.x, p.y-3);
+                    propertyMenu.show(propertyTable, p.x, p.y-3);
                 }
             }
@@ -658 +664 @@
 
         // setting up the membership table
+        membershipMenu = new JPopupMenu();
+        membershipMenu.add(new SelectRelationAction(true));
+        membershipMenu.add(new SelectRelationAction(false));
+        membershipMenu.add(new SelectRelationMembersAction());
+        membershipMenu.add(new DownloadIncompleteMembersAction());
+        membershipMenu.addSeparator();
+        membershipMenu.add(helpAction);
 
         membershipData.setColumnIdentifiers(new String[]{tr("Member Of"),tr("Role"),tr("Position")});
@@ -668 +681 @@
                 if (row > -1) {
                     membershipTable.changeSelection(row, 0, false, false);
-                    JPopupMenu menu = new JPopupMenu();
                     Relation relation = (Relation)membershipData.getValueAt(row, 0);
-                    menu.add(new SelectRelationAction(relation, true));
-                    menu.add(new SelectRelationAction(relation, false));
-                    menu.add(new SelectRelationMembersAction(relation));
-                    menu.add(new DownloadIncompleteMembersAction(relation));
-                    menu.addSeparator();
-                    menu.add(helpAction);
-                    menu.show(membershipTable, p.x, p.y-3);
+                    for (Component c : membershipMenu.getComponents()) {
+                        if (c instanceof JMenuItem) {
+                            Action action = ((JMenuItem) c).getAction();
+                            if (action instanceof RelationRelated) {
+                                ((RelationRelated)action).setRelation(relation);
+                            }
+                        }
+                    }
+                    membershipMenu.show(membershipTable, p.x, p.y-3);
                 }
             }
@@ -1223 +1237 @@
     }
 
-    static class SelectRelationAction extends AbstractAction {
+    public void addPropertyPopupMenuSeparator() {
+        propertyMenu.addSeparator();
+    }
+
+    public JMenuItem addPropertyPopupMenuAction(Action a) {
+        return propertyMenu.add(a);
+    }
+    
+    public void addMembershipPopupMenuSeparator() {
+        membershipMenu.addSeparator();
+    }
+
+    public JMenuItem addMembershipPopupMenuAction(Action a) {
+        return membershipMenu.add(a);
+    }
+    
+    public static interface RelationRelated {
+        public Relation getRelation();
+        public void setRelation(Relation relation);
+    }
+    
+    static abstract class AbstractRelationAction extends AbstractAction implements RelationRelated {
+        protected Relation relation;
+        public Relation getRelation() {
+            return this.relation;
+        }
+        public void setRelation(Relation relation) {
+            this.relation = relation;
+        }
+    }
+    
+    static class SelectRelationAction extends AbstractRelationAction {
         boolean selectionmode;
-        Relation relation;
-        public SelectRelationAction(Relation r, boolean select) {
+        public SelectRelationAction(boolean select) {
             selectionmode = select;
-            relation = r;
             if(select) {
                 putValue(NAME, tr("Select relation"));
@@ -1255 +1298 @@
      *
      */
-    class SelectRelationMembersAction extends AbstractAction {
-        Relation relation;
-        public SelectRelationMembersAction(Relation r) {
-            relation = r;
+    class SelectRelationMembersAction extends AbstractRelationAction {
+        public SelectRelationMembersAction() {
             putValue(SHORT_DESCRIPTION,tr("Select the members of selected relation"));
             putValue(SMALL_ICON, ImageProvider.get("selectall"));
@@ -1276 +1317 @@
      *
      */
-    class DownloadIncompleteMembersAction extends AbstractAction {
-        Relation relation;
-        public DownloadIncompleteMembersAction(Relation r) {
-            relation = r;
+    class DownloadIncompleteMembersAction extends AbstractRelationAction {
+        public DownloadIncompleteMembersAction() {
             putValue(SHORT_DESCRIPTION, tr("Download incomplete members of selected relations"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected"));