From: Fernando Nasser <fnasser@redhat.com>
Date: Mon, 5 Jan 2004 21:23:12 +0000 (+0000)
Subject: Dialog.java (constructor): Accept null title as per spec.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=975fde59af881603e4f905989848c5a96441ca63;p=gcc.git

Dialog.java (constructor): Accept null title as per spec.

        * java/awt/Dialog.java (constructor): Accept null title as per spec.
        * java/awt/FileDialog.java (constructor): Throw exception on invalid
        argument as per spec.

From-SVN: r75444
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c5556a9626d..c3d654529e5 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-05  Fernando Nasser  <fnasser@redhat.com>
+
+	* java/awt/Dialog.java (constructor): Accept null title as per spec.
+	* java/awt/FileDialog.java (constructor): Throw exception on invalid
+	argument as per spec.
+
 2004-01-05  Fernando Nasser  <fnasser@redhat.com>
 
 	* java/awt/Choice.java (add): Leave posting of ItemEvents to peer.
diff --git a/libjava/java/awt/Dialog.java b/libjava/java/awt/Dialog.java
index eee8361146a..ac2e6ed3de9 100644
--- a/libjava/java/awt/Dialog.java
+++ b/libjava/java/awt/Dialog.java
@@ -187,7 +187,8 @@ Dialog (Frame parent, String title, boolean modal, GraphicsConfiguration gc)
 {
   super (parent, gc);
 
-  this.title = title;
+  // A null title is equivalent to an empty title  
+  this.title = (title != null) ? title : "";
   this.modal = modal;
   visible = false;
 
@@ -254,8 +255,9 @@ public
 Dialog (Dialog parent, String title, boolean modal, GraphicsConfiguration gc)
 {
   super (parent, parent.getGraphicsConfiguration ());
-  
-  this.title = title;
+
+  // A null title is equivalent to an empty title  
+  this.title = (title != null) ? title : "";
   this.modal = modal;
   visible = false;
 
@@ -289,7 +291,9 @@ getTitle()
 public synchronized void
 setTitle(String title)
 {
-  this.title = title;
+  // A null title is equivalent to an empty title  
+  this.title = (title != null) ? title : "";
+
   if (peer != null)
     {
       DialogPeer d = (DialogPeer) peer;
diff --git a/libjava/java/awt/FileDialog.java b/libjava/java/awt/FileDialog.java
index 6ff2b766748..24a621084b9 100644
--- a/libjava/java/awt/FileDialog.java
+++ b/libjava/java/awt/FileDialog.java
@@ -147,6 +147,11 @@ public
 FileDialog(Frame parent, String title, int mode)
 {
   super(parent, title, true);
+  
+  if ((mode != LOAD) && (mode != SAVE))
+    throw new IllegalArgumentException (
+      "Mode argument must be either LOAD or SAVE");
+
   setMode (mode);
 }