1 files changed, 26 insertions, 8 deletions
diff --git a/libjava/java/awt/Choice.java b/libjava/java/awt/Choice.java
index 81a2a31c932..4c7b505535c 100644
--- a/libjava/java/awt/Choice.java
+++ b/libjava/java/awt/Choice.java
@@ -85,13 +85,17 @@ private ItemListener item_listeners;
  * Constructors
  */
 
-/**
-  * Initializes a new instance of <code>Choice</code>.
-  */
-public
-Choice()
-{
-}
+  /**
+   * Initializes a new instance of <code>Choice</code>.
+   *
+   * @exception HeadlessException If GraphicsEnvironment.isHeadless()
+   * returns true
+   */
+  public Choice()
+  {
+    if (GraphicsEnvironment.isHeadless())
+      throw new HeadlessException ();
+  }
 
 /*************************************************************************/
 
@@ -146,12 +150,16 @@ getItem(int index)
   * Adds the specified item to this choice box.
   *
   * @param item The item to add.
+  *
+  * @exception NullPointerException If the item's value is null
+  *
+  * @since 1.1
   */
 public synchronized void
 add(String item)
 {
   if (item == null)
-    throw new IllegalArgumentException ("item must be non-null");
+    throw new NullPointerException ("item must be non-null");
 
   pItems.addElement(item);
 
@@ -171,7 +179,12 @@ add(String item)
 /**
   * Adds the specified item to this choice box.
   *
+  * This method is oboslete since Java 2 platform 1.1. Please use @see add
+  * instead.
+  *
   * @param item The item to add.
+  *
+  * @exception NullPointerException If the item's value is equal to null
   */
 public synchronized void
 addItem(String item)
@@ -189,10 +202,15 @@ addItem(String item)
  *
  * @param item The item to add.
  * @param index The index at which the item should be inserted.
+ *
+ * @exception IllegalArgumentException If index is less than 0
  */
 public synchronized void
 insert(String item, int index)
 {
+  if (index < 0)
+    throw new IllegalArgumentException ("index may not be less then 0");
+
   if (index > getItemCount ())
     index = getItemCount ();