From 03b42749cd9b5487f6ae7c6b24c951583cef0493 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Wed, 12 May 2021 14:03:16 +0200 Subject: [PATCH] replaced deprecated (since Java 9) KeyEvent.*_MASK with KeyEvent.*_DOWN_MASK --- .../com/formdev/flatlaf/testing/FlatMenusTest.java | 10 +++++----- .../com/formdev/flatlaf/testing/FlatMnemonicsTest.java | 10 +++++----- .../flatlaf/themeeditor/FlatThemeFileEditor.java | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java index eafccedae..a18022563 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java @@ -264,7 +264,7 @@ private void initComponents() { menuItem7.setText("text"); menuItem7.setMnemonic('X'); menuItem7.setIcon(new ImageIcon(getClass().getResource("/com/formdev/flatlaf/testing/disabled_icons_test/intellij-showWriteAccess.png"))); - menuItem7.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, KeyEvent.CTRL_MASK|KeyEvent.SHIFT_MASK)); + menuItem7.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, KeyEvent.CTRL_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK)); menu5.add(menuItem7); //---- menuItem34 ---- @@ -363,7 +363,7 @@ private void initComponents() { //======== menuWithAccelerator2 ======== { menuWithAccelerator2.setText("text"); - menuWithAccelerator2.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_H, KeyEvent.CTRL_MASK)); + menuWithAccelerator2.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_H, KeyEvent.CTRL_DOWN_MASK)); //---- menuItem40 ---- menuItem40.setText("text"); @@ -373,7 +373,7 @@ private void initComponents() { //---- menuItem39 ---- menuItem39.setText("text"); - menuItem39.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_H, KeyEvent.CTRL_MASK)); + menuItem39.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_H, KeyEvent.CTRL_DOWN_MASK)); menuWithAccelerator1.add(menuItem39); } menuBar1.add(menuWithAccelerator1); @@ -587,7 +587,7 @@ private void initComponents() { //---- menuItem1 ---- menuItem1.setText("enabled"); - menuItem1.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.CTRL_MASK)); + menuItem1.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK)); menuItem1.setMnemonic('N'); panel1.add(menuItem1, "cell 1 1"); @@ -643,7 +643,7 @@ private void initComponents() { //---- menuItem2 ---- menuItem2.setText("disabled"); menuItem2.setEnabled(false); - menuItem2.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D, KeyEvent.ALT_MASK|KeyEvent.SHIFT_MASK)); + menuItem2.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D, KeyEvent.ALT_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK)); menuItem2.setMnemonic('I'); panel2.add(menuItem2, "cell 0 1"); diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMnemonicsTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMnemonicsTest.java index 4c756b0a8..24d1b8c60 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMnemonicsTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMnemonicsTest.java @@ -258,14 +258,14 @@ public void keyReleased(KeyEvent e) { //---- newMenuItem ---- newMenuItem.setText("New"); - newMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, KeyEvent.CTRL_MASK)); + newMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, KeyEvent.CTRL_DOWN_MASK)); newMenuItem.setMnemonic('N'); newMenuItem.addActionListener(e -> menuItemActionPerformed(e)); fileMenu.add(newMenuItem); //---- openMenuItem ---- openMenuItem.setText("Open"); - openMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, KeyEvent.ALT_MASK)); + openMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, KeyEvent.ALT_DOWN_MASK)); openMenuItem.setMnemonic('O'); openMenuItem.addActionListener(e -> menuItemActionPerformed(e)); fileMenu.add(openMenuItem); @@ -273,21 +273,21 @@ public void keyReleased(KeyEvent e) { //---- closeMenuItem ---- closeMenuItem.setText("Close"); - closeMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, KeyEvent.CTRL_MASK|KeyEvent.ALT_MASK)); + closeMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, KeyEvent.CTRL_DOWN_MASK|KeyEvent.ALT_DOWN_MASK)); closeMenuItem.setMnemonic('C'); closeMenuItem.addActionListener(e -> menuItemActionPerformed(e)); fileMenu.add(closeMenuItem); //---- closeMenuItem2 ---- closeMenuItem2.setText("Close All"); - closeMenuItem2.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, KeyEvent.ALT_MASK|KeyEvent.SHIFT_MASK)); + closeMenuItem2.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, KeyEvent.ALT_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK)); closeMenuItem2.addActionListener(e -> menuItemActionPerformed(e)); fileMenu.add(closeMenuItem2); fileMenu.addSeparator(); //---- exitMenuItem ---- exitMenuItem.setText("Exit"); - exitMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|KeyEvent.ALT_MASK|KeyEvent.SHIFT_MASK)); + exitMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_J, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|KeyEvent.ALT_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK)); exitMenuItem.setMnemonic('X'); exitMenuItem.addActionListener(e -> menuItemActionPerformed(e)); fileMenu.add(exitMenuItem); diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java index 38a3bd72a..f2e74feb6 100644 --- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java +++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java @@ -527,7 +527,7 @@ public void windowDeactivated(WindowEvent e) { //---- previousEditorMenuItem ---- previousEditorMenuItem.setText("Previous Editor"); previousEditorMenuItem.setMnemonic('P'); - previousEditorMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|KeyEvent.SHIFT_MASK)); + previousEditorMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()|KeyEvent.SHIFT_DOWN_MASK)); previousEditorMenuItem.addActionListener(e -> previousEditor()); windowMenu.add(previousEditorMenuItem); }