Skip to content
Permalink
Browse files

8249278: Revert JDK-8226253 which breaks the spec of AccessibleState.…

…SHOWING for JList

Reviewed-by: prr, serb
  • Loading branch information
arapte committed Jul 16, 2020
1 parent 55039aa commit 18f3591a1b3a1841ce09a9a9b8fc3bca7d539ed6
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2017, 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
@@ -3317,7 +3317,6 @@ public AccessibleStateSet getAccessibleStateSet() {
}

s.add(AccessibleState.SELECTABLE);
s.add(AccessibleState.VISIBLE);
if (parent.isFocusOwner()
&& (indexInParent == parent.getLeadSelectionIndex())) {
s.add(AccessibleState.ACTIVE);
@@ -3330,6 +3329,11 @@ public AccessibleStateSet getAccessibleStateSet() {
} else if (s.contains(AccessibleState.SHOWING)) {
s.remove(AccessibleState.SHOWING);
}
if (this.isVisible()) {
s.add(AccessibleState.VISIBLE);
} else if (s.contains(AccessibleState.VISIBLE)) {
s.remove(AccessibleState.VISIBLE);
}
s.add(AccessibleState.TRANSIENT); // cell-rendered
return s;
}
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2018, 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
@@ -1457,38 +1457,6 @@ public AccessibleStateSet call() throws Exception {
return null;
}

private int getNonVisibleChildrenCountTillIndex(AccessibleContext parentAC, int index) {
if (parentAC != null && index >= 0 && index < parentAC.getAccessibleChildrenCount()) {
int nonVisibleChildrenCount = 0;
for (int i = 0; i <= index; i++) {
if (!parentAC.getAccessibleChild(i).getAccessibleContext().getAccessibleStateSet().contains(AccessibleState.VISIBLE)) {
nonVisibleChildrenCount++;
}
}
return nonVisibleChildrenCount;
}
return 0;
}

private Accessible getVisibleChildAtIndex(AccessibleContext parentAC, int index) {
if (parentAC != null && index >= 0 && index < parentAC.getAccessibleChildrenCount()) {
int visibleIndex = -1;
int childrenCount = parentAC.getAccessibleChildrenCount();
for (int i = 0; i <= childrenCount; i++) {
Accessible child = parentAC.getAccessibleChild(i);
if (child != null) {
AccessibleContext ac = child.getAccessibleContext();
if (ac != null && ac.getAccessibleStateSet().contains(AccessibleState.VISIBLE)) {
visibleIndex++;
}
if (visibleIndex == index) {
return child;
}
}
}
}
return null;
}
/**
* returns the AccessibleParent from an AccessibleContext
*/
@@ -1519,12 +1487,7 @@ private int getAccessibleIndexInParentFromContext(final AccessibleContext ac) {
return InvocationUtils.invokeAndWait(new Callable<Integer>() {
@Override
public Integer call() throws Exception {
int indexInParent = ac.getAccessibleIndexInParent();
Accessible parent = ac.getAccessibleParent();
if (parent != null) {
indexInParent -= getNonVisibleChildrenCountTillIndex(parent.getAccessibleContext(), indexInParent);
}
return indexInParent;
return ac.getAccessibleIndexInParent();
}
}, ac);
}
@@ -1538,8 +1501,7 @@ private int getAccessibleChildrenCountFromContext(final AccessibleContext ac) {
return InvocationUtils.invokeAndWait(new Callable<Integer>() {
@Override
public Integer call() throws Exception {
int childrenCount = ac.getAccessibleChildrenCount();
return childrenCount - getNonVisibleChildrenCountTillIndex(ac, childrenCount - 1);
return ac.getAccessibleChildrenCount();
}
}, ac);
}
@@ -1575,7 +1537,7 @@ public JTable call() throws Exception {
return InvocationUtils.invokeAndWait(new Callable<AccessibleContext>() {
@Override
public AccessibleContext call() throws Exception {
Accessible a = getVisibleChildAtIndex(ac, index);
Accessible a = ac.getAccessibleChild(index);
if (a != null) {
return a.getAccessibleContext();
}
@@ -3555,11 +3517,7 @@ public Integer call() throws Exception {
AccessibleRelation[] relations = ars.toArray();
if (relations != null && i >= 0 && i < relations.length) {
Object[] targets = relations[i].getTarget();
if (targets != null) {
int targetCount = targets.length -
getNonVisibleTargetCountTillIndex(targets, targets.length - 1);
return targetCount;
}
return targets.length;
}
}
}
@@ -3585,7 +3543,7 @@ public AccessibleContext call() throws Exception {
if (relations != null && i >= 0 && i < relations.length) {
Object[] targets = relations[i].getTarget();
if (targets != null && j >= 0 & j < targets.length) {
Object o = getVisibleTargetAtIndex(targets, j);
Object o = targets[j];
if (o instanceof Accessible) {
return ((Accessible) o).getAccessibleContext();
}
@@ -3598,40 +3556,6 @@ public AccessibleContext call() throws Exception {
}, ac);
}

private Object getVisibleTargetAtIndex(Object[] targets, int index) {
if (index >= 0 && index < targets.length) {
int visibleTargetIndex = -1;
for (int i = 0; i < targets.length; i++) {
if (targets[i] instanceof Accessible) {
AccessibleContext ac = ((Accessible) targets[i]).getAccessibleContext();
if (ac != null && ac.getAccessibleStateSet().contains(AccessibleState.VISIBLE)) {
visibleTargetIndex++;
}
if (visibleTargetIndex == index) {
return targets[i];
}
}
}
}
return null;
}

private int getNonVisibleTargetCountTillIndex(Object[] targets, int index) {
if (index >= 0 && index < targets.length) {
int nonVisibleTargetsCount = 0;
for (int i = 0; i <= index; i++) {
if (targets[i] instanceof Accessible) {
AccessibleContext ac = ((Accessible) targets[i]).getAccessibleContext();
if (ac != null && !ac.getAccessibleStateSet().contains(AccessibleState.VISIBLE)) {
nonVisibleTargetsCount++;
}
}
}
return nonVisibleTargetsCount;
}
return 0;
}

// ========= AccessibleHypertext =========

private Map<AccessibleHypertext, AccessibleContext> hyperTextContextMap = new WeakHashMap<>();

0 comments on commit 18f3591

Please sign in to comment.