infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8353002: Remove unnecessary Windows version check in WTaskbarPeer

Browse Source 
Reviewed-by: prr, serb, aivanov
This commit is contained in:
Daniel Gredler 2025-04-07 19:53:36 +00:00 committed by Alexey Ivanov
parent 05ff557dee
commit 3757f660f2
2 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java.desktop/windows/classes/sun/awt/windows/WTaskbarPeer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2025, 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
@ -34,7 +34,6 @@ import java.awt.Window;
import java.awt.image.BufferedImage;
import java.awt.image.DataBufferInt;
import sun.awt.AWTAccessor;
import sun.awt.OSInfo;
import sun.awt.shell.ShellFolder;
final class WTaskbarPeer implements TaskbarPeer {
@ -44,9 +43,7 @@ final class WTaskbarPeer implements TaskbarPeer {
private static synchronized void init() {
if (!initExecuted) {
supported = OSInfo.getWindowsVersion()
.compareTo(OSInfo.WINDOWS_7) >= 0
&& ShellFolder.invoke(() -> nativeInit());
supported = ShellFolder.invoke(() -> nativeInit());
}
initExecuted = true;
}

50
test/jdk/java/awt/Dialog/TaskbarFeatureTest.java Normal file
View File

@ -0,0 +1,50 @@
/*
* Copyright (c) 2025, 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.
*
* 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.
*/
import java.awt.Taskbar;
import java.awt.Taskbar.Feature;
/*
* @test
* @bug 8353002
* @key headful
* @requires (os.family == "windows")
* @summary Verifies that expected taskbar features are supported on Windows.
*/
public class TaskbarFeatureTest {
public static void main(String[] args) throws Exception {
Taskbar taskbar = Taskbar.getTaskbar();
testFeature(taskbar, Feature.ICON_BADGE_IMAGE_WINDOW);
testFeature(taskbar, Feature.PROGRESS_STATE_WINDOW);
testFeature(taskbar, Feature.PROGRESS_VALUE_WINDOW);
testFeature(taskbar, Feature.USER_ATTENTION_WINDOW);
}
private static void testFeature(Taskbar taskbar, Feature feature) {
if (!taskbar.isSupported(feature)) {
throw new RuntimeException("Feature not supported: " + feature);
}
}
}