From: kiramt <k.mourao@dundee.ac.uk>
Date: Mon, 17 Oct 2016 13:38:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/bug/JAL-1552dragndroptake2' into develop
X-Git-Tag: Release_2_10_0b1~3^2~12
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=55bb4016fee8102dbb878d9fe8eb2e341c9f667a;hp=8a5e0bc033d75200f22202146b5dc448b2b70a39;p=jalview.git

Merge remote-tracking branch 'origin/bug/JAL-1552dragndroptake2' into develop
---

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 672f7ac..63620e5 100644
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -108,6 +108,7 @@ import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.StringSelection;
 import java.awt.datatransfer.Transferable;
+import java.awt.dnd.DnDConstants;
 import java.awt.dnd.DropTargetDragEvent;
 import java.awt.dnd.DropTargetDropEvent;
 import java.awt.dnd.DropTargetEvent;
@@ -4814,6 +4815,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   @Override
   public void drop(DropTargetDropEvent evt)
   {
+    // 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>(), protocols = new ArrayList<String>();