* 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

1 files changed, 5 insertions, 3 deletions

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];