X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=0c179e82a291aa424606957d6b1d3d38dc637938;hb=841485c28403b4a8e00c9bddae9caa9411667b8a;hp=6793663b43fe777be5d821d21c4844242bcb4623;hpb=51b0b157926ed477cb558ca5971126bf9fccbd31;p=jalview.git diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index 6793663..0c179e8 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -21,7 +21,6 @@ package jalview.jbgui; import jalview.api.AlignmentViewPanel; -import jalview.bin.Jalview; import jalview.io.FileFormatException; import jalview.util.MessageManager; import jalview.util.Platform; @@ -46,7 +45,7 @@ import javax.swing.JMenuItem; public class GDesktop extends JFrame { - protected static JMenu windowMenu = new JMenu(); + protected JMenu windowMenu = new JMenu(); JMenuBar desktopMenubar = new JMenuBar(); @@ -141,14 +140,14 @@ public class GDesktop extends JFrame private void jbInit() throws Exception { - setName(Jalview.getAppID("desktop")); + setName(Platform.getAppID("desktop")); FileMenu.setText(MessageManager.getString("action.file")); HelpMenu.setText(MessageManager.getString("action.help")); inputLocalFileMenuItem .setText(MessageManager.getString("label.load_tree_from_file")); inputLocalFileMenuItem.setAccelerator( javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O, - jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx(), + Platform.SHORTCUT_KEY_MASK, false)); inputLocalFileMenuItem .addActionListener(new java.awt.event.ActionListener()