diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-06-24 10:50:21 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-06-24 10:50:21 +0000 |
| commit | 59b8aa7e50e650fd4d0fd7b7af991ca7a5d5ca67 (patch) | |
| tree | 7d8bb62124c934dfecba33d1baddc42afb532235 /libjava | |
| parent | 5d09ad737c497f90bd77872f15f3c51e6e28d0fc (diff) | |
| download | gcc-59b8aa7e50e650fd4d0fd7b7af991ca7a5d5ca67.zip gcc-59b8aa7e50e650fd4d0fd7b7af991ca7a5d5ca67.tar.gz gcc-59b8aa7e50e650fd4d0fd7b7af991ca7a5d5ca67.tar.bz2 | |
Font.java, [...]: New versions from classpath.
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/java/awt/Font.java | 2 | ||||
| -rw-r--r-- | libjava/java/awt/Window.java | 4 | ||||
| -rw-r--r-- | libjava/java/awt/color/ColorSpace.java | 2 | ||||
| -rw-r--r-- | libjava/java/awt/datatransfer/StringSelection.java | 6 | ||||
| -rw-r--r-- | libjava/java/awt/image/ColorModel.java | 5 |
6 files changed, 22 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3c57dfa..2c6c4e0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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, diff --git a/libjava/java/awt/Font.java b/libjava/java/awt/Font.java index b762a75..b887d8e 100644 --- a/libjava/java/awt/Font.java +++ b/libjava/java/awt/Font.java @@ -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; diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java index 4494652..2da9885 100644 --- a/libjava/java/awt/Window.java +++ b/libjava/java/awt/Window.java @@ -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) diff --git a/libjava/java/awt/color/ColorSpace.java b/libjava/java/awt/color/ColorSpace.java index 8bf0a81..905bf9c 100644 --- a/libjava/java/awt/color/ColorSpace.java +++ b/libjava/java/awt/color/ColorSpace.java @@ -128,7 +128,7 @@ public abstract class ColorSpace implements Serializable public boolean isCS_sRGB() { - return false; + return type == CS_sRGB; } /** diff --git a/libjava/java/awt/datatransfer/StringSelection.java b/libjava/java/awt/datatransfer/StringSelection.java index f6f0116..6db7450 100644 --- a/libjava/java/awt/datatransfer/StringSelection.java +++ b/libjava/java/awt/datatransfer/StringSelection.java @@ -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 }; /*************************************************************************/ diff --git a/libjava/java/awt/image/ColorModel.java b/libjava/java/awt/image/ColorModel.java index 9976985..360a7b4 100644 --- a/libjava/java/awt/image/ColorModel.java +++ b/libjava/java/awt/image/ColorModel.java @@ -589,6 +589,11 @@ public abstract class ColorModel implements Transparency return sm.getTransferType() == transferType; } + public final int getTransferType () + { + return transferType; + } + public void finalize() { } |