X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGCutAndPasteTransfer.java;h=bffb07532062f0d2323d28ebfd314064b178d755;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=b75dd8cb6ed27328de7a6ceb29c5d6aa0568f7ff;hpb=04c8f7bff663aa469127e9eed4164e02933782f1;p=jalview.git diff --git a/src/jalview/jbgui/GCutAndPasteTransfer.java b/src/jalview/jbgui/GCutAndPasteTransfer.java index b75dd8c..bffb075 100755 --- a/src/jalview/jbgui/GCutAndPasteTransfer.java +++ b/src/jalview/jbgui/GCutAndPasteTransfer.java @@ -20,12 +20,9 @@ */ package jalview.jbgui; -import jalview.gui.JvSwingUtils; -import jalview.util.MessageManager; import java.awt.BorderLayout; import java.awt.Font; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; @@ -39,6 +36,9 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; +import jalview.gui.JvSwingUtils; +import jalview.util.MessageManager; +import jalview.util.Platform; /** * DOCUMENT ME! * @@ -121,13 +121,9 @@ public class GCutAndPasteTransfer extends JInternalFrame textarea.setBorder(null); selectAll.setText(MessageManager.getString("action.select_all")); - selectAll - .setAccelerator( - javax.swing.KeyStroke - .getKeyStroke(java.awt.event.KeyEvent.VK_A, - jalview.util.ShortcutKeyMaskExWrapper - .getMenuShortcutKeyMaskEx(), - false)); + selectAll.setAccelerator(javax.swing.KeyStroke.getKeyStroke( + java.awt.event.KeyEvent.VK_A, + Platform.SHORTCUT_KEY_MASK, false)); selectAll.addActionListener(new ActionListener() { @Override @@ -138,11 +134,9 @@ public class GCutAndPasteTransfer extends JInternalFrame }); jMenu1.setText(MessageManager.getString("action.file")); save.setText(MessageManager.getString("action.save")); - save.setAccelerator( - javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_S, - jalview.util.ShortcutKeyMaskExWrapper - .getMenuShortcutKeyMaskEx(), - false)); + save.setAccelerator(javax.swing.KeyStroke.getKeyStroke( + java.awt.event.KeyEvent.VK_S, + Platform.SHORTCUT_KEY_MASK, false)); save.addActionListener(new ActionListener() { @Override @@ -151,18 +145,12 @@ public class GCutAndPasteTransfer extends JInternalFrame save_actionPerformed(e); } }); - copyItem.setAccelerator( - javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_C, - jalview.util.ShortcutKeyMaskExWrapper - .getMenuShortcutKeyMaskEx(), - false)); - pasteMenu - .setAccelerator( - javax.swing.KeyStroke - .getKeyStroke(java.awt.event.KeyEvent.VK_V, - jalview.util.ShortcutKeyMaskExWrapper - .getMenuShortcutKeyMaskEx(), - false)); + copyItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( + java.awt.event.KeyEvent.VK_C, + Platform.SHORTCUT_KEY_MASK, false)); + pasteMenu.setAccelerator(javax.swing.KeyStroke.getKeyStroke( + java.awt.event.KeyEvent.VK_V, + Platform.SHORTCUT_KEY_MASK, false)); editMenubar.add(jMenu1); editMenubar.add(editMenu); textarea.setFont(new java.awt.Font("Monospaced", Font.PLAIN, 12));