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

Timestamp:

2014-03-28T21:34:47+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9864 - add "Add/Edit/Delete" entries to tags/memberships contextual menus. Can be disabled with properties.menu.add_edit_delete`.

File:

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

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

@@ -143 +143 @@
     private final JTable membershipTable = new JTable(membershipData);
 
+    /** JPanel containing both previous tables */
+    private final JPanel bothTables = new JPanel();
+
     // Popup menus
     private final JPopupMenu tagMenu = new JPopupMenu();
     private final JPopupMenu membershipMenu = new JPopupMenu();
+    private final JPopupMenu blankSpaceMenu = new JPopupMenu();
 
     // Popup menu handlers
     private final PopupMenuHandler tagMenuHandler = new PopupMenuHandler(tagMenu);
     private final PopupMenuHandler membershipMenuHandler = new PopupMenuHandler(membershipMenu);
+    private final PopupMenuHandler blankSpaceMenuHandler = new PopupMenuHandler(blankSpaceMenu);
 
     private final Map<String, Map<String, Integer>> valueCount = new TreeMap<String, Map<String, Integer>>();
@@ -235 +240 @@
 
         // combine both tables and wrap them in a scrollPane
-        JPanel bothTables = new JPanel();
         boolean top = Main.pref.getBoolean("properties.presets.top", true);
         bothTables.setLayout(new GridBagLayout());
@@ -251 +255 @@
             bothTables.add(presets, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2));
         }
-
+        
+        setupBlankSpaceMenu();
         setupKeyboardShortcuts();
 
-        // Let the action know when selection in the tables change
+        // Let the actions know when selection in the tables change
         tagTable.getSelectionModel().addListSelectionListener(editAction);
         membershipTable.getSelectionModel().addListSelectionListener(editAction);
@@ -260 +265 @@
         membershipTable.getSelectionModel().addListSelectionListener(deleteAction);
 
-
         JScrollPane scrollPane = (JScrollPane) createLayout(bothTables, true, Arrays.asList(new SideButton[] {
                 this.btnAdd, this.btnEdit, this.btnDel
@@ -280 +284 @@
     private void buildTagsTable() {
         // setting up the tags table
-
         tagData.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});
         tagTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
@@ -353 +356 @@
 
     /**
-     * creates the popup menu @field membershipMenu and its launcher on membership table
+     * Creates the popup menu @field blankSpaceMenu and its launcher on main panel.
+     */
+    private void setupBlankSpaceMenu() {
+        if (Main.pref.getBoolean("properties.menu.add_edit_delete", true)) {
+            blankSpaceMenuHandler.addAction(addAction);
+            PopupMenuLauncher launcher = new PopupMenuLauncher(blankSpaceMenu) {
+                @Override
+                protected boolean checkSelection(Component component, Point p) {
+                    if (component instanceof JTable) {
+                        return ((JTable) component).rowAtPoint(p) == -1;
+                    }
+                    return true;
+                }
+            };
+            bothTables.addMouseListener(launcher);
+            tagTable.addMouseListener(launcher);
+        }
+    }
+
+    /**
+     * Creates the popup menu @field membershipMenu and its launcher on membership table.
      */
     private void setupMembershipMenu() {
         // setting up the membership table
+        if (Main.pref.getBoolean("properties.menu.add_edit_delete", true)) {
+            membershipMenuHandler.addAction(editAction);
+            membershipMenuHandler.addAction(deleteAction);
+            membershipMenu.addSeparator();
+        }
         membershipMenuHandler.addAction(setRelationSelectionAction);
         membershipMenuHandler.addAction(selectRelationAction);
@@ -402 +430 @@
 
     /**
-     * creates the popup menu @field tagMenu and its launcher on tag table
+     * Creates the popup menu @field tagMenu and its launcher on tag table.
      */
     private void setupTagsMenu() {
+        if (Main.pref.getBoolean("properties.menu.add_edit_delete", true)) {
+            tagMenu.add(addAction);
+            tagMenu.add(editAction);
+            tagMenu.add(deleteAction);
+            tagMenu.addSeparator();
+        }
         tagMenu.add(pasteValueAction);
         tagMenu.add(copyValueAction);
@@ -418 +452 @@
 
     /**
-     * Assignas all needed keys like Enter and Spacebar to most important actions
+     * Assigns all needed keys like Enter and Spacebar to most important actions.
      */
     private void setupKeyboardShortcuts() {
@@ -649 +683 @@
         boolean hasTags = hasSelection && tagData.getRowCount() > 0;
         boolean hasMemberships = hasSelection && membershipData.getRowCount() > 0;
-        btnAdd.setEnabled(hasSelection);
-        btnEdit.setEnabled(hasTags || hasMemberships);
-        btnDel.setEnabled(hasTags || hasMemberships);
+        addAction.setEnabled(hasSelection);
+        editAction.setEnabled(hasTags || hasMemberships);
+        deleteAction.setEnabled(hasTags || hasMemberships);
         tagTable.setVisible(hasTags);
         tagTable.getTableHeader().setVisible(hasTags);
@@ -707 +741 @@
     }
 
+    /**
+     * Returns the selected tag.
+     * @return The current selected tag
+     */
     @SuppressWarnings("unchecked")
     public Tag getSelectedProperty() {
@@ -725 +763 @@
     }
 
+    /**
+     * Returns the selected relation membership.
+     * @return The current selected relation membership
+     */
     public IRelation getSelectedMembershipRelation() {
         int row = membershipTable.getSelectedRow();
@@ -774 +816 @@
             }
         }
-
     }