This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: javax.swing.plaf
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 5 Jun 2003 23:21:29 +0200
- Subject: FYI: Patch: javax.swing.plaf
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
here the last changes needed to make all compiling again.
I should not do something in this heat here ....
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+37RaWSOgCCdjSDsRAhy+AKCe6fY9plzczHsrzQp5Rn32N1He5QCfZdZX
ZXNNK/VbSef8VtbRaHkmVPs=
=06h5
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1918
diff -u -b -B -r1.1918 ChangeLog
--- ChangeLog 5 Jun 2003 20:57:38 -0000 1.1918
+++ ChangeLog 5 Jun 2003 21:17:06 -0000
@@ -1,5 +1,13 @@
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 ...
+
+2003-06-05 Michael Koch <konqueror@gmx.de>
+
* javax/swing/border/BevelBorder.java
(BevelBorder): Removed.
* javax/swing/border/EmptyBorder.java:
Index: javax/swing/plaf/BorderUIResource.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/BorderUIResource.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BorderUIResource.java
--- javax/swing/plaf/BorderUIResource.java 31 Mar 2003 12:19:21 -0000 1.2
+++ javax/swing/plaf/BorderUIResource.java 5 Jun 2003 21:17:06 -0000
@@ -67,6 +67,7 @@
*/
public BorderUIResource(Border delegate)
{
+ super ();
this.delegate = delegate;
}
@@ -120,14 +121,14 @@
{
public BevelBorderUIResource(int bevelType)
{
-
+ super (bevelType);
}
public BevelBorderUIResource(int bevelType,
Color highlight,
Color shadow)
{
- this(bevelType);
+ super (bevelType);
}
public BevelBorderUIResource(int bevelType,
Color highlightOuter,
@@ -135,7 +136,7 @@
Color shadowOuter,
Color shadowInner)
{
- this(bevelType);
+ super (bevelType);
}
}
@@ -149,7 +150,7 @@
public CompoundBorderUIResource(Border outsideBorder,
Border insideBorder)
{
-
+ super (outsideBorder, insideBorder);
}
}
@@ -167,7 +168,7 @@
public EmptyBorderUIResource(Insets insets)
{
-
+ super (insets);
}
}
@@ -181,16 +182,16 @@
public EtchedBorderUIResource() { }
public EtchedBorderUIResource(int etchType)
{
-
+ super (etchType);
}
public EtchedBorderUIResource(Color highlight, Color shadow)
{
-
+ super (highlight, shadow);
}
public EtchedBorderUIResource(int etchType, Color highlight,
Color shadow)
{
-
+ super (etchType);
}
}
@@ -204,12 +205,12 @@
{
public LineBorderUIResource(Color color)
{
-
+ super (color);
}
public LineBorderUIResource(Color color,
int thickness)
{
-
+ super (color);
}
}
@@ -223,16 +224,16 @@
public MatteBorderUIResource(int top, int left, int bottom,
int right, Color color)
{
-
+ super (top, left, bottom, right, color);
}
public MatteBorderUIResource(int top, int left, int bottom,
int right, Icon tileIcon)
{
-
+ super (top, left, bottom, right, tileIcon);
}
public MatteBorderUIResource(Icon tileIcon)
{
-
+ super (tileIcon);
}
}
@@ -245,32 +246,32 @@
{
TitledBorderUIResource(String title)
{
-
+ super (title);
}
TitledBorderUIResource(Border border)
{
-
+ super (border);
}
TitledBorderUIResource(Border border, String title)
{
-
+ super (border);
}
TitledBorderUIResource(Border border, String title,
int titleJustification, int titlePosition)
{
-
+ super (border);
}
TitledBorderUIResource(Border border, String title,
int titleJustification, int titlePosition,
Font titleFont)
{
-
+ super (border);
}
TitledBorderUIResource(Border border, String title,
int titleJustification, int titlePosition,
Font titleFont, Color titleColor)
{
-
+ super (border);
}
}
}
Index: javax/swing/plaf/basic/BasicDefaults.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicDefaults.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicDefaults.java
--- javax/swing/plaf/basic/BasicDefaults.java 10 May 2003 08:14:36 -0000 1.2
+++ javax/swing/plaf/basic/BasicDefaults.java 5 Jun 2003 21:17:06 -0000
@@ -48,7 +48,7 @@
BasicBorder()
{
- super(5,5,5,5, null);
+ super(5,5,5,5, Color.black);
}
public void paintBorder(Component c,
@@ -72,7 +72,7 @@
{
PanelBorder()
{
- super(5,5,5,5, null);
+ super(5,5,5,5, Color.black);
}
public void paintBorder(Component c,
Index: javax/swing/plaf/basic/BasicOptionPaneUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicOptionPaneUI.java
--- javax/swing/plaf/basic/BasicOptionPaneUI.java 10 May 2003 08:14:36 -0000 1.2
+++ javax/swing/plaf/basic/BasicOptionPaneUI.java 5 Jun 2003 21:17:06 -0000
@@ -64,7 +64,7 @@
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 @@
}
});
- 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)