Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8241710: NullPointerException while entering empty submenu with "arrow right" #161

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -650,6 +650,11 @@ private void processRightKey(KeyEvent ke) {

private void showMenu(Menu menu) {
menu.show();

if (submenu == null) {
return;
}

// request focus on the first item of the submenu after it is shown
ContextMenuContent cmContent = (ContextMenuContent)submenu.getSkin().getNode();
if (cmContent != null) {
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -452,6 +452,22 @@ private ContextMenu createContextMenuAndShowSubMenu() {
subMenuItem1, focusedItem);
}

@Test public void test_emptySubMenu_rightKeyDoesNothing() {
Menu testMenu = new Menu("Menu1");
ContextMenu testCM = new ContextMenu();

testCM.getItems().addAll(testMenu);
testCM.show(anchorBtn, Side.RIGHT, 0, 0);
assertNotNull(getShowingMenuContent(testCM));

// Go to testMenu
pressDownKey(testCM);

// testMenu does not have any subMenu - try to open it
// this used to casue NPE - fixed in JDK-8241710
pressRightKey(testCM);
}

@Test public void test_navigateSubMenu_leftKeyClosesSubMenu() {
ContextMenu cm = createContextMenuAndShowSubMenu();

ProTip! Use n and p to navigate between commits in a pull request.