This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: FYI: Patch: javax.swing.plaf
- From: Mark Wielaard <mark at klomp dot org>
- To: Michael Koch <konqueror at gmx dot de>
- Cc: java-patches at gcc dot gnu dot org
- Date: 05 Jun 2003 23:48:04 +0200
- Subject: Re: FYI: Patch: javax.swing.plaf
- Organization:
- References: <200306052321.30087.konqueror@gmx.de>
Hi,
On Thu, 2003-06-05 at 23:21, Michael Koch wrote:
>
> here the last changes needed to make all compiling again.
> I should not do something in this heat here ....
You are probably already overheated, but I still cannot get it to
compile. I had to patch (attached)
javax/swing/plaf/basic/BasicOptionPaneUI.java to get around somee more
compile errors. But my patch is clearly wrong (it just makes it compile
in the most easy way that I could imagine). Could you look into this.
Thanks,
Mark
Index: javax/swing/plaf/basic/BasicOptionPaneUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java,v
retrieving revision 1.3
diff -u -r1.3 BasicOptionPaneUI.java
--- javax/swing/plaf/basic/BasicOptionPaneUI.java 5 Jun 2003 21:18:31 -0000 1.3
+++ javax/swing/plaf/basic/BasicOptionPaneUI.java 5 Jun 2003 21:44:41 -0000
@@ -64,7 +64,7 @@
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 @@
}
});
- 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)