From 2d196a18f2a9f7a892e85e03ff8e66b9fb5f1f7f Mon Sep 17 00:00:00 2001
From: Denis Fokin <denis.fokin@jetbrains.com>
Date: Mon, 27 Aug 2018 15:17:59 +0300
Subject: [PATCH] Change getPeer to AWTAccessor calls.

---
 .../src/com/intellij/openapi/wm/impl/X11UiUtil.java          | 5 +++--
 platform/platform-impl/src/com/intellij/ui/FrameState.java   | 3 ++-
 .../util/src/com/intellij/ui/mac/foundation/MacUtil.java     | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/X11UiUtil.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/X11UiUtil.java
index 68bf6954e840..2721f61f9fad 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/X11UiUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/X11UiUtil.java
@@ -13,6 +13,7 @@ import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.wm.IdeFrame;
 import com.intellij.openapi.wm.WindowManager;
 import org.jetbrains.annotations.Nullable;
+import sun.awt.AWTAccessor;
 import sun.misc.Unsafe;
 
 import javax.swing.*;
@@ -325,7 +326,7 @@ public class X11UiUtil {
   private static boolean hasWindowProperty(JFrame frame, long name, long expected) {
     if (X11 == null) return false;
     try {
-      @SuppressWarnings("deprecation") ComponentPeer peer = frame.getPeer();
+      ComponentPeer peer = AWTAccessor.getComponentAccessor().getPeer(frame);
       if (peer != null) {
         long window = (Long)X11.getWindow.invoke(peer);
         long[] values = X11.getLongArrayProperty(window, name, XA_ATOM);
@@ -347,7 +348,7 @@ public class X11UiUtil {
     if (X11 == null) return;
 
     try {
-      @SuppressWarnings("deprecation") ComponentPeer peer = frame.getPeer();
+      @SuppressWarnings("deprecation") ComponentPeer peer = AWTAccessor.getComponentAccessor().getPeer(frame);
       if (peer == null) throw new IllegalStateException(frame + " has no peer");
       long window = (Long)X11.getWindow.invoke(peer);
       long screen = (Long)X11.getScreenNumber.invoke(peer);
diff --git a/platform/platform-impl/src/com/intellij/ui/FrameState.java b/platform/platform-impl/src/com/intellij/ui/FrameState.java
index fcdf076419cd..e0311429435d 100644
--- a/platform/platform-impl/src/com/intellij/ui/FrameState.java
+++ b/platform/platform-impl/src/com/intellij/ui/FrameState.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.openapi.wm.ex.IdeFrameEx;
 import org.jetbrains.annotations.NotNull;
+import sun.awt.AWTAccessor;
 
 import java.awt.*;
 import java.awt.event.ComponentEvent;
@@ -60,7 +61,7 @@ public class FrameState {
       state = ((Frame)component).getExtendedState();
       if (SystemInfo.isMacOSLion) {
         // workaround: frame.state is not updated by jdk so get it directly from peer
-        ComponentPeer peer = component.getPeer();
+        ComponentPeer peer = AWTAccessor.getComponentAccessor().getPeer(component);
         if (peer instanceof FramePeer) {
           state = ((FramePeer)peer).getState();
         }
diff --git a/platform/util/src/com/intellij/ui/mac/foundation/MacUtil.java b/platform/util/src/com/intellij/ui/mac/foundation/MacUtil.java
index ae9a2b2e4410..48053795a189 100644
--- a/platform/util/src/com/intellij/ui/mac/foundation/MacUtil.java
+++ b/platform/util/src/com/intellij/ui/mac/foundation/MacUtil.java
@@ -10,6 +10,7 @@ import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.registry.Registry;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import sun.awt.AWTAccessor;
 
 import javax.swing.*;
 import javax.swing.text.JTextComponent;
@@ -141,9 +142,9 @@ public class MacUtil {
     ID windowId = null;
     if (Registry.is("skip.untitled.windows.for.mac.messages")) {
       try {
-        Class <?> cWindowPeerClass  = w.getPeer().getClass();
+        Class <?> cWindowPeerClass  = AWTAccessor.getComponentAccessor().getPeer(w).getClass();
         Method getPlatformWindowMethod = cWindowPeerClass.getDeclaredMethod("getPlatformWindow");
-        Object cPlatformWindow = getPlatformWindowMethod.invoke(w.getPeer());
+        Object cPlatformWindow = getPlatformWindowMethod.invoke(AWTAccessor.getComponentAccessor().getPeer(w));
         Class <?> cPlatformWindowClass = cPlatformWindow.getClass();
         Method getNSWindowPtrMethod = cPlatformWindowClass.getDeclaredMethod("getNSWindowPtr");
         windowId = new ID((Long)getNSWindowPtrMethod.invoke(cPlatformWindow));