diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-24 10:50:21 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-24 10:50:21 +0000 |
| commit | 21cabf94eb50ba2f7eecd627da0c664b3cfc2c7c (patch) | |
| tree | 7d8bb62124c934dfecba33d1baddc42afb532235 /libjava/java | |
| parent | 313ebc49b6795133f206beaf1a8fbbc48dffb3f7 (diff) | |
| download | gcc-21cabf94eb50ba2f7eecd627da0c664b3cfc2c7c.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68415 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
| -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 |
5 files changed, 13 insertions, 6 deletions
diff --git a/libjava/java/awt/Font.java b/libjava/java/awt/Font.java index b762a75dc31..b887d8ea5ed 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 44946528f77..2da988507e9 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 8bf0a8196c0..905bf9cd769 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 f6f0116272b..6db74503bb3 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 9976985ab52..360a7b49323 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() { } |