diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-05 21:18:31 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-05 21:18:31 +0000 |
| commit | aa02dd93620b2e2adc36b239c79543906d0e6565 (patch) | |
| tree | 8af17739fc99431e6ab3a3c0699881f817cb1ecf /libjava/javax/swing/plaf/basic | |
| parent | 62a17411f9c605aa2af1746290bc2669587c39fd (diff) | |
| download | gcc-aa02dd93620b2e2adc36b239c79543906d0e6565.tar.gz | |
2003-06-05 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/BorderUIResource.java,
javax/swing/plaf/basic/BasicDefaults.java,
javax/swing/plaf/basic/BasicOptionPaneUI.java:
More compile fixes for latest Border commit. I should not commit
something in this heat here ...
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67513 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/javax/swing/plaf/basic')
| -rw-r--r-- | libjava/javax/swing/plaf/basic/BasicDefaults.java | 4 | ||||
| -rw-r--r-- | libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libjava/javax/swing/plaf/basic/BasicDefaults.java b/libjava/javax/swing/plaf/basic/BasicDefaults.java index 5bfb5d96106..1be8d5bdf84 100644 --- a/libjava/javax/swing/plaf/basic/BasicDefaults.java +++ b/libjava/javax/swing/plaf/basic/BasicDefaults.java @@ -48,7 +48,7 @@ class BasicBorder extends MatteBorder BasicBorder() { - super(5,5,5,5, null); + super(5,5,5,5, Color.black); } public void paintBorder(Component c, @@ -72,7 +72,7 @@ class PanelBorder extends MatteBorder { PanelBorder() { - super(5,5,5,5, null); + super(5,5,5,5, Color.black); } public void paintBorder(Component c, diff --git a/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java b/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java index e3023a85473..1e3a3ebbb71 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.msg != null ? new JLabel((String)pane.msg) : null; + JLabel message = pane.getMessage() != null ? new JLabel((String)pane.getMessage()) : null; JButton ok_button = new JButton("Ok"); ok_button.addActionListener(new ActionListener() @@ -83,11 +83,11 @@ public class BasicOptionPaneUI extends OptionPaneUI } }); - if (pane.args != null) + if (pane.getOptions() != null) { - for (int i=0; i<pane.args.length; i++) + for (int i=0; i<pane.getOptions().length; i++) { - Object o = pane.args[i]; + Object o = pane.getOptions()[i]; if (o != null) { if (o instanceof String) |