From 656b493b23e4bb42c98f0bffb6e58f647514c13f Mon Sep 17 00:00:00 2001 From: tromey Date: Thu, 11 Jan 2001 17:49:47 +0000 Subject: * java/awt/Cursor.java (Cursor(String)): Set type to custom. (Cursor(int), getPredefinedCursor): Throw exception if argument invalid. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38911 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 11 +++++++++++ libjava/java/awt/Cursor.java | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'libjava') diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4363eb88024..06e298e1d95 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,14 @@ +2001-01-11 Tom Tromey + + * java/awt/Cursor.java (Cursor(String)): Set type to custom. + (Cursor(int), getPredefinedCursor): Throw exception if argument + invalid. + +2001-01-03 Tom Tromey + + * gnu/awt/gtk/natGtkComponentPeer.cc (setCursor): Wrote. + (getLocationOnScreen): Wrote. + 2001-01-11 Bryce McKinlay * Makefile.am: Re-enable dependencies. diff --git a/libjava/java/awt/Cursor.java b/libjava/java/awt/Cursor.java index e964a12d15f..80f28e6ed73 100644 --- a/libjava/java/awt/Cursor.java +++ b/libjava/java/awt/Cursor.java @@ -36,6 +36,8 @@ public class Cursor implements java.io.Serializable public Cursor(int type) { + if (type < 0 || type >= PREDEFINED_COUNT) + throw new IllegalArgumentException ("invalid cursor " + type); this.type = type; // FIXME: lookup and set name? } @@ -46,13 +48,13 @@ public class Cursor implements java.io.Serializable protected Cursor(String name) { this.name = name; - // FIXME + this.type = CUSTOM_CURSOR; } public static Cursor getPredefinedCursor(int type) { - if (type >= PREDEFINED_COUNT) - return null; + if (type < 0 || type >= PREDEFINED_COUNT) + throw new IllegalArgumentException ("invalid cursor " + type); if (predefined[type] == null) predefined[type] = new Cursor(type); return predefined[type]; -- cgit v1.2.3