git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'releases/Release_2_10_0_Branch'
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
7e442fa
..
f066167
100644
(file)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-941,6
+941,9
@@
public class Desktop extends jalview.jbgui.GDesktop implements
public void drop(DropTargetDropEvent evt)
{
boolean success = true;
public void drop(DropTargetDropEvent evt)
{
boolean success = true;
+ // JAL-1552 - acceptDrop required before getTransferable call for
+ // Java's Transferable for native dnd
+ evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
Transferable t = evt.getTransferable();
java.util.List<String> files = new ArrayList<String>();
java.util.List<String> protocols = new ArrayList<String>();
Transferable t = evt.getTransferable();
java.util.List<String> files = new ArrayList<String>();
java.util.List<String> protocols = new ArrayList<String>();
@@
-3180,7
+3183,6
@@
public class Desktop extends jalview.jbgui.GDesktop implements
{
// Works on Windows and MacOSX
Cache.log.debug("Drop handled as javaFileListFlavor");
{
// Works on Windows and MacOSX
Cache.log.debug("Drop handled as javaFileListFlavor");
- evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
for (Object file : (List) t
.getTransferData(DataFlavor.javaFileListFlavor))
{
for (Object file : (List) t
.getTransferData(DataFlavor.javaFileListFlavor))
{
@@
-3197,7
+3199,6
@@
public class Desktop extends jalview.jbgui.GDesktop implements
{
Cache.log.debug("Drop handled as uriListFlavor");
// This is used by Unix drag system
{
Cache.log.debug("Drop handled as uriListFlavor");
// This is used by Unix drag system
- evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
data = (String) t.getTransferData(uriListFlavor);
}
if (data == null)
data = (String) t.getTransferData(uriListFlavor);
}
if (data == null)
@@
-3252,7
+3253,6
@@
public class Desktop extends jalview.jbgui.GDesktop implements
{
Cache.log.debug("Supported transfer dataflavor: "
+ fl.toString());
{
Cache.log.debug("Supported transfer dataflavor: "
+ fl.toString());
- evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
Object df = t.getTransferData(fl);
if (df != null)
{
Object df = t.getTransferData(fl);
if (df != null)
{