Merge branch 'hotfix/JAL-1530' into develop
authorj.procter@dundee.ac.uk <jprocter@jims-mbp-2.lan>
Thu, 3 Jul 2014 18:27:55 +0000 (11:27 -0700)
committerj.procter@dundee.ac.uk <jprocter@jims-mbp-2.lan>
Thu, 3 Jul 2014 18:27:55 +0000 (11:27 -0700)
Conflicts:
src/jalview/gui/PopupMenu.java

src/jalview/gui/PopupMenu.java

index 3cf4fe0..ace4762 100644 (file)
@@ -2097,7 +2097,7 @@ public class PopupMenu extends JPopupMenu
             { sequence.getDisplayId(false) }));
     chooser.setToolTipText(MessageManager.formatMessage(
             "label.load_pdb_file_associate_with_sequence", new String[]
-            { new Integer(sequence.getDisplayId(false)).toString() }));
+            { sequence.getDisplayId(false) }));
 
     int value = chooser.showOpenDialog(null);