src/java.desktop/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2014, 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
--- 1,7 ----
  /*
!  * Copyright (c) 2012, 2015, 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
*** 28,37 ****
--- 28,38 ----
  
  import java.awt.AWTKeyStroke;
  import java.awt.Toolkit;
  import java.lang.reflect.InvocationTargetException;
  
+ import sun.awt.AWTAccessor;
  import sun.awt.EmbeddedFrame;
  import sun.lwawt.LWWindowPeer;
  
  /*
   * The CViewEmbeddedFrame class is used in the SWT_AWT bridge.
*** 46,59 ****
  
      public CViewEmbeddedFrame(long nsViewPtr) {
          this.nsViewPtr = nsViewPtr;
      }
  
-     @SuppressWarnings("deprecation")
      @Override
      public void addNotify() {
!         if (getPeer() == null) {
              LWCToolkit toolkit = (LWCToolkit) Toolkit.getDefaultToolkit();
              setPeer(toolkit.createEmbeddedFrame(this));
          }
          super.addNotify();
      }
--- 47,59 ----
  
      public CViewEmbeddedFrame(long nsViewPtr) {
          this.nsViewPtr = nsViewPtr;
      }
  
      @Override
      public void addNotify() {
!         if (!isDisplayable()) {
              LWCToolkit toolkit = (LWCToolkit) Toolkit.getDefaultToolkit();
              setPeer(toolkit.createEmbeddedFrame(this));
          }
          super.addNotify();
      }
*** 76,105 ****
  
      /*
       * Synthetic event delivery for focus management
       */
      @Override
-     @SuppressWarnings("deprecation")
      public void synthesizeWindowActivation(boolean activated) {
          if (isActive != activated) {
              isActive = activated;
!             ((LWWindowPeer)getPeer()).notifyActivation(activated, null);
          }
      }
  
      /*
       * Initializes the embedded frame bounds and validates a component.
       * Designed to be called from the main thread
       * This method should be called once from the initialization of the SWT_AWT Bridge
       */
-     @SuppressWarnings("deprecation")
      public void validateWithBounds(final int x, final int y, final int width, final int height) {
          try {
              LWCToolkit.invokeAndWait(new Runnable() {
                  @Override
                  public void run() {
!                     ((LWWindowPeer) getPeer()).setBoundsPrivate(0, 0, width, height);
                      validate();
                      setVisible(true);
                  }
              }, this);
          } catch (InvocationTargetException ex) {}
--- 76,107 ----
  
      /*
       * Synthetic event delivery for focus management
       */
      @Override
      public void synthesizeWindowActivation(boolean activated) {
          if (isActive != activated) {
              isActive = activated;
!             final LWWindowPeer peer = AWTAccessor.getComponentAccessor()
!                                                  .getPeer(this);
!             peer.notifyActivation(activated, null);
          }
      }
  
      /*
       * Initializes the embedded frame bounds and validates a component.
       * Designed to be called from the main thread
       * This method should be called once from the initialization of the SWT_AWT Bridge
       */
      public void validateWithBounds(final int x, final int y, final int width, final int height) {
          try {
+             final LWWindowPeer peer = AWTAccessor.getComponentAccessor()
+                                                  .getPeer(this);
              LWCToolkit.invokeAndWait(new Runnable() {
                  @Override
                  public void run() {
!                     peer.setBoundsPrivate(0, 0, width, height);
                      validate();
                      setVisible(true);
                  }
              }, this);
          } catch (InvocationTargetException ex) {}