Added clarification to comments and code for shortcut keys (mnemonics/etc).

src/dorkbox/systemTray/MenuItem.java

@@ -41,7 +41,9 @@ class MenuItem extends Entry {
 
     // default enabled is always true
     private volatile boolean enabled = true;
-    private volatile char mnemonicKey;
+
+    // default is 0, which will remove the shortcut key from the native peer
+    private volatile char mnemonicKey = 0;
     private volatile String tooltip;
 
     public

src/dorkbox/systemTray/ui/awt/AwtMenu.java

@@ -125,7 +125,7 @@ class AwtMenu implements MenuPeer {
     @Override
     public
     void setShortcut(final MenuItem menuItem) {
-        // yikes...
+        // Will return 0 as the vKey if it's not set (which will remove the shortcut)
         final int vKey = SwingUtil.getVirtualKey(menuItem.getShortcut());
 
         SwingUtil.invokeLater(new Runnable() {

src/dorkbox/systemTray/ui/awt/AwtMenuItem.java

@@ -107,17 +107,16 @@ class AwtMenuItem implements MenuItemPeer {
     @Override
     public
     void setShortcut(final dorkbox.systemTray.MenuItem menuItem) {
-        char shortcut = menuItem.getShortcut();
+        // Will return 0 as the vKey if it's not set (which will remove the shortcut)
-        // yikes...
+        final int vKey = SwingUtil.getVirtualKey(menuItem.getShortcut());
-        final int vKey = SwingUtil.getVirtualKey(shortcut);
 
         SwingUtil.invokeLater(new Runnable() {
-            @Override
+                @Override
-            public
+                public
-            void run() {
+                void run() {
-                _native.setShortcut(new MenuShortcut(vKey));
+                    _native.setShortcut(new MenuShortcut(vKey));
-            }
+                }
-        });
+            });
     }
 
     @Override

src/dorkbox/systemTray/ui/awt/AwtMenuItemCheckbox.java

@@ -109,17 +109,16 @@ class AwtMenuItemCheckbox implements CheckboxPeer {
     @Override
     public
     void setShortcut(final Checkbox menuItem) {
-        char shortcut = menuItem.getShortcut();
+        // Will return 0 as the vKey if it's not set (which will remove the shortcut)
-        // yikes...
+        final int vKey = SwingUtil.getVirtualKey(menuItem.getShortcut());
-        final int vKey = SwingUtil.getVirtualKey(shortcut);
 
         SwingUtil.invokeLater(new Runnable() {
-            @Override
+                @Override
-            public
+                public
-            void run() {
+                void run() {
-                _native.setShortcut(new MenuShortcut(vKey));
+                    _native.setShortcut(new MenuShortcut(vKey));
-            }
+                }
-        });
+            });
     }
 
     @Override

src/dorkbox/systemTray/ui/gtk/GtkMenu.java

@@ -362,7 +362,13 @@ class GtkMenu extends GtkBaseMenuItem implements MenuPeer {
     @Override
     public
     void setShortcut(final MenuItem menuItem) {
-        this.mnemonicKey = Character.toLowerCase(menuItem.getShortcut());
+        char shortcut = menuItem.getShortcut();
+
+        if (shortcut != 0) {
+            this.mnemonicKey = Character.toLowerCase(shortcut);
+        } else {
+            this.mnemonicKey = 0;
+        }
 
         setText(menuItem);
     }

src/dorkbox/systemTray/ui/gtk/GtkMenuItem.java

@@ -190,7 +190,13 @@ class GtkMenuItem extends GtkBaseMenuItem implements MenuItemPeer, GCallback {
     @Override
     public
     void setShortcut(final MenuItem menuItem) {
-        this.mnemonicKey = Character.toLowerCase(menuItem.getShortcut());
+        char shortcut = menuItem.getShortcut();
+
+        if (shortcut != 0) {
+            this.mnemonicKey = Character.toLowerCase(shortcut);
+        } else {
+            this.mnemonicKey = 0;
+        }
 
         setText(menuItem);
     }

src/dorkbox/systemTray/ui/gtk/GtkMenuItemCheckbox.java

@@ -308,7 +308,13 @@ class GtkMenuItemCheckbox extends GtkBaseMenuItem implements CheckboxPeer, GCall
     @Override
     public
     void setShortcut(final Checkbox checkbox) {
-        this.mnemonicKey = Character.toLowerCase(checkbox.getShortcut());
+        char shortcut = checkbox.getShortcut();
+
+        if (shortcut != 0) {
+            this.mnemonicKey = Character.toLowerCase(shortcut);
+        } else {
+            this.mnemonicKey = 0;
+        }
 
         setText(checkbox);
     }

src/dorkbox/systemTray/ui/swing/SwingMenu.java

@@ -162,17 +162,16 @@ class SwingMenu implements MenuPeer {
     @Override
     public
     void setShortcut(final MenuItem menuItem) {
-        char shortcut = menuItem.getShortcut();
+        // Will return 0 as the vKey if it's not set (which will remove the shortcut)
-        // yikes...
+        final int vKey = SwingUtil.getVirtualKey(menuItem.getShortcut());
-        final int vKey = SwingUtil.getVirtualKey(shortcut);
 
         SwingUtil.invokeLater(new Runnable() {
-            @Override
+                @Override
-            public
+                public
-            void run() {
+                void run() {
-                ((JMenu) _native).setMnemonic(vKey);
+                    ((JMenu) _native).setMnemonic(vKey);
-            }
+                }
-        });
+            });
     }
 
     @Override

src/dorkbox/systemTray/ui/swing/SwingMenuItem.java

@@ -158,9 +158,8 @@ class SwingMenuItem implements MenuItemPeer {
     @Override
     public
     void setShortcut(final MenuItem menuItem) {
-        char shortcut = menuItem.getShortcut();
+        // Will return 0 as the vKey if it's not set (which will remove the shortcut)
-        // yikes...
+        final int vKey = SwingUtil.getVirtualKey(menuItem.getShortcut());
-        final int vKey = SwingUtil.getVirtualKey(shortcut);
 
         SwingUtil.invokeLater(new Runnable() {
             @Override

src/dorkbox/systemTray/ui/swing/SwingMenuItemCheckbox.java

@@ -137,9 +137,8 @@ class SwingMenuItemCheckbox extends SwingMenuItem implements CheckboxPeer {
     @Override
     public
     void setShortcut(final Checkbox menuItem) {
-        char shortcut = menuItem.getShortcut();
+        // Will return 0 as the vKey if it's not set (which will remove the shortcut)
-        // yikes...
+        final int vKey = SwingUtil.getVirtualKey(menuItem.getShortcut());
-        final int vKey = SwingUtil.getVirtualKey(shortcut);
 
         SwingUtil.invokeLater(new Runnable() {
             @Override