2003-06-06 Michael Koch <konqueror@gmx.de>

	* javax/swing/plaf/basic/BasicOptionPaneUI.java:
	More compile fixes from my stupid work yesterday.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67531 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8463d7a..67a4e6e 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-06  Michael Koch  <konqueror@gmx.de>
+
+       * javax/swing/plaf/basic/BasicOptionPaneUI.java:
+       More compile fixes from my stupid work yesterday.
+
 2003-06-05  Matt Kraai  <kraai@alumni.cmu.edu>
 
        * 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 (file)
--- 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<pane.getOptions().length; i++)
+               for (int i=0; i<options.length; i++)
                    {
-                       Object o = pane.getOptions()[i];
+                       Object o = options[i];
                        if (o != null)
                            {
                                if (o instanceof String)