test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java

rev 51542 : 8210039: move OSInfo to top level testlibrary
Reviewed-by: duke

*** 33,44 ****
  import java.awt.event.*;
  import javax.swing.*;
  import java.applet.Applet;
  import java.util.concurrent.atomic.AtomicBoolean;
  import java.lang.reflect.InvocationTargetException;
  import test.java.awt.regtesthelpers.Util;
- import jdk.testlibrary.OSInfo;
  
  public class SubMenuShowTest extends Applet {
      Robot robot;
      JFrame frame = new JFrame("Test Frame");
      JMenuBar bar = new JMenuBar();
--- 33,45 ----
  import java.awt.event.*;
  import javax.swing.*;
  import java.applet.Applet;
  import java.util.concurrent.atomic.AtomicBoolean;
  import java.lang.reflect.InvocationTargetException;
+ 
+ import jdk.test.lib.Platform;
  import test.java.awt.regtesthelpers.Util;
  
  public class SubMenuShowTest extends Applet {
      Robot robot;
      JFrame frame = new JFrame("Test Frame");
      JMenuBar bar = new JMenuBar();
*** 83,93 ****
                  }
              });
  
          frame.setVisible(true);
  
!         boolean isMacOSX = (OSInfo.getOSType() == OSInfo.OSType.MACOSX);
          if (isMacOSX) {
              robot.keyPress(KeyEvent.VK_CONTROL);
          }
          robot.keyPress(KeyEvent.VK_ALT);
          robot.keyPress(KeyEvent.VK_F);
--- 84,94 ----
                  }
              });
  
          frame.setVisible(true);
  
!         boolean isMacOSX = Platform.isOSX();
          if (isMacOSX) {
              robot.keyPress(KeyEvent.VK_CONTROL);
          }
          robot.keyPress(KeyEvent.VK_ALT);
          robot.keyPress(KeyEvent.VK_F);