This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[gui] Patch: javax.swing.plaf.basic
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 12 Aug 2004 11:02:43 +0200
- Subject: [gui] Patch: javax.swing.plaf.basic
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I just commited the attached patch to improve javax.swing.plaf.basic.
Michael
2004-08-12 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(RootView.paint): Removed debug output.
(paintSafely): Draw highlighter before text.
(paintBackground): Use background color of text component.
* javax/swing/plaf/basic/BasicToggleButtonUI.java:
Reformatted.
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFBGzI2WSOgCCdjSDsRAgVRAKCQGlWm70jT2P2X4U8E3O40P4JKaACgl9LI
S87AyHHybtXA/gx+wysvjV8=
=5+od
-----END PGP SIGNATURE-----
Index: javax/swing/plaf/basic/BasicTextUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicTextUI.java,v
retrieving revision 1.4.16.7
diff -u -r1.4.16.7 BasicTextUI.java
--- javax/swing/plaf/basic/BasicTextUI.java 30 Jun 2004 19:48:57 -0000 1.4.16.7
+++ javax/swing/plaf/basic/BasicTextUI.java 12 Aug 2004 08:57:16 -0000
@@ -123,8 +123,6 @@
public void paint(Graphics g, Shape s)
{
- System.out.println("Michael: BasicTextUI.RootView.paint");
-
if (view != null)
view.paint(g, s);
}
@@ -235,18 +233,18 @@
if (textComponent.isOpaque())
paintBackground(g);
- rootView.paint(g, getVisibleEditorRect());
-
if (highlighter != null)
highlighter.paint(g);
+ rootView.paint(g, getVisibleEditorRect());
+
if (caret != null)
caret.paint(g);
}
protected void paintBackground(Graphics g)
{
- g.setColor(Color.WHITE); // FIXME: set background color
+ g.setColor(textComponent.getBackground());
g.fillRect(0, 0, textComponent.getWidth(), textComponent.getHeight());
}
Index: javax/swing/plaf/basic/BasicToggleButtonUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 BasicToggleButtonUI.java
--- javax/swing/plaf/basic/BasicToggleButtonUI.java 9 Jun 2004 08:40:10 -0000 1.5.2.1
+++ javax/swing/plaf/basic/BasicToggleButtonUI.java 12 Aug 2004 08:57:16 -0000
@@ -43,12 +43,10 @@
public class BasicToggleButtonUI extends BasicButtonUI
{
-
- public static ComponentUI createUI(final JComponent c) {
- return new BasicToggleButtonUI();
- }
-}
-
-
+ public static ComponentUI createUI(final JComponent component)
+ {
+ return new BasicToggleButtonUI();
+ }
+}