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

rev 58017 : 8239124: Minimize the usage of AwtGraphicsConfigDataPtr in native
Reviewed-by: XXX

*** 1,7 ****
  /*
!  * Copyright (c) 2002, 2018, 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) 2002, 2020, 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
*** 23,48 ****
   * questions.
   */
  
  package sun.awt.X11;
  
! import java.awt.*;
! import java.awt.event.*;
! import java.awt.peer.ComponentPeer;
  import java.awt.image.ColorModel;
! 
  import java.lang.ref.WeakReference;
  
  import sun.awt.AWTAccessor.ComponentAccessor;
! import sun.util.logging.PlatformLogger;
! 
! import sun.awt.*;
! 
! import sun.awt.image.PixelConverter;
! 
  import sun.java2d.SunGraphics2D;
  import sun.java2d.SurfaceData;
  
  class XWindow extends XBaseWindow implements X11ComponentPeer {
      private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XWindow");
      private static PlatformLogger insLog = PlatformLogger.getLogger("sun.awt.X11.insets.XWindow");
      private static PlatformLogger eventLog = PlatformLogger.getLogger("sun.awt.X11.event.XWindow");
--- 23,68 ----
   * questions.
   */
  
  package sun.awt.X11;
  
! import java.awt.AWTEvent;
! import java.awt.AWTKeyStroke;
! import java.awt.Color;
! import java.awt.Component;
! import java.awt.Container;
! import java.awt.Cursor;
! import java.awt.Font;
! import java.awt.FontMetrics;
! import java.awt.Graphics;
! import java.awt.GraphicsConfiguration;
! import java.awt.Point;
! import java.awt.Rectangle;
! import java.awt.SystemColor;
! import java.awt.Toolkit;
! import java.awt.Window;
! import java.awt.event.ComponentEvent;
! import java.awt.event.FocusEvent;
! import java.awt.event.InputEvent;
! import java.awt.event.KeyEvent;
! import java.awt.event.MouseEvent;
! import java.awt.event.MouseWheelEvent;
! import java.awt.event.PaintEvent;
  import java.awt.image.ColorModel;
! import java.awt.peer.ComponentPeer;
  import java.lang.ref.WeakReference;
  
+ import sun.awt.AWTAccessor;
  import sun.awt.AWTAccessor.ComponentAccessor;
! import sun.awt.PaintEventDispatcher;
! import sun.awt.PeerEvent;
! import sun.awt.SunToolkit;
! import sun.awt.X11ComponentPeer;
! import sun.awt.X11GraphicsConfig;
  import sun.java2d.SunGraphics2D;
  import sun.java2d.SurfaceData;
+ import sun.util.logging.PlatformLogger;
  
  class XWindow extends XBaseWindow implements X11ComponentPeer {
      private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XWindow");
      private static PlatformLogger insLog = PlatformLogger.getLogger("sun.awt.X11.insets.XWindow");
      private static PlatformLogger eventLog = PlatformLogger.getLogger("sun.awt.X11.event.XWindow");
*** 115,128 ****
       * 1) button was initially PRESSED
       * 2) no movement or drag has happened until RELEASE
      */
      private int mouseButtonClickAllowed = 0;
  
-     native int getNativeColor(Color clr, GraphicsConfiguration gc);
-     native void getWMInsets(long window, long left, long top, long right, long bottom, long border);
-     native long getTopWindow(long window, long rootWin);
-     native void getWindowBounds(long window, long x, long y, long width, long height);
      private static native void initIDs();
  
      static {
          initIDs();
      }
--- 135,144 ----