Some calls in setDirectory were wrong. Fixed this.
2006-02-27 Lillian Angel <[EMAIL PROTECTED]>
* 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.
On Mon, 2006-02-27 at 11:53 -0500, Lillian Angel wrote:
> This fixes some gdk assertion errors in MegaMek. The path to the
> directory must be absolute, when setting the directory.
>
> 2006-02-27 Lillian Angel <[EMAIL PROTECTED]>
>
> * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
> (setDirectory): GtkFileChooser requires an absolute directory
> name. Added a check to make the directory passed to
> nativeSetDirectory is absolute.
>
Index: gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,v
retrieving revision 1.29
diff -u -r1.29 GtkFileDialogPeer.java
--- gnu/java/awt/peer/gtk/GtkFileDialogPeer.java 27 Feb 2006 16:51:27 -0000 1.29
+++ gnu/java/awt/peer/gtk/GtkFileDialogPeer.java 27 Feb 2006 18:38:51 -0000
@@ -41,8 +41,6 @@
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;
@@ -132,26 +126,25 @@
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;
}
