< prev index next >
src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java
Print this page
rev 1571 : 8010297: Missing isLoggable() checks in logging code
Summary: Add isLoggable() checks
Reviewed-by: anthony, mchung, serb
Contributed-by: Laurent Bourges <bourges.laurent@gmail.com>
*** 89,101 ****
* null if no suitable Component can be found
* @throws IllegalArgumentException if aContainer is not a focus cycle
* root of aComponent or focus traversal policy provider, or if either aContainer or
* aComponent is null
*/
! public Component getComponentAfter(Container aContainer,
! Component aComponent) {
! if (log.isLoggable(Level.FINE)) log.fine("Looking for next component in " + aContainer + " for " + aComponent);
if (aContainer == null || aComponent == null) {
throw new IllegalArgumentException("aContainer and aComponent cannot be null");
}
if (!aContainer.isFocusTraversalPolicyProvider() && !aContainer.isFocusCycleRoot()) {
throw new IllegalArgumentException("aContainer should be focus cycle root or focus traversal policy provider");
--- 89,102 ----
* null if no suitable Component can be found
* @throws IllegalArgumentException if aContainer is not a focus cycle
* root of aComponent or focus traversal policy provider, or if either aContainer or
* aComponent is null
*/
! public Component getComponentAfter(Container aContainer, Component aComponent) {
! if (log.isLoggable(Level.FINE)) {
! log.fine("Looking for next component in " + aContainer + " for " + aComponent);
! }
if (aContainer == null || aComponent == null) {
throw new IllegalArgumentException("aContainer and aComponent cannot be null");
}
if (!aContainer.isFocusTraversalPolicyProvider() && !aContainer.isFocusCycleRoot()) {
throw new IllegalArgumentException("aContainer should be focus cycle root or focus traversal policy provider");
*** 106,122 ****
synchronized(aContainer.getTreeLock()) {
found.value = false;
Component retval = getComponentAfter(aContainer, aComponent,
found);
if (retval != null) {
! if (log.isLoggable(Level.FINE)) log.fine("After component is " + retval);
return retval;
} else if (found.value) {
! if (log.isLoggable(Level.FINE)) log.fine("Didn't find next component in " + aContainer + " - falling back to the first ");
return getFirstComponent(aContainer);
} else {
! if (log.isLoggable(Level.FINE)) log.fine("After component is null");
return null;
}
}
}
--- 107,129 ----
synchronized(aContainer.getTreeLock()) {
found.value = false;
Component retval = getComponentAfter(aContainer, aComponent,
found);
if (retval != null) {
! if (log.isLoggable(Level.FINE)) {
! log.fine("After component is " + retval);
! }
return retval;
} else if (found.value) {
! if (log.isLoggable(Level.FINE)) {
! log.fine("Didn't find next component in " + aContainer + " - falling back to the first ");
! }
return getFirstComponent(aContainer);
} else {
! if (log.isLoggable(Level.FINE)) {
! log.fine("After component is null");
! }
return null;
}
}
}
*** 139,164 ****
Component comp = aContainer.getComponent(i);
if ((comp instanceof Container) &&
!((Container)comp).isFocusCycleRoot()) {
Component retval = null;
if (((Container)comp).isFocusTraversalPolicyProvider()) {
! if (log.isLoggable(Level.FINE)) log.fine("Entering FTP " + comp);
Container cont = (Container) comp;
FocusTraversalPolicy policy = cont.getFocusTraversalPolicy();
! if (log.isLoggable(Level.FINE)) log.fine("FTP contains " + aComponent + ": " + cont.isAncestorOf(aComponent));
if (found.value) {
retval = policy.getDefaultComponent(cont);
! if (log.isLoggable(Level.FINE)) log.fine("Used FTP for getting default component: " + retval);
} else {
found.value = cont.isAncestorOf(aComponent);
if (found.value) {
if (aComponent == policy.getLastComponent(cont)) {
// Reached last component, going to wrap - should switch to next provider
retval = null;
} else {
retval = policy.getComponentAfter(cont, aComponent);
! if (log.isLoggable(Level.FINE)) log.fine("FTP found next for the component : " + retval);
}
}
}
} else {
retval = getComponentAfter((Container)comp,
--- 146,179 ----
Component comp = aContainer.getComponent(i);
if ((comp instanceof Container) &&
!((Container)comp).isFocusCycleRoot()) {
Component retval = null;
if (((Container)comp).isFocusTraversalPolicyProvider()) {
! if (log.isLoggable(Level.FINE)) {
! log.fine("Entering FTP " + comp);
! }
Container cont = (Container) comp;
FocusTraversalPolicy policy = cont.getFocusTraversalPolicy();
! if (log.isLoggable(Level.FINE)) {
! log.fine("FTP contains " + aComponent + ": " + cont.isAncestorOf(aComponent));
! }
if (found.value) {
retval = policy.getDefaultComponent(cont);
! if (log.isLoggable(Level.FINE)) {
! log.fine("Used FTP for getting default component: " + retval);
! }
} else {
found.value = cont.isAncestorOf(aComponent);
if (found.value) {
if (aComponent == policy.getLastComponent(cont)) {
// Reached last component, going to wrap - should switch to next provider
retval = null;
} else {
retval = policy.getComponentAfter(cont, aComponent);
! if (log.isLoggable(Level.FINE)) {
! log.fine("FTP found next for the component : " + retval);
! }
}
}
}
} else {
retval = getComponentAfter((Container)comp,
*** 221,237 ****
synchronized(aContainer.getTreeLock()) {
found.value = false;
Component retval = getComponentBefore(aContainer, aComponent,
found);
if (retval != null) {
! if (log.isLoggable(Level.FINE)) log.fine("Before component is " + retval);
return retval;
} else if (found.value) {
! if (log.isLoggable(Level.FINE)) log.fine("Didn't find before component in " + aContainer + " - falling back to the first ");
return getLastComponent(aContainer);
} else {
! if (log.isLoggable(Level.FINE)) log.fine("Before component is null");
return null;
}
}
}
--- 236,258 ----
synchronized(aContainer.getTreeLock()) {
found.value = false;
Component retval = getComponentBefore(aContainer, aComponent,
found);
if (retval != null) {
! if (log.isLoggable(Level.FINE)) {
! log.fine("Before component is " + retval);
! }
return retval;
} else if (found.value) {
! if (log.isLoggable(Level.FINE)) {
! log.fine("Didn't find before component in " + aContainer + " - falling back to the first ");
! }
return getLastComponent(aContainer);
} else {
! if (log.isLoggable(Level.FINE)) {
! log.fine("Before component is null");
! }
return null;
}
}
}
*** 248,272 ****
found.value = true;
} else if ((comp instanceof Container) &&
!((Container)comp).isFocusCycleRoot()) {
Component retval = null;
if (((Container)comp).isFocusTraversalPolicyProvider()) {
! if (log.isLoggable(Level.FINE)) log.fine("Entering FTP " + comp);
Container cont = (Container) comp;
FocusTraversalPolicy policy = cont.getFocusTraversalPolicy();
! if (log.isLoggable(Level.FINE)) log.fine("FTP contains " + aComponent + ": " + cont.isAncestorOf(aComponent));
if (found.value) {
retval = policy.getLastComponent(cont);
! if (log.isLoggable(Level.FINE)) log.fine("Used FTP for getting last component: " + retval);
} else {
found.value = cont.isAncestorOf(aComponent);
if (found.value) {
if (aComponent == policy.getFirstComponent(cont)) {
retval = null;
} else {
retval = policy.getComponentBefore(cont, aComponent);
! if (log.isLoggable(Level.FINE)) log.fine("FTP found previous for the component : " + retval);
}
}
}
} else {
retval = getComponentBefore((Container)comp,
--- 269,301 ----
found.value = true;
} else if ((comp instanceof Container) &&
!((Container)comp).isFocusCycleRoot()) {
Component retval = null;
if (((Container)comp).isFocusTraversalPolicyProvider()) {
! if (log.isLoggable(Level.FINE)) {
! log.fine("Entering FTP " + comp);
! }
Container cont = (Container) comp;
FocusTraversalPolicy policy = cont.getFocusTraversalPolicy();
! if (log.isLoggable(Level.FINE)) {
! log.fine("FTP contains " + aComponent + ": " + cont.isAncestorOf(aComponent));
! }
if (found.value) {
retval = policy.getLastComponent(cont);
! if (log.isLoggable(Level.FINE)) {
! log.fine("Used FTP for getting last component: " + retval);
! }
} else {
found.value = cont.isAncestorOf(aComponent);
if (found.value) {
if (aComponent == policy.getFirstComponent(cont)) {
retval = null;
} else {
retval = policy.getComponentBefore(cont, aComponent);
! if (log.isLoggable(Level.FINE)) {
! log.fine("FTP found previous for the component : " + retval);
! }
}
}
}
} else {
retval = getComponentBefore((Container)comp,
*** 359,369 ****
*/
public Component getLastComponent(Container aContainer) {
if (aContainer == null) {
throw new IllegalArgumentException("aContainer cannot be null");
}
! if (log.isLoggable(Level.FINE)) log.fine("Looking for the last component in " + aContainer);
synchronized(aContainer.getTreeLock()) {
if (!(aContainer.isVisible() &&
aContainer.isDisplayable()))
{
--- 388,400 ----
*/
public Component getLastComponent(Container aContainer) {
if (aContainer == null) {
throw new IllegalArgumentException("aContainer cannot be null");
}
! if (log.isLoggable(Level.FINE)) {
! log.fine("Looking for the last component in " + aContainer);
! }
synchronized(aContainer.getTreeLock()) {
if (!(aContainer.isVisible() &&
aContainer.isDisplayable()))
{
*** 376,394 ****
!((Container)comp).isFocusCycleRoot())
{
Component retval = null;
Container cont = (Container)comp;
if (cont.isFocusTraversalPolicyProvider()) {
! if (log.isLoggable(Level.FINE)) log.fine("\tEntering FTP " + cont);
FocusTraversalPolicy policy = cont.getFocusTraversalPolicy();
retval = policy.getLastComponent(cont);
} else {
! if (log.isLoggable(Level.FINE)) log.fine("\tEntering sub-container");
retval = getLastComponent((Container)comp);
}
if (retval != null) {
! if (log.isLoggable(Level.FINE)) log.fine("\tFound last component : " + retval);
return retval;
}
} else if (accept(comp)) {
return comp;
}
--- 407,431 ----
!((Container)comp).isFocusCycleRoot())
{
Component retval = null;
Container cont = (Container)comp;
if (cont.isFocusTraversalPolicyProvider()) {
! if (log.isLoggable(Level.FINE)) {
! log.fine("\tEntering FTP " + cont);
! }
FocusTraversalPolicy policy = cont.getFocusTraversalPolicy();
retval = policy.getLastComponent(cont);
} else {
! if (log.isLoggable(Level.FINE)) {
! log.fine("\tEntering sub-container");
! }
retval = getLastComponent((Container)comp);
}
if (retval != null) {
! if (log.isLoggable(Level.FINE)) {
! log.fine("\tFound last component : " + retval);
! }
return retval;
}
} else if (accept(comp)) {
return comp;
}
< prev index next >