Remove use of deprecated Integer constructor in NotifyDescriptor

This change keeps the existing value relationship with JOptionPane
int constants, which involves managing YES and OK now having the
same identity. It is no longer possible to maintain both aspects.

Author: neilcsmith-net

platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java

@@ -661,13 +661,16 @@ protected final void initializeButtons() {
             }
             currentPrimaryButtons = new Component [primaryOptions.length];
             for (int i = 0; i < primaryOptions.length; i++) {
-                if (primaryOptions[i] == NotifyDescriptor.YES_OPTION) {
-                    currentPrimaryButtons[i] = stdYesButton;
+                if (primaryOptions[i] == NotifyDescriptor.OK_OPTION ||
+                        primaryOptions[i] == NotifyDescriptor.YES_OPTION) {
+                    if (Arrays.asList(primaryOptions).contains(NotifyDescriptor.NO_OPTION)) {
+                        currentPrimaryButtons[i] = stdYesButton;
+                    } else {
+                        currentPrimaryButtons[i] = stdOKButton;
+                        stdOKButton.setEnabled(descriptor.isValid());
+                    }
                 } else if (primaryOptions[i] == NotifyDescriptor.NO_OPTION) {
                     currentPrimaryButtons[i] = stdNoButton;
-                } else if (primaryOptions[i] == NotifyDescriptor.OK_OPTION) {
-                    currentPrimaryButtons[i] = stdOKButton;
-                    stdOKButton.setEnabled(descriptor.isValid());
                 } else if (primaryOptions[i] == NotifyDescriptor.CANCEL_OPTION) {
                     currentPrimaryButtons[i] = stdCancelButton;
                 } else if (primaryOptions[i] == NotifyDescriptor.CLOSED_OPTION) {

platform/openide.dialogs/src/org/openide/NotifyDescriptor.java

@@ -134,19 +134,19 @@ public class NotifyDescriptor extends Object {
     //
 
     /** Return value if YES is chosen. */
-    public static final Object YES_OPTION = new Integer(JOptionPane.YES_OPTION);
+    public static final Object YES_OPTION = JOptionPane.YES_OPTION;
 
     /** Return value if NO is chosen. */
-    public static final Object NO_OPTION = new Integer(JOptionPane.NO_OPTION);
+    public static final Object NO_OPTION = JOptionPane.NO_OPTION;
 
     /** Return value if CANCEL is chosen. */
-    public static final Object CANCEL_OPTION = new Integer(JOptionPane.CANCEL_OPTION);
+    public static final Object CANCEL_OPTION = JOptionPane.CANCEL_OPTION;
 
     /** Return value if OK is chosen. */
-    public static final Object OK_OPTION = new Integer(JOptionPane.OK_OPTION);
+    public static final Object OK_OPTION = JOptionPane.OK_OPTION;
 
     /** Return value if user closes the window without pressing any button. */
-    public static final Object CLOSED_OPTION = new Integer(JOptionPane.CLOSED_OPTION);
+    public static final Object CLOSED_OPTION = JOptionPane.CLOSED_OPTION;
 
     //
     // Option types