jdk-sandbox: comparison jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java

equal deleted inserted replaced

-:487e1aa949c4
+:ef327bd847c0
 import java.security.*;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Vector;
-import java.util.logging.*;
+import sun.util.logging.PlatformLogger;
 import sun.awt.*;
 import sun.awt.event.IgnorePaintEvent;
 import sun.awt.image.SunVolatileImage;
 import sun.awt.image.ToolkitImage;
 import sun.java2d.BackBufferCapsProvider;
 import sun.java2d.pipe.Region;
 public class XComponentPeer extends XWindow implements ComponentPeer, DropTargetPeer,
 BackBufferCapsProvider
 {
-private static final Logger log = Logger.getLogger("sun.awt.X11.XComponentPeer");
+private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XComponentPeer");
-private static final Logger buffersLog = Logger.getLogger("sun.awt.X11.XComponentPeer.multibuffer");
+private static final PlatformLogger buffersLog = PlatformLogger.getLogger("sun.awt.X11.XComponentPeer.multibuffer");
-private static final Logger focusLog = Logger.getLogger("sun.awt.X11.focus.XComponentPeer");
+private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.awt.X11.focus.XComponentPeer");
-private static final Logger fontLog = Logger.getLogger("sun.awt.X11.font.XComponentPeer");
+private static final PlatformLogger fontLog = PlatformLogger.getLogger("sun.awt.X11.font.XComponentPeer");
-private static final Logger enableLog = Logger.getLogger("sun.awt.X11.enable.XComponentPeer");
+private static final PlatformLogger enableLog = PlatformLogger.getLogger("sun.awt.X11.enable.XComponentPeer");
-private static final Logger shapeLog = Logger.getLogger("sun.awt.X11.shape.XComponentPeer");
+private static final PlatformLogger shapeLog = PlatformLogger.getLogger("sun.awt.X11.shape.XComponentPeer");
 boolean paintPending = false;
 boolean isLayouting = false;
 boolean enabled;
 if( comp != null && !comp.isEnabled() && !comp.isLightweight() ){
 setEnabled(false);
 break;
 }
 }
-enableLog.log(Level.FINE, "Initial enable state: {0}", new Object[] {Boolean.valueOf(enabled)});
+enableLog.fine("Initial enable state: {0}", Boolean.valueOf(enabled));
 if (target.isVisible()) {
 setVisible(true);
 }
 }
 /**
 * Called when component receives focus
 */
 public void focusGained(FocusEvent e) {
-focusLog.log(Level.FINE, "{0}", new Object[] {e});
+focusLog.fine("{0}", e);
 bHasFocus = true;
 }
 /**
 * Called when component loses focus
 */
 public void focusLost(FocusEvent e) {
-focusLog.log(Level.FINE, "{0}", new Object[] {e});
+focusLog.fine("{0}", e);
 bHasFocus = false;
 }
 public boolean isFocusable() {
 /* should be implemented by other sub-classes */
 case XKeyboardFocusManagerPeer.SNFH_FAILURE:
 return false;
 case XKeyboardFocusManagerPeer.SNFH_SUCCESS_PROCEED:
 // Currently we just generate focus events like we deal with lightweight instead of calling
 // XSetInputFocus on native window
-if (focusLog.isLoggable(Level.FINER)) focusLog.finer("Proceeding with request to " +
+if (focusLog.isLoggable(PlatformLogger.FINER)) focusLog.finer("Proceeding with request to " +
 lightweightChild + " in " + target);
 /**
 * The problems with requests in non-focused window arise because shouldNativelyFocusHeavyweight
 * checks that native window is focused while appropriate WINDOW_GAINED_FOCUS has not yet
 * been processed - it is in EventQueue. Thus, SNFH allows native request and stores request record
 * when a component inside a Frame is requesting focus.
 * See 6314575 for details.
 */
 boolean res = wpeer.requestWindowFocus(null);
-if (focusLog.isLoggable(Level.FINER)) focusLog.finer("Requested window focus: " + res);
+if (focusLog.isLoggable(PlatformLogger.FINER)) focusLog.finer("Requested window focus: " + res);
 // If parent window can be made focused and has been made focused(synchronously)
 // then we can proceed with children, otherwise we retreat.
 if (!(res && parentWindow.isFocused())) {
 return rejectFocusRequestHelper("Waiting for asynchronous processing of the request");
 }
 }
 return false;
 }
 private boolean rejectFocusRequestHelper(String logMsg) {
-if (focusLog.isLoggable(Level.FINER)) focusLog.finer(logMsg);
+if (focusLog.isLoggable(PlatformLogger.FINER)) focusLog.finer(logMsg);
 XKeyboardFocusManagerPeer.removeLastFocusRequest(target);
 return false;
 }
 void handleJavaFocusEvent(AWTEvent e) {
-if (focusLog.isLoggable(Level.FINER)) focusLog.finer(e.toString());
+if (focusLog.isLoggable(PlatformLogger.FINER)) focusLog.finer(e.toString());
 if (e.getID() == FocusEvent.FOCUS_GAINED) {
 focusGained((FocusEvent)e);
 } else {
 focusLost((FocusEvent)e);
 }
 /**
 * @see java.awt.peer.ComponentPeer
 */
 public void setEnabled(boolean value) {
-enableLog.log(Level.FINE, "{0}ing {1}", new Object[] {(value?"Enabl":"Disabl"), this});
+enableLog.fine("{0}ing {1}", (value?"Enabl":"Disabl"), this);
 boolean repaintNeeded = (enabled != value);
 enabled = value;
 if (target instanceof Container) {
 Component list[] = ((Container)target).getComponents();
 for (int i = 0; i < list.length; ++i) {
 g.drawLine(x+1, y+height, x+width, y+height); // bottom
 g.drawLine(x+width, y+height, x+width, y+1);  // right
 }
 public void setBackground(Color c) {
-if (log.isLoggable(Level.FINE)) log.fine("Set background to " + c);
+if (log.isLoggable(PlatformLogger.FINE)) log.fine("Set background to " + c);
 synchronized (getStateLock()) {
 background = c;
 }
 super.setBackground(c);
 repaint();
 }
 public void setForeground(Color c) {
-if (log.isLoggable(Level.FINE)) log.fine("Set foreground to " + c);
+if (log.isLoggable(PlatformLogger.FINE)) log.fine("Set foreground to " + c);
 synchronized (getStateLock()) {
 foreground = c;
 }
 repaint();
 }
 * @see       java.awt.peer.ComponentPeer#getFontMetrics(Font)
 * @see       Toolkit#getFontMetrics(Font)
 * @since     JDK1.0
 */
 public FontMetrics getFontMetrics(Font font) {
-if (fontLog.isLoggable(Level.FINE)) fontLog.fine("Getting font metrics for " + font);
+if (fontLog.isLoggable(PlatformLogger.FINE)) fontLog.fine("Getting font metrics for " + font);
 return sun.font.FontDesignMetrics.getMetrics(font);
 }
 public void setFont(Font f) {
 synchronized (getStateLock()) {
 private BufferCapabilities backBufferCaps;
 public void createBuffers(int numBuffers, BufferCapabilities caps)
 throws AWTException
 {
-if (buffersLog.isLoggable(Level.FINE)) {
+if (buffersLog.isLoggable(PlatformLogger.FINE)) {
 buffersLog.fine("createBuffers(" + numBuffers + ", " + caps + ")");
 }
 // set the caps first, they're used when creating the bb
 backBufferCaps = caps;
 backBuffer = graphicsConfig.createBackBuffer(this, numBuffers, caps);
 }
 public void flip(int x1, int y1, int x2, int y2,
 BufferCapabilities.FlipContents flipAction)
 {
-if (buffersLog.isLoggable(Level.FINE)) {
+if (buffersLog.isLoggable(PlatformLogger.FINE)) {
 buffersLog.fine("flip(" + flipAction + ")");
 }
 if (backBuffer == 0) {
 throw new IllegalStateException("Buffers have not been created");
 }
 graphicsConfig.flip(this, target, xBackBuffer,
 x1, y1, x2, y2, flipAction);
 }
 public Image getBackBuffer() {
-if (buffersLog.isLoggable(Level.FINE)) {
+if (buffersLog.isLoggable(PlatformLogger.FINE)) {
 buffersLog.fine("getBackBuffer()");
 }
 if (backBuffer == 0) {
 throw new IllegalStateException("Buffers have not been created");
 }
 return xBackBuffer;
 }
 public void destroyBuffers() {
-if (buffersLog.isLoggable(Level.FINE)) {
+if (buffersLog.isLoggable(PlatformLogger.FINE)) {
 buffersLog.fine("destroyBuffers()");
 }
 graphicsConfig.destroyBackBuffer(backBuffer);
 backBuffer = 0;
 xBackBuffer = null;
 * Returns true if this event is disabled and shouldn't be processed by window
 * Currently if target component is disabled the following event will be disabled on window:
 * ButtonPress, ButtonRelease, KeyPress, KeyRelease, EnterNotify, LeaveNotify, MotionNotify
 */
 protected boolean isEventDisabled(XEvent e) {
-enableLog.log(Level.FINEST, "Component is {1}, checking for disabled event {0}", new Object[] {e, (isEnabled()?"enabled":"disable")});
+enableLog.finest("Component is {1}, checking for disabled event {0}", e, (isEnabled()?"enabled":"disable"));
 if (!isEnabled()) {
 switch (e.get_type()) {
 case XConstants.ButtonPress:
 case XConstants.ButtonRelease:
 case XConstants.KeyPress:
 case XConstants.KeyRelease:
 case XConstants.EnterNotify:
 case XConstants.LeaveNotify:
 case XConstants.MotionNotify:
-enableLog.log(Level.FINER, "Event {0} is disable", new Object[] {e});
+enableLog.finer("Event {0} is disable", e);
 return true;
 }
 }
 switch(e.get_type()) {
 case XConstants.MapNotify:
 * Applies the shape to the X-window.
 * @since 1.7
 */
 public void applyShape(Region shape) {
 if (XlibUtil.isShapingSupported()) {
-if (shapeLog.isLoggable(Level.FINER)) {
+if (shapeLog.isLoggable(PlatformLogger.FINER)) {
 shapeLog.finer(
 "*** INFO: Setting shape: PEER: " + this
 + "; WINDOW: " + getWindow()
 + "; TARGET: " + target
 + "; SHAPE: " + shape);
 }
 } finally {
 XToolkit.awtUnlock();
 }
 } else {
-if (shapeLog.isLoggable(Level.FINER)) {
+if (shapeLog.isLoggable(PlatformLogger.FINER)) {
 shapeLog.finer("*** WARNING: Shaping is NOT supported!");
 }
 }
 }

changeset 3938	ef327bd847c0
parent 2805	9f18d7e66042
child 4214	0fa32d38146b