< prev index next >
src/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java
Print this page
rev 1527 : 6727662: Code improvement and warnings removing from swing packages
Summary: Removed unnecessary castings and other warnings
Reviewed-by: malenkov
*** 46,57 ****
implements Serializable
{
private transient FocusTraversalPolicy delegatePolicy;
private transient DefaultFocusManager delegateManager;
! private HashMap forwardMap = new HashMap(),
! backwardMap = new HashMap();
LegacyGlueFocusTraversalPolicy(FocusTraversalPolicy delegatePolicy) {
this.delegatePolicy = delegatePolicy;
}
LegacyGlueFocusTraversalPolicy(DefaultFocusManager delegateManager) {
--- 46,57 ----
implements Serializable
{
private transient FocusTraversalPolicy delegatePolicy;
private transient DefaultFocusManager delegateManager;
! private HashMap<Component, Component> forwardMap = new HashMap<Component, Component>(),
! backwardMap = new HashMap<Component, Component>();
LegacyGlueFocusTraversalPolicy(FocusTraversalPolicy delegatePolicy) {
this.delegatePolicy = delegatePolicy;
}
LegacyGlueFocusTraversalPolicy(DefaultFocusManager delegateManager) {
*** 68,82 ****
}
public Component getComponentAfter(Container focusCycleRoot,
Component aComponent) {
Component hardCoded = aComponent, prevHardCoded;
! HashSet sanity = new HashSet();
do {
prevHardCoded = hardCoded;
! hardCoded = (Component)forwardMap.get(hardCoded);
if (hardCoded == null) {
if (delegatePolicy != null &&
prevHardCoded.isFocusCycleRoot(focusCycleRoot)) {
return delegatePolicy.getComponentAfter(focusCycleRoot,
prevHardCoded);
--- 68,82 ----
}
public Component getComponentAfter(Container focusCycleRoot,
Component aComponent) {
Component hardCoded = aComponent, prevHardCoded;
! HashSet<Component> sanity = new HashSet<Component>();
do {
prevHardCoded = hardCoded;
! hardCoded = forwardMap.get(hardCoded);
if (hardCoded == null) {
if (delegatePolicy != null &&
prevHardCoded.isFocusCycleRoot(focusCycleRoot)) {
return delegatePolicy.getComponentAfter(focusCycleRoot,
prevHardCoded);
*** 97,111 ****
return hardCoded;
}
public Component getComponentBefore(Container focusCycleRoot,
Component aComponent) {
Component hardCoded = aComponent, prevHardCoded;
! HashSet sanity = new HashSet();
do {
prevHardCoded = hardCoded;
! hardCoded = (Component)backwardMap.get(hardCoded);
if (hardCoded == null) {
if (delegatePolicy != null &&
prevHardCoded.isFocusCycleRoot(focusCycleRoot)) {
return delegatePolicy.getComponentBefore(focusCycleRoot,
prevHardCoded);
--- 97,111 ----
return hardCoded;
}
public Component getComponentBefore(Container focusCycleRoot,
Component aComponent) {
Component hardCoded = aComponent, prevHardCoded;
! HashSet<Component> sanity = new HashSet<Component>();
do {
prevHardCoded = hardCoded;
! hardCoded = backwardMap.get(hardCoded);
if (hardCoded == null) {
if (delegatePolicy != null &&
prevHardCoded.isFocusCycleRoot(focusCycleRoot)) {
return delegatePolicy.getComponentBefore(focusCycleRoot,
prevHardCoded);
< prev index next >