diff options
| -rw-r--r-- | libjava/ChangeLog | 11 | ||||
| -rw-r--r-- | libjava/java/awt/Cursor.java | 8 |
2 files changed, 16 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4363eb8..06e298e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,14 @@ +2001-01-11 Tom Tromey <tromey@redhat.com> + + * java/awt/Cursor.java (Cursor(String)): Set type to custom. + (Cursor(int), getPredefinedCursor): Throw exception if argument + invalid. + +2001-01-03 Tom Tromey <tromey@redhat.com> + + * gnu/awt/gtk/natGtkComponentPeer.cc (setCursor): Wrote. + (getLocationOnScreen): Wrote. + 2001-01-11 Bryce McKinlay <bryce@albatross.co.nz> * Makefile.am: Re-enable dependencies. diff --git a/libjava/java/awt/Cursor.java b/libjava/java/awt/Cursor.java index e964a12..80f28e6 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]; |