--- a/jdk/src/share/classes/javax/swing/JOptionPane.java Fri Feb 03 18:01:24 2012 +0400
+++ b/jdk/src/share/classes/javax/swing/JOptionPane.java Wed Feb 08 16:15:12 2012 +0400
@@ -34,7 +34,6 @@
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 @@
// 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);