Merge branch 'JAL-1459_dnd' into develop

diff --combined src/jalview/gui/Desktop.java
index 73cf8de,fe99469..590140b
--- 1/src/jalview/gui/Desktop.java
--- 2/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@@ -1,6 -1,6 +1,6 @@@
  /*
 - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
 - * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
 + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
 + * Copyright (C) 2014 The Jalview Authors
   * 
   * This file is part of Jalview.
   * 
@@@ -14,7 -14,6 +14,7 @@@
   * PURPOSE.  See the GNU General Public License for more details.
   * 
   * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
 + * The Jalview Authors are detailed in the 'AUTHORS' file.
   */
  package jalview.gui;
  
@@@ -559,7 -558,7 +559,7 @@@ public class Desktop extends jalview.jb
    void showPasteMenu(int x, int y)
    {
      JPopupMenu popup = new JPopupMenu();
 -    JMenuItem item = new JMenuItem("Paste To New Window");
 +    JMenuItem item = new JMenuItem(MessageManager.getString("label.paste_new_window"));
      item.addActionListener(new ActionListener()
      {
        public void actionPerformed(ActionEvent evt)
@@@ -807,6 -806,7 +807,7 @@@
     */
    public void drop(DropTargetDropEvent evt)
    {
+     boolean success=true;
      Transferable t = evt.getTransferable();
      java.util.List files = null;
      java.util.List protocols = null;
@@@ -855,6 -855,7 +856,7 @@@
        }
      } catch (Exception e)
      {
+       success=false;
      }
  
      if (files != null)
@@@ -883,8 -884,10 +885,10 @@@
          }
        } catch (Exception ex)
        {
+         success=false;
        }
      }
+     evt.dropComplete(success); // need this to ensure input focus is properly transfered to any new windows created 
    }
  
    /**
@@@ -902,8 -905,8 +906,8 @@@
              jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT"));
  
      chooser.setFileView(new JalviewFileView());
 -    chooser.setDialogTitle("Open local file");
 -    chooser.setToolTipText("Open");
 +    chooser.setDialogTitle(MessageManager.getString("label.open_local_file"));
 +    chooser.setToolTipText(MessageManager.getString("action.open"));
  
      int value = chooser.showOpenDialog(this);
  
@@@ -914,7 -917,7 +918,7 @@@
                .getSelectedFile().getParent());
  
        String format = null;
 -      if (chooser.getSelectedFormat().equals("Jalview"))
 +      if (chooser.getSelectedFormat()!=null && chooser.getSelectedFormat().equals("Jalview"))
        {
          format = "Jalview";
        }
@@@ -1511,7 -1514,6 +1515,7 @@@
    {
      if (progressPanel != null)
      {
 +      synchronized(progressPanel) {
        progressPanel.remove(progbar);
        GridLayout gl = (GridLayout) progressPanel.getLayout();
        gl.setRows(gl.getRows() - 1);
@@@ -1520,7 -1522,6 +1524,7 @@@
          this.getContentPane().remove(progressPanel);
          progressPanel = null;
        }
 +      }
      }
      validate();
    }
@@@ -1530,9 -1531,9 +1534,9 @@@
      fileLoadingCount--;
      if (fileLoadingCount < 1)
      {
 -      for (JPanel flp : fileLoadingPanels)
 +      while (fileLoadingPanels.size()>0)
        {
 -        removeProgressPanel(flp);
 +        removeProgressPanel(fileLoadingPanels.remove(0));
        }
        fileLoadingPanels.clear();
        fileLoadingCount = 0;
@@@ -1715,7 -1716,7 +1719,7 @@@
  
        chooser.setFileView(new JalviewFileView());
        chooser.setDialogTitle("Open a saved VAMSAS session");
 -      chooser.setToolTipText("select a vamsas session to be opened as a new vamsas session.");
 +      chooser.setToolTipText(MessageManager.getString("label.select_vamsas_session_opened_as_new_vamsas_session"));
  
        int value = chooser.showOpenDialog(this);
  
@@@ -1917,7 -1918,7 +1921,7 @@@
          {
            JMenuItem sessit = new JMenuItem();
            sessit.setText(sess[i]);
 -          sessit.setToolTipText("Connect to session " + sess[i]);
 +          sessit.setToolTipText(MessageManager.formatMessage("label.connect_to_session", new String[]{sess[i]}));
            final Desktop dsktp = this;
            final String mysesid = sess[i];
            sessit.addActionListener(new ActionListener()