Ticket #8969: non-persistent-checkbox.patch

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

@@ -55 +55 @@
     }
 
     /**
+     * Replies the preference value for the preference key "message." + <code>prefKey</code>.
+     * The default value if the preference key is missing is true.
+     *
+     * @param  prefKey the preference key
+     * @return the preference value for the preference key "message." + <code>prefKey</code>
+     */
+    public static boolean getNonPersistentDialogShowingEnabled(String prefKey) {
+        return Main.pref.getBoolean("message."+prefKey+"_nonPersistent", true);
+    }
+
+    /**
+     * sets the value for the preference key "message." + <code>prefKey</code>.
+     *
+     * @param prefKey the key
+     * @param enabled the value
+     */
+    public static void setNonPersistentDialogShowingEnabled(String prefKey, boolean enabled) {
+        Main.pref.put("message."+prefKey+"_nonPersistent", enabled);
+    }
+
+    /**
      * Returns the preference value for the preference key "message." + <code>prefKey</code> + ".value".
      * The default value if the preference key is missing is -1.
      *
@@ -76 +97 @@
     }
 
     /**
+     * Returns the preference value for the preference key "message." + <code>prefKey</code> + "_nonPersistent" + ".value".
+     * The default value if the preference key is missing is -1.
+     *
+     * @param  prefKey the preference key
+     * @return the preference value for the preference key "message." + <code>prefKey</code> + ".value"
+     */
+    public static Integer getNonPersistentDialogReturnValue(String prefKey) {
+        return Main.pref.getInteger("message."+prefKey+"_nonPersistent"+".value", -1);
+    }
+
+    /**
+     * sets the value for the preference key "message." + <code>prefKey</code> + "_nonPersistent" + ".value".
+     *
+     * @param prefKey the key
+     * @param value the value
+     */
+    public static void setNonPersistentDialogReturnValue(String prefKey, Integer value) {
+        Main.pref.putInteger("message."+prefKey+"_nonPersistent"+".value", value);
+    }
+
+    /**
      * Displays an confirmation dialog with some option buttons given by <code>optionType</code>.
      * It is always on top even if there are other open windows like detached dialogs,
      * relation editors, history browsers and the like.
@@ -102 +144 @@
      * @return the option selected by user. {@link JOptionPane#CLOSED_OPTION} if the dialog was closed.
      */
     static public int showOptionDialog(String preferenceKey, Component parent, Object message, String title, int optionType, int messageType, Object [] options, Object defaultOption) throws HeadlessException {
-        int ret = getDialogReturnValue(preferenceKey);
-        if (!getDialogShowingEnabled(preferenceKey) && ((ret == JOptionPane.YES_OPTION) || (ret == JOptionPane.NO_OPTION)))
+        int ret = getDialogReturnValue(preferenceKey) | getNonPersistentDialogReturnValue(preferenceKey);
+        if ((!getDialogShowingEnabled(preferenceKey) || !getNonPersistentDialogShowingEnabled(preferenceKey)) && ((ret == JOptionPane.YES_OPTION) || (ret == JOptionPane.NO_OPTION)))
             return ret;
         MessagePanel pnl = new MessagePanel(false, message);
         ret = JOptionPane.showOptionDialog(parent, pnl, title, optionType, messageType, null, options, defaultOption);
 
-        if (((ret == JOptionPane.YES_OPTION) || (ret == JOptionPane.NO_OPTION)) && !pnl.getDialogShowingEnabled()) {
-            setDialogShowingEnabled(preferenceKey, false);
-            setDialogReturnValue(preferenceKey, ret);
+        if ((ret == JOptionPane.YES_OPTION) || (ret == JOptionPane.NO_OPTION)) {
+            if(!pnl.getDialogShowingEnabled() ) {
+                setDialogShowingEnabled(preferenceKey, false);
+                setDialogReturnValue(preferenceKey, ret);
+            }
+            if( !pnl.getNonPersistentDialogShowingEnabled()) {
+                setNonPersistentDialogShowingEnabled(preferenceKey, false);
+                setNonPersistentDialogReturnValue(preferenceKey, ret);
+            }
         }
         return ret;
     }
@@ -196 +244 @@
      */
     private static class MessagePanel extends JPanel {
         JCheckBox cbShowDialog;
+        JCheckBox cbShowNonPersistentDialog;
 
         public MessagePanel(boolean donotshow, Object message) {
             cbShowDialog = new JCheckBox(tr("Do not show again (remembers choice)"));
             cbShowDialog.setSelected(donotshow);
+            cbShowNonPersistentDialog = new JCheckBox(tr("Do not show again (just this time)"));
+            cbShowNonPersistentDialog.setSelected(donotshow);
             setLayout(new GridBagLayout());
 
             if (message instanceof Component) {
@@ -207 +258 @@
             } else {
                 add(new JLabel(message.toString()),GBC.eop());
             }
-            add(cbShowDialog, GBC.eol());
+            add(cbShowDialog, GBC.std());
+            add(cbShowNonPersistentDialog, GBC.eol());
         }
 
         public boolean getDialogShowingEnabled() {
             return !cbShowDialog.isSelected();
         }
+
+        public boolean getNonPersistentDialogShowingEnabled() {
+            return !cbShowNonPersistentDialog.isSelected();
+        }
     }
 }

src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -769 +769 @@
             if (primitives == null || primitives.isEmpty())
                 return primitives;
             ArrayList<OsmPrimitive> ret = new ArrayList<OsmPrimitive>();
+            ConditionalOptionPaneUtil.setNonPersistentDialogShowingEnabled("add_primitive_to_relation", true);
+            ConditionalOptionPaneUtil.setNonPersistentDialogReturnValue("add_primitive_to_relation", 0);
             for (OsmPrimitive primitive : primitives) {
                 if (primitive instanceof Relation && getRelation() != null && getRelation().equals(primitive)) {
                     warnOfCircularReferences(primitive);
@@ -783 +785 @@
                     ret.add(primitive);
                 }
             }
+            ConditionalOptionPaneUtil.setNonPersistentDialogShowingEnabled("add_primitive_to_relation", true);
+            ConditionalOptionPaneUtil.setNonPersistentDialogReturnValue("add_primitive_to_relation", 0);
             return ret;
         }
     }