X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjexer%2Fmenu%2FTSubMenu.java;h=167b6a5b11fc7d656c912b36bac62ff5d8412587;hb=daa4106c096cd4d2b92c3cbae6491edccd25fcc4;hp=4720a701e3c90e787614c8f263014b8ff8cbb3e3;hpb=2b9c27db318b916730aa04f2b41bd3bff795a5dc;p=fanfix.git

diff --git a/src/jexer/menu/TSubMenu.java b/src/jexer/menu/TSubMenu.java
index 4720a70..167b6a5 100644
--- a/src/jexer/menu/TSubMenu.java
+++ b/src/jexer/menu/TSubMenu.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Jexer - Java Text User Interface
  *
  * License: LGPLv3 or later
@@ -76,19 +76,14 @@ public final class TSubMenu extends TMenuItem {
     public void draw() {
         super.draw();
 
-        CellAttributes background = getTheme().getColor("tmenu");
         CellAttributes menuColor;
-        CellAttributes menuMnemonicColor;
-        if (getAbsoluteActive()) {
+        if (isAbsoluteActive()) {
             menuColor = getTheme().getColor("tmenu.highlighted");
-            menuMnemonicColor = getTheme().getColor("tmenu.mnemonic.highlighted");
         } else {
-            if (getEnabled()) {
+            if (isEnabled()) {
                 menuColor = getTheme().getColor("tmenu");
-                menuMnemonicColor = getTheme().getColor("tmenu.mnemonic");
             } else {
                 menuColor = getTheme().getColor("tmenu.disabled");
-                menuMnemonicColor = getTheme().getColor("tmenu.disabled");
             }
         }
 
@@ -105,7 +100,7 @@ public final class TSubMenu extends TMenuItem {
     @Override
     public void onKeypress(final TKeypressEvent keypress) {
 
-        if (menu.getActive()) {
+        if (menu.isActive()) {
             menu.onKeypress(keypress);
             return;
         }
@@ -151,9 +146,9 @@ public final class TSubMenu extends TMenuItem {
      */
     @Override
     public void dispatch() {
-        assert (getEnabled());
-        if (getAbsoluteActive()) {
-            if (!menu.getActive()) {
+        assert (isEnabled());
+        if (isAbsoluteActive()) {
+            if (!menu.isActive()) {
                 getApplication().addSubMenu(menu);
                 menu.setActive(true);
             }
@@ -167,7 +162,7 @@ public final class TSubMenu extends TMenuItem {
      */
     @Override
     public TWidget getActiveChild() {
-        if (menu.getActive()) {
+        if (menu.isActive()) {
             return menu;
         }
         // Menu not active, return me