Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-06 14:00:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

replaced deprecated (since Java 9) KeyEvent.*_MASK with KeyEvent.*_DOWN_MASK

Browse Source
This commit is contained in:
Karl Tauber
2021-05-12 14:03:16 +02:00
parent 60fd78e082
commit 03b42749cd
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java
View File

@@ -264,7 +264,7 @@ public class FlatMenusTest
menuItem7.setText("text"); menuItem7.setText("text");
menuItem7.setMnemonic('X'); menuItem7.setMnemonic('X');
menuItem7.setIcon(new ImageIcon(getClass().getResource("/com/formdev/flatlaf/testing/disabled_icons_test/intellij-showWriteAccess.png"))); 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); menu5.add(menuItem7);
//---- menuItem34 ---- //---- menuItem34 ----
@@ -363,7 +363,7 @@ public class FlatMenusTest
//======== menuWithAccelerator2 ======== //======== menuWithAccelerator2 ========
{ {
menuWithAccelerator2.setText("text"); 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 ----
menuItem40.setText("text"); menuItem40.setText("text");
@@ -373,7 +373,7 @@ public class FlatMenusTest
//---- menuItem39 ---- //---- menuItem39 ----
menuItem39.setText("text"); 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); menuWithAccelerator1.add(menuItem39);
} }
menuBar1.add(menuWithAccelerator1); menuBar1.add(menuWithAccelerator1);
@@ -587,7 +587,7 @@ public class FlatMenusTest
//---- menuItem1 ---- //---- menuItem1 ----
menuItem1.setText("enabled"); 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'); menuItem1.setMnemonic('N');
panel1.add(menuItem1, "cell 1 1"); panel1.add(menuItem1, "cell 1 1");
@@ -643,7 +643,7 @@ public class FlatMenusTest
//---- menuItem2 ---- //---- menuItem2 ----
menuItem2.setText("disabled"); menuItem2.setText("disabled");
menuItem2.setEnabled(false); 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'); menuItem2.setMnemonic('I');
panel2.add(menuItem2, "cell 0 1"); panel2.add(menuItem2, "cell 0 1");

10
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMnemonicsTest.java
View File

@@ -258,14 +258,14 @@ public class FlatMnemonicsTest
//---- newMenuItem ---- //---- newMenuItem ----
newMenuItem.setText("New"); 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.setMnemonic('N');
newMenuItem.addActionListener(e -> menuItemActionPerformed(e)); newMenuItem.addActionListener(e -> menuItemActionPerformed(e));
fileMenu.add(newMenuItem); fileMenu.add(newMenuItem);
//---- openMenuItem ---- //---- openMenuItem ----
openMenuItem.setText("Open"); 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.setMnemonic('O');
openMenuItem.addActionListener(e -> menuItemActionPerformed(e)); openMenuItem.addActionListener(e -> menuItemActionPerformed(e));
fileMenu.add(openMenuItem); fileMenu.add(openMenuItem);
@@ -273,21 +273,21 @@ public class FlatMnemonicsTest
//---- closeMenuItem ---- //---- closeMenuItem ----
closeMenuItem.setText("Close"); 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.setMnemonic('C');
closeMenuItem.addActionListener(e -> menuItemActionPerformed(e)); closeMenuItem.addActionListener(e -> menuItemActionPerformed(e));
fileMenu.add(closeMenuItem); fileMenu.add(closeMenuItem);
//---- closeMenuItem2 ---- //---- closeMenuItem2 ----
closeMenuItem2.setText("Close All"); 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)); closeMenuItem2.addActionListener(e -> menuItemActionPerformed(e));
fileMenu.add(closeMenuItem2); fileMenu.add(closeMenuItem2);
fileMenu.addSeparator(); fileMenu.addSeparator();
//---- exitMenuItem ---- //---- exitMenuItem ----
exitMenuItem.setText("Exit"); 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.setMnemonic('X');
exitMenuItem.addActionListener(e -> menuItemActionPerformed(e)); exitMenuItem.addActionListener(e -> menuItemActionPerformed(e));
fileMenu.add(exitMenuItem); fileMenu.add(exitMenuItem);

2
flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeFileEditor.java
View File

@@ -527,7 +527,7 @@ public class FlatThemeFileEditor
//---- previousEditorMenuItem ---- //---- previousEditorMenuItem ----
previousEditorMenuItem.setText("Previous Editor"); previousEditorMenuItem.setText("Previous Editor");
previousEditorMenuItem.setMnemonic('P'); 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()); previousEditorMenuItem.addActionListener(e -> previousEditor());
windowMenu.add(previousEditorMenuItem); windowMenu.add(previousEditorMenuItem);
} }