aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-06-06 06:21:02 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2003-06-06 06:21:02 +0000
commitb82a670a2018962389a1f0b408b077bbf1489d7d (patch)
tree7d77419af0f7f624ac99653360bb92fc2d37bd23
parenta35abc3ca3026d8140aadfee91aaca6572ab32e7 (diff)
downloadgcc-b82a670a2018962389a1f0b408b077bbf1489d7d.zip
gcc-b82a670a2018962389a1f0b408b077bbf1489d7d.tar.gz
gcc-b82a670a2018962389a1f0b408b077bbf1489d7d.tar.bz2
BasicOptionPaneUI.java: More compile fixes from my stupid work yesterday.
2003-06-06 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicOptionPaneUI.java: More compile fixes from my stupid work yesterday. From-SVN: r67531
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java9
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 <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
--- 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)