From cb3f7f8a11b0a6b219849f256932074bbab63c07 Mon Sep 17 00:00:00 2001
From: rupashka <unknown>
Date: Wed, 8 Feb 2012 16:15:12 +0400
Subject: [PATCH] 7138665: JOptionPane.getValue() unexpected change between JRE
 1.6 and JRE 1.7 Reviewed-by: alexp

---
 .../classes/javax/swing/JOptionPane.java      |  4 +-
 .../swing/plaf/basic/BasicOptionPaneUI.java   |  1 +
 .../swing/JOptionPane/7138665/bug7138665.java | 70 +++++++++++++++++++
 3 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 test/javax/swing/JOptionPane/7138665/bug7138665.java

diff --git a/src/share/classes/javax/swing/JOptionPane.java b/src/share/classes/javax/swing/JOptionPane.java
index 9849c37b1..c532cf619 100644
--- a/src/share/classes/javax/swing/JOptionPane.java
+++ b/src/share/classes/javax/swing/JOptionPane.java
@@ -34,7 +34,6 @@ import java.awt.KeyboardFocusManager;
 import java.awt.Frame;
 import java.awt.Point;
 import java.awt.HeadlessException;
-import java.awt.Toolkit;
 import java.awt.Window;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -994,8 +993,7 @@ public class JOptionPane extends JComponent implements Accessible
                 // if the user closed the window without selecting a button
                 // (newValue = null in that case).  Otherwise, close the dialog.
                 if (dialog.isVisible() && event.getSource() == JOptionPane.this &&
-                        (event.getPropertyName().equals(VALUE_PROPERTY) ||
-                                event.getPropertyName().equals(INPUT_VALUE_PROPERTY)) &&
+                        (event.getPropertyName().equals(VALUE_PROPERTY)) &&
                         event.getNewValue() != null &&
                         event.getNewValue() != JOptionPane.UNINITIALIZED_VALUE) {
                     dialog.setVisible(false);
diff --git a/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java b/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
index 6a0b024ce..444b903dd 100644
--- a/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
@@ -1236,6 +1236,7 @@ public class BasicOptionPaneUI extends OptionPaneUI {
                 int       index = list.locationToIndex(e.getPoint());
 
                 optionPane.setInputValue(list.getModel().getElementAt(index));
+                optionPane.setValue(JOptionPane.OK_OPTION);
             }
         }
 
diff --git a/test/javax/swing/JOptionPane/7138665/bug7138665.java b/test/javax/swing/JOptionPane/7138665/bug7138665.java
new file mode 100644
index 000000000..44d408453
--- /dev/null
+++ b/test/javax/swing/JOptionPane/7138665/bug7138665.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+   @bug 7138665
+   @summary JOptionPane.getValue() unexpected change between JRE 1.6 and JRE 1.7
+   @author Pavel Porvatov
+*/
+
+import sun.awt.SunToolkit;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+
+public class bug7138665 {
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                JOptionPane pane = new JOptionPane("Enter value", JOptionPane.QUESTION_MESSAGE,
+                        JOptionPane.OK_CANCEL_OPTION, null, null, null);
+                pane.setWantsInput(true);
+
+                JDialog dialog = pane.createDialog(null, "My Dialog");
+                dialog.setVisible(true);
+
+                Object result = pane.getValue();
+
+                if (result == null || ((Integer) result).intValue() != JOptionPane.OK_OPTION) {
+                    throw new RuntimeException("Invalid result: " + result);
+                }
+
+                System.out.println("Test bug7138665 passed");
+            }
+        });
+
+        SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+
+        toolkit.realSync();
+
+        Robot robot = new Robot();
+
+        robot.setAutoDelay(100);
+        robot.keyPress(KeyEvent.VK_ENTER);
+        robot.keyRelease(KeyEvent.VK_ENTER);
+
+        toolkit.realSync();
+    }
+}
-- 
GitLab