diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-03-02 09:33:42 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-03-02 09:33:42 +0000 |
| commit | 9feea8b823c069addfda8b43e0c14c7f46d5be19 (patch) | |
| tree | 3b919f10a9486ca3469576d063409d5af42b7c1a /javax/swing/JOptionPane.java | |
| parent | 789bb86a1bfe9953bfeb6b5d9b08aaf58fd6e108 (diff) | |
| download | classpath-9feea8b823c069addfda8b43e0c14c7f46d5be19.tar.gz | |
2006-03-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD-->generics-branch for the period between
the 0.20 release and the tag generics-merge-20050225.
Diffstat (limited to 'javax/swing/JOptionPane.java')
| -rw-r--r-- | javax/swing/JOptionPane.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/javax/swing/JOptionPane.java b/javax/swing/JOptionPane.java index 057326cd2..705eca832 100644 --- a/javax/swing/JOptionPane.java +++ b/javax/swing/JOptionPane.java @@ -197,7 +197,7 @@ public class JOptionPane extends JComponent implements Accessible public static final String WANTS_INPUT_PROPERTY = "wantsInput"; /** The value returned when the inputValue is uninitialized. */ - public static Object UNINITIALIZED_VALUE = "uninitializedValue"; + public static final Object UNINITIALIZED_VALUE = "uninitializedValue"; /** The icon displayed in the dialog/internal frame. */ protected Icon icon; @@ -236,7 +236,7 @@ public class JOptionPane extends JComponent implements Accessible protected boolean wantsInput; /** The common frame used when no parent is provided. */ - private static Frame privFrame = SwingUtilities.getOwnerFrame(); + private static Frame privFrame = (Frame) SwingUtilities.getOwnerFrame(null); /** * Creates a new JOptionPane object using a message of "JOptionPane |