# HG changeset patch # User psadhukhan # Date 1485511667 -19800 # Node ID f23912ce3308619cebfdc5bfdf7ff4f00f80a766 # Parent a089f34413562f0a767da6d52acb753844dc1d68 7190595: Nimbus: Test6657026 fails Reviewed-by: yan, jdv diff -r a089f3441356 -r f23912ce3308 jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java --- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java Fri Jan 27 12:16:57 2017 +0530 +++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java Fri Jan 27 15:37:47 2017 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -48,13 +48,13 @@ * Keys to use for forward focus traversal when the JComponent is * managing focus. */ - private static Set managingFocusForwardTraversalKeys; + private Set managingFocusForwardTraversalKeys; /** * Keys to use for backward focus traversal when the JComponent is * managing focus. */ - private static Set managingFocusBackwardTraversalKeys; + private Set managingFocusBackwardTraversalKeys; /** * Style for the JSplitPane. diff -r a089f3441356 -r f23912ce3308 jdk/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java --- a/jdk/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java Fri Jan 27 12:16:57 2017 +0530 +++ b/jdk/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java Fri Jan 27 15:37:47 2017 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 6657026 + * @bug 6657026 7190595 * @summary Tests shared BasicSplitPaneUI in different application contexts * @author Sergey Malenkov * @modules java.desktop/sun.awt