From: jprocter <<jprocter@dundee.ac.uk>>
Date: Thu, 20 Mar 2014 15:55:24 +0000 (+0000)
Subject: Merge branch 'Release_2_8_1_Branch' of https://source.jalview.org/git/jalview.git... 
X-Git-Tag: Release_2_8_1~4^2~24
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=2b4865853caa1ec028419a401a5cd0df949c644b;hp=-c;p=jalview.git

Merge branch 'Release_2_8_1_Branch' of https://source.jalview.org/git/jalview.git into Release_2_8_1_Branch
---

2b4865853caa1ec028419a401a5cd0df949c644b
diff --combined src/jalview/gui/Desktop.java
index fe99469,6715537..a56ec28
--- a/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,6 -14,7 +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;
  
@@@ -558,7 -559,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)
@@@ -806,7 -807,6 +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,7 -855,6 +856,7 @@@
        }
      } catch (Exception e)
      {
 +      success=false;
      }
  
      if (files != null)
@@@ -884,10 -883,8 +885,10 @@@
          }
        } catch (Exception ex)
        {
 +        success=false;
        }
      }
 +    evt.dropComplete(success); // need this to ensure input focus is properly transfered to any new windows created 
    }
  
    /**
@@@ -905,8 -902,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);
  
@@@ -1716,7 -1713,7 +1717,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);
  
@@@ -1918,7 -1915,7 +1919,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()