Changeset 6595 in josm for trunk

Timestamp:

2014-01-02T01:23:15+01:00 (11 years ago)

Author:

simon04

Message:

see #8969 - add "Do not show again (this operation)" for "Really delete selection from relation"

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ConditionalOptionPaneUtil.java (modified) (4 diffs)
• ExtendedDialog.java (modified) (1 diff)
• dialogs/properties/PropertiesDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java

@@ -71 +71 @@
 
     /**
+     * Determines whether the key has been marked to be part of a bulk operation (in order to provide a "Do not show again (this operation)" option).
+     * @param prefKey the preference key
+     */
+    public static boolean isInBulkOperation(final String prefKey) {
+        return immediateActive.contains(prefKey);
+    }
+
+    /**
      * Marks the ending of a bulk operation. Removes the "Do not show again (this operation)" result value.
      * @param prefKey the preference key
@@ -109 +117 @@
         if (isYesOrNo(ret))
             return ret;
-        MessagePanel pnl = new MessagePanel(message, immediateActive.contains(preferenceKey));
+        MessagePanel pnl = new MessagePanel(message, isInBulkOperation(preferenceKey));
         ret = JOptionPane.showOptionDialog(parent, pnl, title, optionType, messageType, null, options, defaultOption);
         if (isYesOrNo(ret)) {
@@ -152 +160 @@
         if (isYesOrNo(ret))
             return ret == trueOption;
-        MessagePanel pnl = new MessagePanel(message, immediateActive.contains(preferenceKey));
+        MessagePanel pnl = new MessagePanel(message, isInBulkOperation(preferenceKey));
         ret = JOptionPane.showConfirmDialog(parent, pnl, title, optionType, messageType);
         if ((isYesOrNo(ret))) {
@@ -185 +193 @@
         if (getDialogReturnValue(preferenceKey) == Integer.MAX_VALUE)
             return;
-        MessagePanel pnl = new MessagePanel(message, immediateActive.contains(preferenceKey));
+        MessagePanel pnl = new MessagePanel(message, isInBulkOperation(preferenceKey));
         JOptionPane.showMessageDialog(parent, pnl, title, messageType);
         pnl.getNotShowAgain().store(preferenceKey, Integer.MAX_VALUE);

trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

@@ -370 +370 @@
 
         if (toggleable) {
-            togglePanel = new ConditionalOptionPaneUtil.MessagePanel(null, false);
+            togglePanel = new ConditionalOptionPaneUtil.MessagePanel(null, ConditionalOptionPaneUtil.isInBulkOperation(togglePref));
             gc.gridx = icon != null ? 1 : 0;
             gc.gridy = y++;

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

@@ -75 +75 @@
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
+import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -845 +846 @@
     class DeleteAction extends JosmAction implements ListSelectionListener {
 
+        static final String DELETE_FROM_RELATION_PREF = "delete_from_relation";
+
         public DeleteAction() {
             super(tr("Delete"), "dialogs/delete", tr("Delete the selected key in all objects"),
@@ -901 +904 @@
             ed.setButtonIcons(new String[] {"dialogs/delete.png", "cancel.png"});
             ed.setContent(tr("Really delete selection from relation {0}?", cur.getDisplayName(DefaultNameFormatter.getInstance())));
-            ed.toggleEnable("delete_from_relation");
+            ed.toggleEnable(DELETE_FROM_RELATION_PREF);
             ed.showDialog();
 
@@ -925 +928 @@
                 deleteTags(rows);
             } else if (membershipTable.getSelectedRowCount() > 0) {
+                ConditionalOptionPaneUtil.startBulkOperation(DELETE_FROM_RELATION_PREF);
                 int[] rows = membershipTable.getSelectedRows();
-                // delete from last relation to convserve row numbers in the table
+                // delete from last relation to conserve row numbers in the table
                 for (int i=rows.length-1; i>=0; i--) {
                     deleteFromRelation(rows[i]);
                 }
+                ConditionalOptionPaneUtil.endBulkOperation(DELETE_FROM_RELATION_PREF);
             }
         }