From feaf413ce36326cb7ba7bd0f2c72308dc603f21f Mon Sep 17 00:00:00 2001 From: Prasanta Sadhukhan Date: Sat, 27 May 2017 12:55:33 +0530 Subject: [PATCH] 6461834: Minimize WindowsLookAndFeel classes included with Unix JDKs Reviewed-by: ihse, aniyogi, prr --- .../share/classes/module-info.java | 2 -- .../windows/classes/module-info.java.extra | 26 +++++++++++++++++++ .../java/swing/plaf/windows/Test6824600.java | 1 + .../swing/JButton/4796987/bug4796987.java | 1 + .../swing/JComboBox/4199622/bug4199622.java | 1 + .../swing/JComboBox/8015300/Test8015300.java | 1 + .../JFileChooser/8046391/bug8046391.java | 1 + .../JInternalFrame/6725409/bug6725409.java | 1 + .../swing/JSlider/6524424/bug6524424.java | 1 + .../javax/swing/JTree/8004298/bug8004298.java | 1 + jdk/test/javax/swing/border/Test4856008.java | 1 + jdk/test/javax/swing/border/Test6978482.java | 1 + 12 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 jdk/src/java.desktop/windows/classes/module-info.java.extra diff --git a/jdk/src/java.desktop/share/classes/module-info.java b/jdk/src/java.desktop/share/classes/module-info.java index 658becc98c3..127ef275754 100644 --- a/jdk/src/java.desktop/share/classes/module-info.java +++ b/jdk/src/java.desktop/share/classes/module-info.java @@ -93,8 +93,6 @@ module java.desktop { opens javax.swing.plaf.basic to jdk.jconsole; - opens com.sun.java.swing.plaf.windows to - jdk.jconsole; uses java.awt.im.spi.InputMethodDescriptor; uses javax.accessibility.AccessibilityProvider; diff --git a/jdk/src/java.desktop/windows/classes/module-info.java.extra b/jdk/src/java.desktop/windows/classes/module-info.java.extra new file mode 100644 index 00000000000..9cd11e34a91 --- /dev/null +++ b/jdk/src/java.desktop/windows/classes/module-info.java.extra @@ -0,0 +1,26 @@ +/* + * Copyright (c) 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +opens com.sun.java.swing.plaf.windows to jdk.jconsole; diff --git a/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java b/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java index 74b2890c563..7e07c517a28 100644 --- a/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java +++ b/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java @@ -23,6 +23,7 @@ /* @test @bug 6824600 + @requires (os.family == "windows") @summary OOM occurs when setLookAndFeel() is executed in Windows L&F(XP style) @author Pavel Porvatov @modules java.desktop/com.sun.java.swing.plaf.windows diff --git a/jdk/test/javax/swing/JButton/4796987/bug4796987.java b/jdk/test/javax/swing/JButton/4796987/bug4796987.java index 52d2a32120f..65698791bfb 100644 --- a/jdk/test/javax/swing/JButton/4796987/bug4796987.java +++ b/jdk/test/javax/swing/JButton/4796987/bug4796987.java @@ -24,6 +24,7 @@ /* * @test * @bug 4796987 + * @requires (os.family == "windows") * @summary XP Only: JButton.setBorderPainted() does not work with XP L&F * @author Alexander Scherbatiy * @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java b/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java index e96e2cd45a8..ffa07264681 100644 --- a/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java +++ b/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java @@ -25,6 +25,7 @@ @test @key headful @bug 4199622 + @requires (os.family == "windows") @summary RFE: JComboBox shouldn't send ActionEvents for keyboard navigation @author Vladislav Karnaukhov @library ../../../../lib/testlibrary diff --git a/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java b/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java index 747418bf7b1..65afea9d60e 100644 --- a/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java +++ b/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java @@ -39,6 +39,7 @@ import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE; * @test * @key headful * @bug 8015300 + * @requires (os.family == "windows") * @summary Tests that editable combobox selects all text. * @author Sergey Malenkov * @library ../../../../lib/testlibrary/ diff --git a/jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java b/jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java index deed68deb17..21b840787e9 100644 --- a/jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java +++ b/jdk/test/javax/swing/JFileChooser/8046391/bug8046391.java @@ -24,6 +24,7 @@ /* * @test * @bug 8046391 + * @requires (os.family == "windows") * @summary JFileChooser hangs if displayed in Windows L&F * @author Alexey Ivanov * @library ../../../../lib/testlibrary diff --git a/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java b/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java index c56eaddc69d..71d52ff2d4f 100644 --- a/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java +++ b/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java @@ -24,6 +24,7 @@ /* @test * @key headful * @bug 6725409 + * @requires (os.family == "windows") * @summary Checks that JInternalFrame's system menu * can be localized during run-time * @author Mikhail Lapshin diff --git a/jdk/test/javax/swing/JSlider/6524424/bug6524424.java b/jdk/test/javax/swing/JSlider/6524424/bug6524424.java index f819d247d96..7e52135c94f 100644 --- a/jdk/test/javax/swing/JSlider/6524424/bug6524424.java +++ b/jdk/test/javax/swing/JSlider/6524424/bug6524424.java @@ -23,6 +23,7 @@ /* @test * @bug 6524424 + * @requires (os.family == "windows") * @summary JSlider Clicking In Tracks Behavior Inconsistent For Different Tick Spacings * @author Pavel Porvatov * @modules java.desktop/com.sun.java.swing.plaf.windows diff --git a/jdk/test/javax/swing/JTree/8004298/bug8004298.java b/jdk/test/javax/swing/JTree/8004298/bug8004298.java index 440dbe4e23b..e0b40d93919 100644 --- a/jdk/test/javax/swing/JTree/8004298/bug8004298.java +++ b/jdk/test/javax/swing/JTree/8004298/bug8004298.java @@ -25,6 +25,7 @@ * @test * @key headful * @bug 8004298 + * @requires (os.family == "windows") * @summary NPE in WindowsTreeUI.ensureRowsAreVisible * @author Alexander Scherbatiy * @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/border/Test4856008.java b/jdk/test/javax/swing/border/Test4856008.java index 398fefb51a1..dd28834cd59 100644 --- a/jdk/test/javax/swing/border/Test4856008.java +++ b/jdk/test/javax/swing/border/Test4856008.java @@ -24,6 +24,7 @@ /* * @test * @bug 4856008 7025987 + * @requires (os.family == "windows") * @summary Tests border insets * @author Sergey Malenkov * @modules java.desktop/com.sun.java.swing.plaf.motif diff --git a/jdk/test/javax/swing/border/Test6978482.java b/jdk/test/javax/swing/border/Test6978482.java index b9f30e531e0..89634055591 100644 --- a/jdk/test/javax/swing/border/Test6978482.java +++ b/jdk/test/javax/swing/border/Test6978482.java @@ -24,6 +24,7 @@ /* * @test * @bug 6978482 7025987 + * @requires (os.family == "windows") * @summary Tests unchecked casts * @author Sergey Malenkov * @modules java.desktop/com.sun.java.swing.plaf.motif