diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-06 06:21:02 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-06 06:21:02 +0000 |
| commit | ac2daf9f6714ec8e0da66fb2690c0bd5bf917a3b (patch) | |
| tree | 7d77419af0f7f624ac99653360bb92fc2d37bd23 | |
| parent | a6f6d86d251dd16c0019e4be9eab8b5aa213f984 (diff) | |
| download | gcc-ac2daf9f6714ec8e0da66fb2690c0bd5bf917a3b.tar.gz | |
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
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8463d7a0bf6..67a4e6e0d0f 100644 --- 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 1e3a3ebbb71..c2bd0ae257c 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<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) |