2006-02-27 Lillian Angel <langel@redhat.com>

        * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java:
        Removed unneeded imports.
        (setDirectory): Fixed call to nativeSetFile, should be
        nativeSetDirectory. Also, should not use currentDirectory, only
        use nativeGetDirectory.

1 files changed, 8 insertions, 15 deletions

diff --git a/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java b/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
index 64691f1ea..ede007e2f 100644
--- a/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
@@ -41,8 +41,6 @@ package gnu.java.awt.peer.gtk;
 import java.awt.Dialog;
 import java.awt.FileDialog;
 import java.awt.Graphics;
-import java.awt.Window;
-import java.awt.event.ComponentEvent;
 import java.awt.peer.FileDialogPeer;
 import java.io.File;
 import java.io.FilenameFilter;
@@ -117,13 +115,9 @@ public class GtkFileDialogPeer extends GtkDialogPeer implements FileDialogPeer
     // is not absolute, let's construct it based on current directory.
     currentFile = fileName;
     if (fileName.indexOf(FS) == 0)
-      {
-        nativeSetFile (fileName);
-      }
+      nativeSetFile(fileName);
     else
-      {
-        nativeSetFile (nativeGetDirectory() + FS + fileName);
-      }
+      nativeSetFile(nativeGetDirectory() + FS + fileName);
   }
 
   public void setDirectory (String directory)
@@ -132,26 +126,25 @@ public class GtkFileDialogPeer extends GtkDialogPeer implements FileDialogPeer
        the only way we have to set the directory in FileDialog is by
        calling its setDirectory which will call us back. */
     if ((directory == null && currentDirectory == null)
-        || (directory != null && directory.equals (currentDirectory)))
+        || (directory != null && directory.equals(currentDirectory)))
       return;
 
-    if (directory == null || directory.equals (""))
+    if (directory == null || directory.equals(""))
       {
         currentDirectory = FS;
-        nativeSetFile (FS);
-	return;
+        nativeSetDirectory(FS);
+        return;
       }
     
     // GtkFileChooser requires absolute directory names. If the given directory
     // name is not absolute, construct it based on current directory if it is not
-    // null.
-    // Otherwise, use FS.
+    // null. Otherwise, use FS.
     if (directory.indexOf(FS) == 0)
       nativeSetDirectory(directory);
     else if (currentDirectory == null)
       nativeSetDirectory(FS + directory);
     else
-      nativeSetDirectory(currentDirectory + FS + directory);
+      nativeSetDirectory(nativeGetDirectory() + FS + directory);
     currentDirectory = directory;
   }