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
This commit is contained in:
parent
5d09ad737c
commit
59b8aa7e50
6 changed files with 22 additions and 6 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -128,7 +128,7 @@ public abstract class ColorSpace implements Serializable
|
|||
|
||||
public boolean isCS_sRGB()
|
||||
{
|
||||
return false;
|
||||
return type == CS_sRGB;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -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 };
|
||||
|
||||
/*************************************************************************/
|
||||
|
||||
|
|
|
@ -589,6 +589,11 @@ public abstract class ColorModel implements Transparency
|
|||
return sm.getTransferType() == transferType;
|
||||
}
|
||||
|
||||
public final int getTransferType ()
|
||||
{
|
||||
return transferType;
|
||||
}
|
||||
|
||||
public void finalize()
|
||||
{
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue