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

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 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) 2011, 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
*** 36,48 ****
--- 36,51 ----
  import java.lang.reflect.InvocationTargetException;
  import java.text.AttributedCharacterIterator.Attribute;
  import java.text.*;
  import javax.swing.text.JTextComponent;
  
+ import sun.awt.AWTAccessor;
  import sun.awt.im.InputMethodAdapter;
  import sun.lwawt.*;
  
+ import static sun.awt.AWTAccessor.ComponentAccessor;
+ 
  public class CInputMethod extends InputMethodAdapter {
      private InputMethodContext fIMContext;
      private Component fAwtFocussedComponent;
      private LWComponentPeer<?, ?> fAwtFocussedComponentPeer;
      private boolean isActive;
*** 383,406 ****
          return null;
      }
  
      // java.awt.Toolkit#getNativeContainer() is not available
      //    from this package
-     @SuppressWarnings("deprecation")
      private LWComponentPeer<?, ?> getNearestNativePeer(Component comp) {
          if (comp==null)
              return null;
! 
!         ComponentPeer peer = comp.getPeer();
          if (peer==null)
              return null;
  
          while (peer instanceof java.awt.peer.LightweightPeer) {
              comp = comp.getParent();
              if (comp==null)
                  return null;
!             peer = comp.getPeer();
              if (peer==null)
                  return null;
          }
  
          if (peer instanceof LWComponentPeer)
--- 386,408 ----
          return null;
      }
  
      // java.awt.Toolkit#getNativeContainer() is not available
      //    from this package
      private LWComponentPeer<?, ?> getNearestNativePeer(Component comp) {
          if (comp==null)
              return null;
!         final ComponentAccessor acc = AWTAccessor.getComponentAccessor();
!         ComponentPeer peer = acc.getPeer(comp);
          if (peer==null)
              return null;
  
          while (peer instanceof java.awt.peer.LightweightPeer) {
              comp = comp.getParent();
              if (comp==null)
                  return null;
!             peer = acc.getPeer(comp);
              if (peer==null)
                  return null;
          }
  
          if (peer instanceof LWComponentPeer)