8145228: Java Access Bridge, getAccessibleStatesStringFromContext doesn't wrap the call to getAccessibleRole

Use invokeAndWait in two places that were missing that

Reviewed-by: alexsch, prr
This commit is contained in:
Peter Brunet 2016-03-17 21:58:19 -05:00 committed by Pete Brunet
parent fb2e7f2844
commit c93af6f4c0

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2016, 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
@ -1408,7 +1408,9 @@ final public class AccessBridge {
s.indexOf(AccessibleState.MANAGES_DESCENDANTS.toDisplayString(Locale.US)) == -1) {
// Indicate whether this component manages its own
// children
AccessibleRole role = ac.getAccessibleRole();
AccessibleRole role = InvocationUtils.invokeAndWait(() -> {
return ac.getAccessibleRole();
}, ac);
if (role == AccessibleRole.LIST ||
role == AccessibleRole.TABLE ||
role == AccessibleRole.TREE) {
@ -1666,7 +1668,9 @@ final public class AccessBridge {
*/
private AccessibleComponent getAccessibleComponentFromContext(AccessibleContext ac) {
if (ac != null) {
AccessibleComponent acmp = ac.getAccessibleComponent();
AccessibleComponent acmp = InvocationUtils.invokeAndWait(() -> {
return ac.getAccessibleComponent();
}, ac);
if (acmp != null) {
debugString("Returning AccessibleComponent Context");
return acmp;