From b82a670a2018962389a1f0b408b077bbf1489d7d Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 6 Jun 2003 06:21:02 +0000 Subject: [PATCH] BasicOptionPaneUI.java: More compile fixes from my stupid work yesterday. 2003-06-06 Michael Koch * javax/swing/plaf/basic/BasicOptionPaneUI.java: More compile fixes from my stupid work yesterday. From-SVN: r67531 --- libjava/ChangeLog | 5 +++++ libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8463d7a..67a4e6e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-06-06 Michael Koch + + * javax/swing/plaf/basic/BasicOptionPaneUI.java: + More compile fixes from my stupid work yesterday. + 2003-06-05 Matt Kraai * java/lang/w_exp.c (o_threshold, u_threshold): Define only diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java index 1e3a3eb..c2bd0ae 100644 --- a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java +++ b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java @@ -64,7 +64,7 @@ public class BasicOptionPaneUI extends OptionPaneUI System.out.println(" -------------: " + pane); - JLabel message = pane.getMessage() != null ? new JLabel((String)pane.getMessage()) : null; + JLabel message = null; JButton ok_button = new JButton("Ok"); ok_button.addActionListener(new ActionListener() @@ -83,11 +83,12 @@ public class BasicOptionPaneUI extends OptionPaneUI } }); - if (pane.getOptions() != null) + Object[] options = null; + if (options != null) { - for (int i=0; i