This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: javax.swing.border
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 5 Jun 2003 23:01:45 +0200
- Subject: FYI: Patch: javax.swing.border
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
Here a new patch for javax.swing.border. It fixes some compiling
issues. AARRRRGH.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+36/BWSOgCCdjSDsRAoSwAKCN3U36Sp9u199QVzWXwshOvT/yCACcChQb
OyzAvKkEhhUC7AgMlNNWrVI=
=SjHI
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1917
diff -u -b -B -r1.1917 ChangeLog
--- ChangeLog 5 Jun 2003 20:03:24 -0000 1.1917
+++ ChangeLog 5 Jun 2003 20:57:19 -0000
@@ -1,5 +1,24 @@
2003-06-05 Michael Koch <konqueror@gmx.de>
+ * javax/swing/border/BevelBorder.java
+ (BevelBorder): Removed.
+ * javax/swing/border/EmptyBorder.java:
+ Reformatted.
+ (EmptyBorder): Removed.
+ (getBorderInsets): Dont use l, r, t and b.
+ * javax/swing/border/EtchedBorder.java
+ (EtchedBorder): Removed.
+ * javax/swing/border/LineBorder.java
+ (LineBorder): Removed.
+ * javax/swing/border/MatteBorder.java
+ (MatteBorder): Removed.
+ * javax/swing/border/TitledBorder.java
+ (defaultBorder): Use other default for now.
+ (defaultFont): Likewise.
+ (defaultColor): Likewise.
+
+2003-06-05 Michael Koch <konqueror@gmx.de>
+
* javax/swing/border/Border.java:
New version from classpath.
Index: javax/swing/border/BevelBorder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/border/BevelBorder.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BevelBorder.java
--- javax/swing/border/BevelBorder.java 5 Jun 2003 19:59:44 -0000 1.2
+++ javax/swing/border/BevelBorder.java 5 Jun 2003 20:57:19 -0000
@@ -73,16 +73,6 @@
this.shadowInner = shadowInner;
}
- public BevelBorder(int top,
- int left,
- int bottom,
- int right,
- Color color)
- {
- super(top, left, bottom, right);
- this.c = color;
- }
-
public boolean isBorderOpaque()
{
return false;
Index: javax/swing/border/EmptyBorder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/border/EmptyBorder.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 EmptyBorder.java
--- javax/swing/border/EmptyBorder.java 5 Jun 2003 19:59:44 -0000 1.2
+++ javax/swing/border/EmptyBorder.java 5 Jun 2003 20:57:19 -0000
@@ -63,47 +63,25 @@
this.bottom = bottom;
}
- protected int l,r,b,t;
-
- public EmptyBorder()
- {
- }
-
- public EmptyBorder(int left,
- int right,
- int top,
- int bottom)
- {
- this.l = left;
- this.r = r;
- this.t = t;
- this.b = b;
- }
-
-
- public Insets getBorderInsets(Component c,
- Insets s)
+ public Insets getBorderInsets (Component c, Insets s)
{
if (s == null)
- s = new Insets(0,0,0,0);
-
- s.left = l;
- s.right = r;
- s.top = t;
- s.bottom = b;
+ s = new Insets (0,0,0,0);
+ s.left = left;
+ s.right = right;
+ s.top = top;
+ s.bottom = bottom;
return s;
}
- public boolean isBorderOpaque()
+ public boolean isBorderOpaque ()
{
return false;
}
-
- public void paintBorder(Component c,
- Graphics g,
- int x, int y, int width, int height)
+ public void paintBorder (Component c, Graphics g, int x, int y,
+ int width, int height)
{
}
}
Index: javax/swing/border/EtchedBorder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/border/EtchedBorder.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 EtchedBorder.java
--- javax/swing/border/EtchedBorder.java 5 Jun 2003 19:59:44 -0000 1.2
+++ javax/swing/border/EtchedBorder.java 5 Jun 2003 20:57:19 -0000
@@ -73,16 +73,6 @@
this.shadow = shadow;
}
- public EtchedBorder(int top,
- int left,
- int bottom,
- int right,
- Color color)
- {
- super(top, left, bottom, right);
- this.c = color;
- }
-
public boolean isBorderOpaque()
{
return false;
Index: javax/swing/border/LineBorder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/border/LineBorder.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 LineBorder.java
--- javax/swing/border/LineBorder.java 5 Jun 2003 19:59:44 -0000 1.2
+++ javax/swing/border/LineBorder.java 5 Jun 2003 20:57:19 -0000
@@ -68,16 +68,6 @@
this.roundedCorners = roundedCorners;
}
- public LineBorder(int top,
- int left,
- int bottom,
- int right,
- Color color)
- {
- super(top, left, bottom, right);
- this.c = color;
- }
-
public boolean isBorderOpaque()
{
return false;
Index: javax/swing/border/MatteBorder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/border/MatteBorder.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 MatteBorder.java
--- javax/swing/border/MatteBorder.java 5 Jun 2003 19:59:44 -0000 1.2
+++ javax/swing/border/MatteBorder.java 5 Jun 2003 20:57:19 -0000
@@ -79,16 +79,6 @@
this.color = color;
}
- public MatteBorder(int top,
- int left,
- int bottom,
- int right,
- Color color)
- {
- super(top, left, bottom, right);
- this.c = color;
- }
-
public boolean isBorderOpaque()
{
return false;
Index: javax/swing/border/TitledBorder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/border/TitledBorder.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 TitledBorder.java
--- javax/swing/border/TitledBorder.java 5 Jun 2003 19:59:44 -0000 1.2
+++ javax/swing/border/TitledBorder.java 5 Jun 2003 20:57:19 -0000
@@ -72,9 +72,9 @@
protected int titleJustification;
protected int titlePosition;
- private static Border defaultBorder = new BorderUIRessource ();
- private static Font defaultFont = new FontUIRessource ("Dialog", BOLD, 12);
- private static Color defaultColor = new ColorUIRessource (Color.black);
+ private static Border defaultBorder = new LineBorder (Color.black);
+ private static Font defaultFont = null;
+ private static Color defaultColor = Color.black;
public TitledBorder (String title)
{