diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-11 17:49:47 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-11 17:49:47 +0000 |
commit | 656b493b23e4bb42c98f0bffb6e58f647514c13f (patch) | |
tree | 813e7e2d1e7466679c0eea1808578ad44322878e /libjava | |
parent | 8f87ecd58d4efd2ccc835fcd093158cad20d89af (diff) | |
download | gcc-656b493b23e4bb42c98f0bffb6e58f647514c13f.tar.gz |
* 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
Diffstat (limited to 'libjava')
-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 4363eb88024..06e298e1d95 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 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]; |