From: Jim Procter <jprocter@dundee.ac.uk>
Date: Sat, 5 Apr 2014 12:23:27 +0000 (+0100)
Subject: Merge branch 'r281_JAL-1211' into Release_2_8_1_Branch
X-Git-Tag: Release_2_8_1~4^2~22
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e9e4c4457baea6b64e3981564d5a198719b88f99;hp=34348a4079b425ce7fda3eb75e5e6a2b62cf16b9;p=jalview.git

Merge branch 'r281_JAL-1211' into Release_2_8_1_Branch
---

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 5315376..087a2ee 100644
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -132,6 +132,7 @@ action.group_link = Group Links
 action.show_chain = Show Chain
 action.show_group = Show Group
 action.fetch_db_references = Fetch DB References
+action.edit = Edit
 label.str = Str:
 label.seq = Seq:
 label.structures_manager = Structures Manager
diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 51df8b9..5e6df04 100644
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -3155,7 +3155,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
     menu1.setLabel(MessageManager.getString("action.show"));
     showColumns.setLabel(MessageManager.getString("label.all_columns"));
     showSeqs.setLabel(MessageManager.getString("label.all_sequences"));
-    menu2.setLabel(MessageManager.getString("aciton.hide"));
+    menu2.setLabel(MessageManager.getString("action.hide"));
     hideColumns.setLabel(MessageManager.getString("label.selected_columns"));
     hideSequences.setLabel(MessageManager.getString("label.selected_sequences"));
     hideAllButSelection.setLabel(MessageManager.getString("label.all_but_selected_region"));
diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index fc6d6f9..d54c887 100644
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -807,6 +807,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
    */
   public void drop(DropTargetDropEvent evt)
   {
+    boolean success=true;
     Transferable t = evt.getTransferable();
     java.util.List files = null;
     java.util.List protocols = null;
@@ -855,6 +856,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       }
     } catch (Exception e)
     {
+      success=false;
     }
 
     if (files != null)
@@ -883,8 +885,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements
         }
       } catch (Exception ex)
       {
+        success=false;
       }
     }
+    evt.dropComplete(success); // need this to ensure input focus is properly transfered to any new windows created 
   }
 
   /**