From: fnasser <fnasser@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 5 Jan 2004 21:23:12 +0000 (+0000)
Subject:         * java/awt/Dialog.java (constructor): Accept null title as per spec.
X-Git-Tag: upstream/4.9.2~74277
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8aaff6fad4abe062f3cce96289c32433ef34717;p=platform%2Fupstream%2Flinaro-gcc.git

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75444 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c5556a9..c3d6545 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,11 @@
 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.
 	(insert): Ditto.
 	(remove): Ditto.  Also, Check for valid argument.
diff --git a/libjava/java/awt/Dialog.java b/libjava/java/awt/Dialog.java
index eee8361..ac2e6ed 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 6ff2b76..24a6210 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);
 }