changeset 5996:2d7e3f9f76ec

RT-34924: [ColorPicker] Null pointer (NPE) when pressing down arrow
author jgiles
date Wed, 18 Dec 2013 12:07:01 +1300
parents 7a85b9cf6241
children 8fef5aaf49f8
files modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ColorPalette.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ColorPalette.java	Wed Dec 18 11:05:19 2013 +1300
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ColorPalette.java	Wed Dec 18 12:07:01 2013 +1300
@@ -365,8 +365,8 @@
         }
         if (index == len) {
             ColorSquare cs = colorPickerGrid.getSquares().get(0);
+            focusedSquare = cs;
             focusedSquare.requestFocus();
-            focusedSquare = cs;
         }
     }