checkstyle sweep

[fanfix.git] / src / jexer / menu / TMenuItem.java

diff --git a/src/jexer/menu/TMenuItem.java b/src/jexer/menu/TMenuItem.java
index 43ea8f03cccc1f5e6f6f2d4b1e82ef7646f7b2d1..089887006d1f15bc8400c4b0b73319ecd75f5123 100644 (file)
--- a/src/jexer/menu/TMenuItem.java
+++ b/src/jexer/menu/TMenuItem.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Jexer - Java Text User Interface
  *
  * License: LGPLv3 or later
@@ -56,6 +56,15 @@ public class TMenuItem extends TWidget {
      */
     private int id = TMenu.MID_UNUSED;
 
+    /**
+     * Get the menu item ID.
+     *
+     * @return the id
+     */
+    public final int getId() {
+        return id;
+    }
+
     /**
      * When true, this item can be checked or unchecked.
      */
@@ -69,7 +78,7 @@ public class TMenuItem extends TWidget {
     public final void setCheckable(final boolean checkable) {
         this.checkable = checkable;
     }
-    
+
     /**
      * When true, this item is checked.
      */
@@ -80,11 +89,6 @@ public class TMenuItem extends TWidget {
      */
     private TKeypress key;
 
-    /**
-     * When true, a global accelerator can be used to select this item.
-     */
-    private boolean hasKey = false;
-
     /**
      * The title string.  Use '&' to specify a mnemonic, i.e. "&File" will
      * highlight the 'F' and allow 'f' or 'F' to select it.
@@ -100,18 +104,29 @@ public class TMenuItem extends TWidget {
         return mnemonic;
     }
 
+    /**
+     * Get a global accelerator key for this menu item.
+     *
+     * @return global keyboard accelerator, or null if no key is associated
+     * with this item
+     */
+    public final TKeypress getKey() {
+        return key;
+    }
+
     /**
      * Set a global accelerator key for this menu item.
      *
      * @param key global keyboard accelerator
      */
     public final void setKey(final TKeypress key) {
-        hasKey = true;
         this.key = key;
 
-        int newWidth = (label.length() + 4 + key.toString().length() + 2);
-        if (newWidth > getWidth()) {
-            setWidth(newWidth);
+        if (key != null) {
+            int newWidth = (label.length() + 4 + key.toString().length() + 2);
+            if (newWidth > getWidth()) {
+                setWidth(newWidth);
+            }
         }
     }
 
@@ -181,6 +196,7 @@ public class TMenuItem extends TWidget {
      * Returns true if the mouse is currently on the menu item.
      *
      * @param mouse mouse event
+     * @return if true then the mouse is currently on this item
      */
     private boolean mouseOnMenuItem(final TMouseEvent mouse) {
         if ((mouse.getY() == 0)
@@ -218,10 +234,10 @@ public class TMenuItem extends TWidget {
         getScreen().vLineXY(getWidth() - 1, 0, 1, cVSide, background);
 
         getScreen().hLineXY(1, 0, getWidth() - 2, ' ', menuColor);
-        getScreen().putStrXY(2, 0, mnemonic.getRawLabel(), menuColor);
-        if (hasKey) {
+        getScreen().putStringXY(2, 0, mnemonic.getRawLabel(), menuColor);
+        if (key != null) {
             String keyLabel = key.toString();
-            getScreen().putStrXY((getWidth() - keyLabel.length() - 2), 0,
+            getScreen().putStringXY((getWidth() - keyLabel.length() - 2), 0,
                 keyLabel, menuColor);
         }
         if (mnemonic.getShortcutIdx() >= 0) {
@@ -247,21 +263,6 @@ public class TMenuItem extends TWidget {
         }
     }
 
-    /**
-     * Handle mouse button presses.
-     *
-     * @param event mouse button press event
-     */
-    /* TODO: this was commented out in d-tui, why?
-    @Override
-    public void onMouseDown(final TMouseEvent event) {
-        if ((mouseOnMenuItem(event)) && (event.mouse1)) {
-            dispatch();
-            return;
-        }
-    }
-    */
-
     /**
      * Handle mouse button releases.
      *