From b93f62906fff407bde9f6a026bc2bf7ced9a49b5 Mon Sep 17 00:00:00 2001 From: alitvinov Date: Mon, 3 Jun 2013 14:05:55 +0400 Subject: [PATCH] 7151823: The test incorrectly recognizing OS Reviewed-by: serb, alexp --- test/javax/swing/JTabbedPane/4624207/bug4624207.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/javax/swing/JTabbedPane/4624207/bug4624207.java b/test/javax/swing/JTabbedPane/4624207/bug4624207.java index 45ca60344..d8bf8f621 100644 --- a/test/javax/swing/JTabbedPane/4624207/bug4624207.java +++ b/test/javax/swing/JTabbedPane/4624207/bug4624207.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2013, 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 @@ -37,6 +37,8 @@ import java.awt.*; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.KeyEvent; + +import sun.awt.OSInfo; import sun.awt.SunToolkit; public class bug4624207 implements ChangeListener, FocusListener { @@ -99,7 +101,7 @@ public class bug4624207 implements ChangeListener, FocusListener { toolkit.realSync(); - if ("Aqua".equals(UIManager.getLookAndFeel().getID())) { + if (OSInfo.getOSType() == OSInfo.OSType.MACOSX) { Util.hitKeys(robot, KeyEvent.VK_CONTROL, KeyEvent.VK_ALT, KeyEvent.VK_B); } else { Util.hitKeys(robot, KeyEvent.VK_ALT, KeyEvent.VK_B); -- GitLab