mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-28 22:11:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Font.java, [...]: New versions from classpath.

Browse Source 
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.

From-SVN: r68415
This commit is contained in:
Michael Koch 2003-06-24 10:50:21 +00:00 committed by Michael Koch
parent 5d09ad737c
commit 59b8aa7e50
6 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libjava/ChangeLog
View File

@ -1,3 +1,12 @@
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

2
libjava/java/awt/Font.java
View File

@ -38,9 +38,9 @@ exception statement from your version. */
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;

4
libjava/java/awt/Window.java
View File

@ -50,7 +50,7 @@ import java.util.ResourceBundle;
/**
* 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 @@ public class Window extends Container
Window()
{
setVisible(false);
setLayout((LayoutManager) new BorderLayout());
setLayout(new BorderLayout());
}
Window(GraphicsConfiguration gc)

2
libjava/java/awt/color/ColorSpace.java
View File

@ -128,7 +128,7 @@ public abstract class ColorSpace implements Serializable
public boolean isCS_sRGB()
{
return false;
return type == CS_sRGB;
}
/**

6
libjava/java/awt/datatransfer/StringSelection.java
View File

@ -54,8 +54,10 @@ public class StringSelection implements Transferable, ClipboardOwner
*/
// 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 };
/*************************************************************************/

5
libjava/java/awt/image/ColorModel.java
View File

@ -589,6 +589,11 @@ public abstract class ColorModel implements Transparency
return sm.getTransferType() == transferType;
}
public final int getTransferType ()
{
return transferType;
}
public void finalize()
{
}