You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/09/25 21:11:48 UTC
svn commit: r1001301 -
/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
Author: gbrown
Date: Sat Sep 25 19:11:48 2010
New Revision: 1001301
URL: http://svn.apache.org/viewvc?rev=1001301&view=rev
Log:
Fix potential NPE in isFocusable().
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java?rev=1001301&r1=1001300&r2=1001301&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java Sat Sep 25 19:11:48 2010
@@ -2313,11 +2313,13 @@ public abstract class Component implemen
* <tt>true</tt> if the component is capable of receiving the focus
*/
public boolean isFocusable() {
- boolean focusable = skin.isFocusable() && isEnabled();
+ boolean focusable = skin.isFocusable();
- if (focusable) {
+ if (focusable && isEnabled()) {
Window window = getWindow();
- focusable = window.isOpen() && !window.isClosing();
+ focusable = (window != null
+ && window.isOpen()
+ && !window.isClosing());
}
return focusable;