src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java

*** 24,35 ****
--- 24,38 ----
   */
  
  package sun.awt.X11;
  
  import java.awt.AWTKeyStroke;
+ import java.awt.Component;
  import java.awt.Toolkit;
+ import java.awt.peer.ComponentPeer;
  
+ import sun.awt.AWTAccessor;
  import sun.awt.EmbeddedFrame;
  import sun.util.logging.PlatformLogger;
  
  @SuppressWarnings("serial") // JDK-implementation class
  public class XEmbeddedFrame extends EmbeddedFrame {
*** 61,74 ****
                  show();
              }
          }
      }
  
-     @SuppressWarnings("deprecation")
      public void addNotify()
      {
!         if (getPeer() == null) {
              XToolkit toolkit = (XToolkit)Toolkit.getDefaultToolkit();
              setPeer(toolkit.createEmbeddedFrame(this));
          }
          super.addNotify();
      }
--- 64,76 ----
                  show();
              }
          }
      }
  
      public void addNotify()
      {
!         if (!isDisplayable()) {
              XToolkit toolkit = (XToolkit)Toolkit.getDefaultToolkit();
              setPeer(toolkit.createEmbeddedFrame(this));
          }
          super.addNotify();
      }
*** 78,103 ****
      }
  
      /*
       * The method shouldn't be called in case of active XEmbed.
       */
-     @SuppressWarnings("deprecation")
      public boolean traverseIn(boolean direction) {
!         XEmbeddedFramePeer peer = (XEmbeddedFramePeer)getPeer();
          if (peer != null) {
              if (peer.supportsXEmbed() && peer.isXEmbedActive()) {
                  log.fine("The method shouldn't be called when XEmbed is active!");
              } else {
                  return super.traverseIn(direction);
              }
          }
          return false;
      }
  
-     @SuppressWarnings("deprecation")
      protected boolean traverseOut(boolean direction) {
!         XEmbeddedFramePeer xefp = (XEmbeddedFramePeer) getPeer();
          if (direction == FORWARD) {
              xefp.traverseOutForward();
          }
          else {
              xefp.traverseOutBackward();
--- 80,105 ----
      }
  
      /*
       * The method shouldn't be called in case of active XEmbed.
       */
      public boolean traverseIn(boolean direction) {
!         XEmbeddedFramePeer peer = AWTAccessor.getComponentAccessor()
!                                              .getPeer(this);
          if (peer != null) {
              if (peer.supportsXEmbed() && peer.isXEmbedActive()) {
                  log.fine("The method shouldn't be called when XEmbed is active!");
              } else {
                  return super.traverseIn(direction);
              }
          }
          return false;
      }
  
      protected boolean traverseOut(boolean direction) {
!         XEmbeddedFramePeer xefp = AWTAccessor.getComponentAccessor()
!                                              .getPeer(this);
          if (direction == FORWARD) {
              xefp.traverseOutForward();
          }
          else {
              xefp.traverseOutBackward();
*** 106,137 ****
      }
  
      /*
       * The method shouldn't be called in case of active XEmbed.
       */
-     @SuppressWarnings("deprecation")
      public void synthesizeWindowActivation(boolean doActivate) {
!         XEmbeddedFramePeer peer = (XEmbeddedFramePeer)getPeer();
          if (peer != null) {
              if (peer.supportsXEmbed() && peer.isXEmbedActive()) {
                  log.fine("The method shouldn't be called when XEmbed is active!");
              } else {
                  peer.synthesizeFocusInOut(doActivate);
              }
          }
      }
  
-     @SuppressWarnings("deprecation")
      public void registerAccelerator(AWTKeyStroke stroke) {
!         XEmbeddedFramePeer xefp = (XEmbeddedFramePeer) getPeer();
          if (xefp != null) {
              xefp.registerAccelerator(stroke);
          }
      }
!     @SuppressWarnings("deprecation")
      public void unregisterAccelerator(AWTKeyStroke stroke) {
!         XEmbeddedFramePeer xefp = (XEmbeddedFramePeer) getPeer();
          if (xefp != null) {
              xefp.unregisterAccelerator(stroke);
          }
      }
  }
--- 108,140 ----
      }
  
      /*
       * The method shouldn't be called in case of active XEmbed.
       */
      public void synthesizeWindowActivation(boolean doActivate) {
!         XEmbeddedFramePeer peer = AWTAccessor.getComponentAccessor()
!                                              .getPeer(this);
          if (peer != null) {
              if (peer.supportsXEmbed() && peer.isXEmbedActive()) {
                  log.fine("The method shouldn't be called when XEmbed is active!");
              } else {
                  peer.synthesizeFocusInOut(doActivate);
              }
          }
      }
  
      public void registerAccelerator(AWTKeyStroke stroke) {
!         XEmbeddedFramePeer xefp = AWTAccessor.getComponentAccessor()
!                                              .getPeer(this);
          if (xefp != null) {
              xefp.registerAccelerator(stroke);
          }
      }
! 
      public void unregisterAccelerator(AWTKeyStroke stroke) {
!         XEmbeddedFramePeer xefp = AWTAccessor.getComponentAccessor()
!                                              .getPeer(this);
          if (xefp != null) {
              xefp.unregisterAccelerator(stroke);
          }
      }
  }