libjava/classpath/ChangeLog.gcj:
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
This commit is contained in:
parent
af333b9a7f
commit
e1bea0c068
2951 changed files with 80982 additions and 68583 deletions
|
@ -38,15 +38,23 @@ exception statement from your version. */
|
|||
|
||||
package javax.swing;
|
||||
|
||||
import gnu.classpath.NotImplementedException;
|
||||
|
||||
import java.awt.Toolkit;
|
||||
import java.awt.datatransfer.Clipboard;
|
||||
import java.awt.datatransfer.DataFlavor;
|
||||
import java.awt.datatransfer.Transferable;
|
||||
import java.awt.datatransfer.UnsupportedFlavorException;
|
||||
import java.awt.dnd.DragGestureEvent;
|
||||
import java.awt.dnd.DragGestureListener;
|
||||
import java.awt.dnd.DragGestureRecognizer;
|
||||
import java.awt.dnd.DragSource;
|
||||
import java.awt.dnd.DragSourceContext;
|
||||
import java.awt.dnd.DragSourceDragEvent;
|
||||
import java.awt.dnd.DragSourceDropEvent;
|
||||
import java.awt.dnd.DragSourceEvent;
|
||||
import java.awt.dnd.DragSourceListener;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.InputEvent;
|
||||
import java.awt.event.MouseEvent;
|
||||
import java.beans.BeanInfo;
|
||||
import java.beans.IntrospectionException;
|
||||
import java.beans.Introspector;
|
||||
|
@ -210,7 +218,101 @@ public class TransferHandler implements Serializable
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static class SwingDragGestureRecognizer extends DragGestureRecognizer
|
||||
{
|
||||
|
||||
protected SwingDragGestureRecognizer(DragGestureListener dgl)
|
||||
{
|
||||
super(DragSource.getDefaultDragSource(), null, NONE, dgl);
|
||||
}
|
||||
|
||||
void gesture(JComponent c, MouseEvent e, int src, int drag)
|
||||
{
|
||||
setComponent(c);
|
||||
setSourceActions(src);
|
||||
appendEvent(e);
|
||||
fireDragGestureRecognized(drag, e.getPoint());
|
||||
}
|
||||
|
||||
protected void registerListeners()
|
||||
{
|
||||
// Nothing to do here.
|
||||
}
|
||||
|
||||
protected void unregisterListeners()
|
||||
{
|
||||
// Nothing to do here.
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static class SwingDragHandler
|
||||
implements DragGestureListener, DragSourceListener
|
||||
{
|
||||
|
||||
private boolean autoscrolls;
|
||||
|
||||
public void dragGestureRecognized(DragGestureEvent e)
|
||||
{
|
||||
JComponent c = (JComponent) e.getComponent();
|
||||
TransferHandler th = c.getTransferHandler();
|
||||
Transferable t = th.createTransferable(c);
|
||||
if (t != null)
|
||||
{
|
||||
autoscrolls = c.getAutoscrolls();
|
||||
c.setAutoscrolls(false);
|
||||
try
|
||||
{
|
||||
e.startDrag(null, t, this);
|
||||
return;
|
||||
}
|
||||
finally
|
||||
{
|
||||
c.setAutoscrolls(autoscrolls);
|
||||
}
|
||||
}
|
||||
th.exportDone(c, t, NONE);
|
||||
}
|
||||
|
||||
public void dragDropEnd(DragSourceDropEvent e)
|
||||
{
|
||||
DragSourceContext ctx = e.getDragSourceContext();
|
||||
JComponent c = (JComponent) ctx.getComponent();
|
||||
TransferHandler th = c.getTransferHandler();
|
||||
if (e.getDropSuccess())
|
||||
{
|
||||
th.exportDone(c, ctx.getTransferable(), e.getDropAction());
|
||||
}
|
||||
else
|
||||
{
|
||||
th.exportDone(c, ctx.getTransferable(), e.getDropAction());
|
||||
}
|
||||
c.setAutoscrolls(autoscrolls);
|
||||
}
|
||||
|
||||
public void dragEnter(DragSourceDragEvent e)
|
||||
{
|
||||
// Nothing to do here.
|
||||
}
|
||||
|
||||
public void dragExit(DragSourceEvent e)
|
||||
{
|
||||
// Nothing to do here.
|
||||
}
|
||||
|
||||
public void dragOver(DragSourceDragEvent e)
|
||||
{
|
||||
// Nothing to do here.
|
||||
}
|
||||
|
||||
public void dropActionChanged(DragSourceDragEvent e)
|
||||
{
|
||||
// Nothing to do here.
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static final long serialVersionUID = -967749805571669910L;
|
||||
|
||||
private static final String COMMAND_COPY = "copy";
|
||||
|
@ -235,6 +337,11 @@ public class TransferHandler implements Serializable
|
|||
*/
|
||||
private String propertyName;
|
||||
|
||||
/**
|
||||
* The DragGestureRecognizer for Swing.
|
||||
*/
|
||||
private SwingDragGestureRecognizer recognizer;
|
||||
|
||||
public static Action getCopyAction()
|
||||
{
|
||||
return copyAction;
|
||||
|
@ -331,10 +438,27 @@ public class TransferHandler implements Serializable
|
|||
return transferable;
|
||||
}
|
||||
|
||||
public void exportAsDrag(JComponent c, InputEvent e, int action)
|
||||
throws NotImplementedException
|
||||
public void exportAsDrag(JComponent c, InputEvent e, int action)
|
||||
{
|
||||
// TODO: Implement this properly
|
||||
int src = getSourceActions(c);
|
||||
int drag = src & action;
|
||||
if (! (e instanceof MouseEvent))
|
||||
{
|
||||
drag = NONE;
|
||||
}
|
||||
if (drag != NONE)
|
||||
{
|
||||
if (recognizer == null)
|
||||
{
|
||||
SwingDragHandler ds = new SwingDragHandler();
|
||||
recognizer = new SwingDragGestureRecognizer(ds);
|
||||
}
|
||||
recognizer.gesture(c, (MouseEvent) e, src, drag);
|
||||
}
|
||||
else
|
||||
{
|
||||
exportDone(c, null, NONE);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue