Index: C:/home/atsimbir/Harmony/classlib/modules/swing/src/main/java/common/javax/swing/LayoutFocusTraversalPolicy.java =================================================================== --- C:/home/atsimbir/Harmony/classlib/modules/swing/src/main/java/common/javax/swing/LayoutFocusTraversalPolicy.java (revision 487526) +++ C:/home/atsimbir/Harmony/classlib/modules/swing/src/main/java/common/javax/swing/LayoutFocusTraversalPolicy.java (working copy) @@ -33,6 +33,8 @@ public class LayoutFocusTraversalPolicy extends SortingFocusTraversalPolicy implements Serializable { private static final long serialVersionUID = 3761404205428127289L; + private static final String FOCUS_CYCLE_ROOT_CANNOT_BE_NULL = "Container cannot be null"; + private final InternalDefaultFocusTraversalPolicy defaultPolicy = new InternalDefaultFocusTraversalPolicy(); public LayoutFocusTraversalPolicy() { @@ -50,11 +52,17 @@ } public Component getLastComponent(final Container focusCycleRoot) { + if (focusCycleRoot == null) { + throw new IllegalArgumentException(FOCUS_CYCLE_ROOT_CANNOT_BE_NULL); + } ((LayoutComparator)getComparator()).setOrientation(focusCycleRoot.getComponentOrientation()); return super.getLastComponent(focusCycleRoot); } public Component getFirstComponent(final Container focusCycleRoot) { + if (focusCycleRoot == null) { + throw new IllegalArgumentException(FOCUS_CYCLE_ROOT_CANNOT_BE_NULL); + } ((LayoutComparator)getComparator()).setOrientation(focusCycleRoot.getComponentOrientation()); return super.getFirstComponent(focusCycleRoot); }