git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
misc cleanup
[fanfix.git]
/
src
/
jexer
/
menu
/
TMenu.java
diff --git
a/src/jexer/menu/TMenu.java
b/src/jexer/menu/TMenu.java
index da349bf3ccc7d7faa5dbf066b7cad7f51be8c258..ad8e4acc871bb4cb73ca356e9b92fbc80717341f 100644
(file)
--- a/
src/jexer/menu/TMenu.java
+++ b/
src/jexer/menu/TMenu.java
@@
-321,7
+321,7
@@
public final class TMenu extends TWindow {
* @param key global keyboard accelerator
* @return the new menu item
*/
* @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);
final TKeypress key) {
assert (id >= 1024);
@@
-351,7
+351,7
@@
public final class TMenu extends TWindow {
for (TWidget widget: getChildren()) {
widget.setWidth(getWidth() - 2);
}
for (TWidget widget: getChildren()) {
widget.setWidth(getWidth() - 2);
}
- getApplication().addAccelerator(menuItem,
toLower(key
));
+ getApplication().addAccelerator(menuItem,
key.toLowerCase(
));
getApplication().recomputeMenuX();
activate(0);
return menuItem;
getApplication().recomputeMenuX();
activate(0);
return menuItem;
@@
-364,7
+364,7
@@
public final class TMenu extends TWindow {
* @param label menu item label
* @return the new menu item
*/
* @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);
}
assert (id >= 1024);
return addItemInternal(id, label);
}
@@
-400,7
+400,7
@@
public final class TMenu extends TWindow {
* (inclusive).
* @return the new menu item
*/
* (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);
assert (id >= 0);
assert (id < 1024);
@@
-439,7
+439,8
@@
public final class TMenu extends TWindow {
break;
case MID_CLEAR:
label = "C&lear";
break;
case MID_CLEAR:
label = "C&lear";
- key = kbDel;
+ hasKey = false;
+ // key = kbDel;
break;
case MID_TILE:
break;
case MID_TILE:
@@
-472,7
+473,8
@@
public final class TMenu extends TWindow {
break;
case MID_WINDOW_CLOSE:
label = "&Close";
break;
case MID_WINDOW_CLOSE:
label = "&Close";
- key = kbCtrlW;
+ hasKey = false;
+ // key = kbCtrlW;
break;
default:
break;
default:
@@
-488,7
+490,7
@@
public final class TMenu extends TWindow {
/**
* Convenience function to add a menu separator.
*/
/**
* Convenience function to add a menu separator.
*/
- public void addSeparator() {
+ public
final
void addSeparator() {
int newY = getChildren().size() + 1;
assert (newY < getHeight());
int newY = getChildren().size() + 1;
assert (newY < getHeight());
@@
-503,7
+505,7
@@
public final class TMenu extends TWindow {
* denoted by prefixing a letter with "&", e.g. "&File"
* @return the new sub-menu
*/
* 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());
int newY = getChildren().size() + 1;
assert (newY < getHeight());