clean up threads and timers

[nikiroo-utils.git] / src / jexer / menu / TMenu.java

diff --git a/src/jexer/menu/TMenu.java b/src/jexer/menu/TMenu.java
index da349bf3ccc7d7faa5dbf066b7cad7f51be8c258..ee1af554092ad442adb6b87c8318f15cc9ab1af8 100644 (file)
--- a/src/jexer/menu/TMenu.java
+++ b/src/jexer/menu/TMenu.java
@@ -177,7 +177,6 @@ public final class TMenu extends TWindow {
     @Override
     public void onMouseDown(final TMouseEvent mouse) {
         this.mouse = mouse;
-        setRepaint();
 
         // Pass to children
         for (TWidget widget: getChildren()) {
@@ -202,7 +201,6 @@ public final class TMenu extends TWindow {
     @Override
     public void onMouseUp(final TMouseEvent mouse) {
         this.mouse = mouse;
-        setRepaint();
 
         // Pass to children
         for (TWidget widget: getChildren()) {
@@ -227,7 +225,6 @@ public final class TMenu extends TWindow {
     @Override
     public void onMouseMotion(final TMouseEvent mouse) {
         this.mouse = mouse;
-        setRepaint();
 
         // See if we should activate a different menu item
         for (TWidget widget: getChildren()) {
@@ -306,7 +303,6 @@ public final class TMenu extends TWindow {
         // Dispatch the keypress to an active widget
         for (TWidget widget: getChildren()) {
             if (widget.getActive()) {
-                setRepaint();
                 widget.handleEvent(keypress);
                 return;
             }
@@ -321,7 +317,7 @@ public final class TMenu extends TWindow {
      * @param key global keyboard accelerator
      * @return the new menu item
      */
-    public TMenuItem addItem(final int id, final String label,
+    public final TMenuItem addItem(final int id, final String label,
         final TKeypress key) {
 
         assert (id >= 1024);
@@ -351,7 +347,7 @@ public final class TMenu extends TWindow {
         for (TWidget widget: getChildren()) {
             widget.setWidth(getWidth() - 2);
         }
-        getApplication().addAccelerator(menuItem, toLower(key));
+        getApplication().addAccelerator(menuItem, key.toLowerCase());
         getApplication().recomputeMenuX();
         activate(0);
         return menuItem;
@@ -364,7 +360,7 @@ public final class TMenu extends TWindow {
      * @param label menu item label
      * @return the new menu item
      */
-    public TMenuItem addItem(final int id, final String label) {
+    public final TMenuItem addItem(final int id, final String label) {
         assert (id >= 1024);
         return addItemInternal(id, label);
     }
@@ -400,7 +396,7 @@ public final class TMenu extends TWindow {
      * (inclusive).
      * @return the new menu item
      */
-    public TMenuItem addDefaultItem(final int id) {
+    public final TMenuItem addDefaultItem(final int id) {
         assert (id >= 0);
         assert (id < 1024);
 
@@ -439,7 +435,8 @@ public final class TMenu extends TWindow {
             break;
         case MID_CLEAR:
             label = "C&lear";
-            key = kbDel;
+            hasKey = false;
+            // key = kbDel;
             break;
 
         case MID_TILE:
@@ -472,7 +469,8 @@ public final class TMenu extends TWindow {
             break;
         case MID_WINDOW_CLOSE:
             label = "&Close";
-            key = kbCtrlW;
+            hasKey = false;
+            // key = kbCtrlW;
             break;
 
         default:
@@ -488,7 +486,7 @@ public final class TMenu extends TWindow {
     /**
      * Convenience function to add a menu separator.
      */
-    public void addSeparator() {
+    public final void addSeparator() {
         int newY = getChildren().size() + 1;
         assert (newY < getHeight());
 
@@ -503,7 +501,7 @@ public final class TMenu extends TWindow {
      * denoted by prefixing a letter with "&", e.g. "&File"
      * @return the new sub-menu
      */
-    public TSubMenu addSubMenu(final String title) {
+    public final TSubMenu addSubMenu(final String title) {
         int newY = getChildren().size() + 1;
         assert (newY < getHeight());