
2007-05-31 Matthias Klose <doko@ubuntu.com> * javax/management/NotificationBroadcasterSupport.java (getNotificationInfo): Add cast. * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include directories. * native/jni/qt-peer/Makefile.in: Regenerate. libjava/ChangeLog: 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/natFileWin32.cc (setFilePermissions): New (stub only). _access: Handle EXEC query, stub only. 2007-06-03 Matthias Klose <doko@ubuntu.com> Merged from classpath: * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge. * java/lang/System.java(inheritedChannel): New. * java/lang/Character.java: Remove stray`;'. * java/net/MulticastSocket.java: Merged. * java/text/DateFormatSymbols.java(getInstance): New, comment updates. * java/text/Collator.java(getInstance): Merged. * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG. getDisplayName, getDisplayNames: New. * java/util/logging/Logger.java: Merged. * Regenerate .class and .h files. 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/File.java: Merge with classpath-0.95, new method setFilePermissions, new attribute EXEC. * java/io/natFilePosix.cc (setFilePermissions): New. _access: Handle EXEC query. * classpath/lib/java/io/File.class, java/io/File.h: Regenerate. 2007-06-03 Matthias Klose <doko@ubuntu.com> Imported GNU Classpath 0.95. * classpath/Makefile.in, classpath/native/jni/midi-dssi/Makefile.in, classpath/native/jni/classpath/Makefile.in, classpath/native/jni/Makefile.in, classpath/native/jni/gconf-peer/Makefile.in, classpath/native/jni/java-io/Makefile.in, classpath/native/jni/native-lib/Makefile.in, classpath/native/jni/java-util/Makefile.in, classpath/native/jni/midi-alsa/Makefile.in, classpath/native/jni/java-lang/Makefile.in, classpath/native/jni/java-nio/Makefile.in, classpath/native/jni/java-net/Makefile.in, classpath/native/jni/xmlj/Makefile.in, classpath/native/jni/qt-peer/Makefile.in, classpath/native/jni/gtk-peer/Makefile.in, classpath/native/Makefile.in, classpath/native/jawt/Makefile.in, classpath/native/fdlibm/Makefile.in, classpath/native/plugin/Makefile.in, classpath/resource/Makefile.in, classpath/scripts/Makefile.in, classpath/tools/Makefile.in, classpath/doc/Makefile.in, classpath/doc/api/Makefile.in, classpath/lib/Makefile.in, classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in, classpath/external/sax/Makefile.in, classpath/external/w3c_dom/Makefile.in, classpath/external/relaxngDatatype/Makefile.in, classpath/include/Makefile.in, classpath/examples/Makefile.in: Regenerate. * classpath/config.guess, classpath/config.sub, classpath/ltmain.sh : Update. * classpath/configure, classpath/depcomp, classpath/missing, classpath/aclocal.m4, classpath/install-sh: Regenerate. * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95. * sources.am: Regenerate. * Makefile.in: Regenerate. * Update the .class files and generated CNI header files, add new .class and generated CNI header files. * Remove generated files for removed java source files: classpath/gnu/java/net/BASE64.java, classpath/gnu/java/security/util/Base64.java, classpath/gnu/java/awt/peer/gtk/GThreadMutex.java, classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, classpath/gnu/java/awt/font/autofit/Scaler.java, classpath/gnu/classpath/jdwp/util/Value.java, classpath/gnu/javax/net/ssl/Base64.java. * Remove empty directories. * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc. * java/lang/Class.java(setAccessible): Merge from classpath. * java/util/Locale.java: Remove. * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java, gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New. * gcj/javaprims.h: Update class declarations. * scripts/classes.pl: Update usage. * HACKING: Mention to build all peers. From-SVN: r125302
229 lines
7.3 KiB
Java
229 lines
7.3 KiB
Java
/* GtkFileDialogPeer.java -- Implements FileDialogPeer with GTK
|
|
Copyright (C) 1998, 1999, 2002, 2004, 2005 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package gnu.java.awt.peer.gtk;
|
|
|
|
import java.awt.Dialog;
|
|
import java.awt.FileDialog;
|
|
import java.awt.event.PaintEvent;
|
|
import java.awt.peer.FileDialogPeer;
|
|
import java.io.File;
|
|
import java.io.FilenameFilter;
|
|
|
|
public class GtkFileDialogPeer extends GtkDialogPeer implements FileDialogPeer
|
|
{
|
|
static final String FS = System.getProperty("file.separator");
|
|
|
|
private String currentFile = null;
|
|
private String currentDirectory = null;
|
|
private FilenameFilter filter;
|
|
|
|
native void create (GtkContainerPeer parent, int mode);
|
|
native void connectSignals ();
|
|
native void nativeSetFile (String file);
|
|
public native String nativeGetDirectory();
|
|
public native void nativeSetDirectory(String directory);
|
|
native void nativeSetFilenameFilter (FilenameFilter filter);
|
|
|
|
public void create()
|
|
{
|
|
create((GtkContainerPeer) awtComponent.getParent().getPeer(),
|
|
((FileDialog) awtComponent).getMode());
|
|
|
|
FileDialog fd = (FileDialog) awtComponent;
|
|
|
|
nativeSetDirectory(System.getProperty("user.dir"));
|
|
setDirectory(fd.getDirectory());
|
|
setFile(fd.getFile());
|
|
|
|
FilenameFilter filter = fd.getFilenameFilter();
|
|
if (filter != null)
|
|
setFilenameFilter(filter);
|
|
}
|
|
|
|
public GtkFileDialogPeer (FileDialog fd)
|
|
{
|
|
super (fd);
|
|
}
|
|
|
|
void setComponentBounds ()
|
|
{
|
|
if (awtComponent.getHeight () == 0
|
|
&& awtComponent.getWidth () == 0)
|
|
{
|
|
int[] dims = new int[2];
|
|
gtkWidgetGetPreferredDimensions (dims);
|
|
|
|
if (dims[0] != awtComponent.getWidth()
|
|
|| dims[1] != awtComponent.getHeight())
|
|
awtComponent.setSize(dims[0], dims[1]);
|
|
}
|
|
super.setComponentBounds ();
|
|
}
|
|
|
|
public void setFile (String fileName)
|
|
{
|
|
/* If nothing changed do nothing. This usually happens because
|
|
the only way we have to set the file name in FileDialog is by
|
|
calling its SetFile which will call us back. */
|
|
if ((fileName == null && currentFile == null)
|
|
|| (fileName != null && fileName.equals (currentFile)))
|
|
return;
|
|
|
|
if (fileName == null || fileName.equals (""))
|
|
{
|
|
currentFile = "";
|
|
nativeSetFile ("");
|
|
return;
|
|
}
|
|
|
|
// GtkFileChooser requires absolute filenames. If the given filename
|
|
// is not absolute, let's construct it based on current directory.
|
|
currentFile = fileName;
|
|
if (fileName.indexOf(FS) == 0)
|
|
nativeSetFile(fileName);
|
|
else
|
|
nativeSetFile(nativeGetDirectory() + FS + fileName);
|
|
}
|
|
|
|
public void setDirectory (String directory)
|
|
{
|
|
/* If nothing changed so nothing. This usually happens because
|
|
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)))
|
|
return;
|
|
|
|
if (directory == null || directory.equals(""))
|
|
{
|
|
currentDirectory = FS;
|
|
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.
|
|
currentDirectory = directory;
|
|
if (directory.indexOf(FS) == 0)
|
|
nativeSetDirectory(directory);
|
|
else
|
|
nativeSetDirectory(nativeGetDirectory() + FS + directory);
|
|
}
|
|
|
|
public void setFilenameFilter (FilenameFilter filter)
|
|
{
|
|
this.filter = filter;
|
|
nativeSetFilenameFilter(filter);
|
|
}
|
|
|
|
/* This method interacts with the native callback function of the
|
|
same name. The native function will extract the filename from the
|
|
GtkFileFilterInfo object and send it to this method, which will
|
|
in turn call the filter's accept() method and give back the return
|
|
value. */
|
|
// called back by native side: filename_filter_cb
|
|
boolean filenameFilterCallback (String fullname)
|
|
{
|
|
String filename = fullname.substring(fullname.lastIndexOf(FS) + 1);
|
|
String dirname = fullname.substring(0, fullname.lastIndexOf(FS));
|
|
File dir = new File(dirname);
|
|
return filter.accept(dir, filename);
|
|
}
|
|
|
|
// Sun does not call FileDialog.update.
|
|
protected void updateComponent (PaintEvent event)
|
|
{
|
|
// Override GtkComponetPeer.updateComponent to do nothing.
|
|
}
|
|
|
|
// called back by native side: handle_response_cb
|
|
// only called from the GTK thread
|
|
void gtkHideFileDialog ()
|
|
{
|
|
// hide calls back the peer's setVisible method, so locking is a
|
|
// problem.
|
|
((Dialog) awtComponent).hide();
|
|
}
|
|
|
|
// called back by native side: handle_response_cb
|
|
void gtkDisposeFileDialog ()
|
|
{
|
|
((Dialog) awtComponent).dispose();
|
|
}
|
|
|
|
// Callback to set the file and directory values when the user is finished
|
|
// with the dialog.
|
|
// called back by native side: handle_response_cb
|
|
void gtkSetFilename (String fileName)
|
|
{
|
|
FileDialog fd = (FileDialog) awtWidget;
|
|
if (fileName == null)
|
|
{
|
|
currentFile = null;
|
|
fd.setFile(null);
|
|
return;
|
|
}
|
|
|
|
int sepIndex = fileName.lastIndexOf (FS);
|
|
if (sepIndex < 0)
|
|
{
|
|
/* This should never happen on Unix (all paths start with '/') */
|
|
currentFile = fileName;
|
|
}
|
|
else
|
|
{
|
|
if (fileName.length() > (sepIndex + 1))
|
|
{
|
|
String fn = fileName.substring (sepIndex + 1);
|
|
currentFile = fn;
|
|
}
|
|
else
|
|
{
|
|
currentFile = null;
|
|
}
|
|
|
|
String dn = fileName.substring (0, sepIndex + 1);
|
|
currentDirectory = dn;
|
|
fd.setDirectory(dn);
|
|
}
|
|
|
|
fd.setFile (currentFile);
|
|
}
|
|
}
|