Merged gcj-eclipse branch to trunk.

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

1 files changed, 27 insertions, 1 deletions

diff --git a/libjava/classpath/java/awt/FileDialog.java b/libjava/classpath/java/awt/FileDialog.java
index f02d06be2c9..21117700d6e 100644
--- a/libjava/classpath/java/awt/FileDialog.java
+++ b/libjava/classpath/java/awt/FileDialog.java
@@ -95,6 +95,11 @@ private FilenameFilter filter;
   */
 private int mode;
 
+/**
+ * The number used to generate the name returned by getName.
+ */
+private static transient long next_file_dialog_number;
+
 /*************************************************************************/
 
 /*
@@ -300,7 +305,11 @@ getFile()
 public synchronized void
 setFile(String file)
 {
-  this.file = file;
+  if ("".equals(file))
+    this.file = null;
+  else
+    this.file = file;
+  
   if (peer != null)
     {
       FileDialogPeer f = (FileDialogPeer) peer;
@@ -366,5 +375,22 @@ paramString()
 	  ",mode=" + mode + "," + super.paramString());
 }
 
+/**
+ * Generate a unique name for this <code>FileDialog</code>.
+ *
+ * @return A unique name for this <code>FileDialog</code>.
+ */
+String 
+generateName()
+{
+  return "filedlg" + getUniqueLong();
+}
+
+private static synchronized long 
+getUniqueLong()
+{
+  return next_file_dialog_number++;
+}
+
 } // class FileDialog