This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: more merging of javax.swing
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Tue, 24 Jun 2003 11:55:06 +0200
- Subject: FYI: Patch: more merging of javax.swing
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I forgot to merge one file. Its now commited. Patch attached.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE++B/6WSOgCCdjSDsRAuquAJ4p27bUCk2NBssT6DKBzDEarNF6SQCeNESA
14pxlI0SkrA+YmtHiRaSwyo=
=FoP5
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1982
diff -u -b -B -r1.1982 ChangeLog
--- ChangeLog 24 Jun 2003 09:48:37 -0000 1.1982
+++ ChangeLog 24 Jun 2003 09:50:30 -0000
@@ -1,5 +1,10 @@
2003-06-24 Michael Koch <konqueror@gmx.de>
+ * javax/swing/text/JTextComponent.java:
+ New version from classpath.
+
+2003-06-24 Michael Koch <konqueror@gmx.de>
+
* javax/swing/Timer.java,
javax/swing/plaf/ActionMapUIResource.java,
javax/swing/plaf/ButtonUI.java,
Index: javax/swing/text/JTextComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/JTextComponent.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JTextComponent.java
--- javax/swing/text/JTextComponent.java 11 Jun 2003 13:20:41 -0000 1.2
+++ javax/swing/text/JTextComponent.java 24 Jun 2003 09:50:30 -0000
@@ -41,6 +41,7 @@
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Image;
+import java.awt.Insets;
import java.awt.Rectangle;
import java.awt.Point;
import javax.accessibility.Accessible;
@@ -382,6 +383,12 @@
{
// Get the component this is labelling.
return null;
+ }
+
+ public Insets getMargin()
+ {
+ // FIXME: Not implemented.
+ return null;
}
public void setText(String text)