This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: java.awt merge from classpath
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Tue, 24 Jun 2003 13:02:04 +0200
- Subject: FYI: Patch: java.awt merge from classpath
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached patch to trunk to merge java.awt with
classpath again.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE++C+sWSOgCCdjSDsRAlJhAKCArKbY1gMfnKRfs3++y/HxjnLoUACfeMuR
p4zkx22eshqyyGl0Eb9LB1g=
=zUsi
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1984
diff -u -b -B -r1.1984 ChangeLog
--- ChangeLog 24 Jun 2003 10:23:30 -0000 1.1984
+++ ChangeLog 24 Jun 2003 10:47:25 -0000
@@ -1,5 +1,14 @@
2003-06-24 Michael Koch <konqueror@gmx.de>
+ * java/awt/Font.java,
+ java/awt/Window.java,
+ java/awt/color/ColorSpace.java,
+ java/awt/datatransfer/StringSelection.java,
+ java/awt/image/ColorModel.java:
+ New versions from classpath.
+
+2003-06-24 Michael Koch <konqueror@gmx.de>
+
* Makefile.am
(awt_java_source_files): Added new files:
javax/swing/plaf/basic/BasicSplitPaneDivider.java,
Index: java/awt/Font.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Font.java,v
retrieving revision 1.12
diff -u -b -B -r1.12 Font.java
--- java/awt/Font.java 19 Jun 2003 10:48:44 -0000 1.12
+++ java/awt/Font.java 24 Jun 2003 10:47:25 -0000
@@ -38,9 +38,9 @@
package java.awt;
-import java.awt.peer.FontPeer;
import java.awt.font.FontRenderContext;
import java.awt.font.LineMetrics;
+import java.awt.peer.FontPeer;
import java.io.Serializable;
import java.util.StringTokenizer;
Index: java/awt/Window.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Window.java,v
retrieving revision 1.22
diff -u -b -B -r1.22 Window.java
--- java/awt/Window.java 5 Jun 2003 19:58:39 -0000 1.22
+++ java/awt/Window.java 24 Jun 2003 10:47:26 -0000
@@ -50,7 +50,7 @@
/**
* This class represents a top-level window with no decorations.
*
- * @author Aaron M. Renn (arenn@urbanophile.com)
+ * @author Aaron M. Renn <arenn@urbanophile.com>
* @author Warren Levy <warrenl@cygnus.com>
*/
public class Window extends Container
@@ -79,7 +79,7 @@
Window()
{
setVisible(false);
- setLayout((LayoutManager) new BorderLayout());
+ setLayout(new BorderLayout());
}
Window(GraphicsConfiguration gc)
Index: java/awt/color/ColorSpace.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/color/ColorSpace.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 ColorSpace.java
--- java/awt/color/ColorSpace.java 14 Jan 2003 21:21:33 -0000 1.7
+++ java/awt/color/ColorSpace.java 24 Jun 2003 10:47:26 -0000
@@ -128,7 +128,7 @@
public boolean isCS_sRGB()
{
- return false;
+ return type == CS_sRGB;
}
/**
Index: java/awt/datatransfer/StringSelection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/datatransfer/StringSelection.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 StringSelection.java
--- java/awt/datatransfer/StringSelection.java 24 Jan 2002 06:31:02 -0000 1.1
+++ java/awt/datatransfer/StringSelection.java 24 Jun 2003 10:47:26 -0000
@@ -54,8 +54,10 @@
*/
// List of flavors we support
-public static final DataFlavor[] supported_flavors
- = { DataFlavor.plainTextFlavor };
+// XXX: DataFlavor.plainTextFlavor is deprecated.
+static final DataFlavor[] supported_flavors
+ = { DataFlavor.stringFlavor,
+ DataFlavor.plainTextFlavor };
/*************************************************************************/
Index: java/awt/image/ColorModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/ColorModel.java,v
retrieving revision 1.11
diff -u -b -B -r1.11 ColorModel.java
--- java/awt/image/ColorModel.java 11 Jun 2003 10:37:48 -0000 1.11
+++ java/awt/image/ColorModel.java 24 Jun 2003 10:47:26 -0000
@@ -589,6 +589,11 @@
return sm.getTransferType() == transferType;
}
+ public final int getTransferType ()
+ {
+ return transferType;
+ }
+
public void finalize()
{
}