--- old/src/solaris/classes/sun/awt/X11/XWindowPeer.java Fri Jun 14 15:16:38 2013 +++ new/src/solaris/classes/sun/awt/X11/XWindowPeer.java Fri Jun 14 15:16:37 2013 @@ -226,7 +226,7 @@ Window owner = t_window.getOwner(); if (owner != null) { ownerPeer = (XWindowPeer)owner.getPeer(); - if (focusLog.isLoggable(PlatformLogger.FINER)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINER)) { focusLog.finer("Owner is " + owner); focusLog.finer("Owner peer is " + ownerPeer); focusLog.finer("Owner X window " + Long.toHexString(ownerPeer.getWindow())); @@ -239,7 +239,7 @@ XToolkit.awtLock(); try { // Set WM_TRANSIENT_FOR - if (focusLog.isLoggable(PlatformLogger.FINE)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINE)) { focusLog.fine("Setting transient on " + Long.toHexString(getWindow()) + " for " + Long.toHexString(ownerWindow)); } @@ -301,7 +301,7 @@ for (Iterator i = iconImages.iterator(); i.hasNext(); ) { Image image = i.next(); if (image == null) { - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("XWindowPeer.updateIconImages: Skipping the image passed into Java because it's null."); } continue; @@ -310,7 +310,7 @@ try { iconInfo = new XIconInfo(image); } catch (Exception e){ - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("XWindowPeer.updateIconImages: Perhaps the image passed into Java is broken. Skipping this icon."); } continue; @@ -381,7 +381,7 @@ } } - if (iconLog.isLoggable(PlatformLogger.FINEST)) { + if (iconLog.isLoggable(PlatformLogger.Level.FINEST)) { iconLog.finest(">>> Length_ of buffer of icons data: " + totalLength + ", maximum length: " + MAXIMUM_BUFFER_LENGTH_NET_WM_ICON); } @@ -393,7 +393,7 @@ * Dumps each icon from the list */ static void dumpIcons(java.util.List icons) { - if (iconLog.isLoggable(PlatformLogger.FINEST)) { + if (iconLog.isLoggable(PlatformLogger.Level.FINEST)) { iconLog.finest(">>> Sizes of icon images:"); for (Iterator i = icons.iterator(); i.hasNext(); ) { iconLog.finest(" {0}", i.next()); @@ -667,7 +667,7 @@ return; } - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("XWindowPeer: Check if we've been moved to a new screen since we're running in Xinerama mode"); } @@ -704,7 +704,7 @@ } } if (newScreenNum != curScreenNum) { - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("XWindowPeer: Moved to a new screen"); } executeDisplayChangedOnEDT(newGC); @@ -779,7 +779,7 @@ // override_redirect all we can do is check whether our parent // is active. If it is - we can freely synthesize focus transfer. // Luckily, this logic is already implemented in requestWindowFocus. - if (focusLog.isLoggable(PlatformLogger.FINE)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINE)) { focusLog.fine("Requesting window focus"); } requestWindowFocus(time, timeProvided); @@ -807,7 +807,7 @@ public void handleFocusEvent(XEvent xev) { XFocusChangeEvent xfe = xev.get_xfocus(); FocusEvent fe; - if (focusLog.isLoggable(PlatformLogger.FINE)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINE)) { focusLog.fine("{0}", xfe); } if (isEventDisabled(xev)) { @@ -992,7 +992,7 @@ } private void updateAlwaysOnTop() { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Promoting always-on-top state {0}", Boolean.valueOf(alwaysOnTop)); } XWM.getWM().setLayer(this, @@ -1174,7 +1174,7 @@ public void dispose() { if (isGrabbed()) { - if (grabLog.isLoggable(PlatformLogger.FINE)) { + if (grabLog.isLoggable(PlatformLogger.Level.FINE)) { grabLog.fine("Generating UngrabEvent on {0} because of the window disposal", this); } postEventToEventQueue(new sun.awt.UngrabEvent(getEventSource())); @@ -1519,7 +1519,7 @@ synchronized(getStateLock()) { XDialogPeer blockerPeer = (XDialogPeer) AWTAccessor.getComponentAccessor().getPeer(d); if (blocked) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("{0} is blocked by {1}", this, blockerPeer); } modalBlocker = d; @@ -1912,7 +1912,7 @@ @Override public void xSetVisible(boolean visible) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Setting visible on " + this + " to " + visible); } XToolkit.awtLock(); @@ -2054,7 +2054,7 @@ public void handleXCrossingEvent(XEvent xev) { XCrossingEvent xce = xev.get_xcrossing(); - if (grabLog.isLoggable(PlatformLogger.FINE)) { + if (grabLog.isLoggable(PlatformLogger.Level.FINE)) { grabLog.fine("{0}, when grabbed {1}, contains {2}", xce, isGrabbed(), containsGlobal(xce.get_x_root(), xce.get_y_root())); } @@ -2067,7 +2067,7 @@ // since it generates MOUSE_ENTERED/MOUSE_EXITED for frame and dialog. // (fix for 6390326) XBaseWindow target = XToolkit.windowToXWindow(xce.get_window()); - if (grabLog.isLoggable(PlatformLogger.FINER)) { + if (grabLog.isLoggable(PlatformLogger.Level.FINER)) { grabLog.finer(" - Grab event target {0}", target); } if (target != null && target != this) { @@ -2080,7 +2080,7 @@ public void handleMotionNotify(XEvent xev) { XMotionEvent xme = xev.get_xmotion(); - if (grabLog.isLoggable(PlatformLogger.FINER)) { + if (grabLog.isLoggable(PlatformLogger.Level.FINER)) { grabLog.finer("{0}, when grabbed {1}, contains {2}", xme, isGrabbed(), containsGlobal(xme.get_x_root(), xme.get_y_root())); } @@ -2111,7 +2111,7 @@ xme.set_x(localCoord.x); xme.set_y(localCoord.y); } - if (grabLog.isLoggable(PlatformLogger.FINER)) { + if (grabLog.isLoggable(PlatformLogger.Level.FINER)) { grabLog.finer(" - Grab event target {0}", target); } if (target != null) { @@ -2145,7 +2145,7 @@ if (xbe.get_button() > SunToolkit.MAX_BUTTONS_SUPPORTED) { return; } - if (grabLog.isLoggable(PlatformLogger.FINE)) { + if (grabLog.isLoggable(PlatformLogger.Level.FINE)) { grabLog.fine("{0}, when grabbed {1}, contains {2} ({3}, {4}, {5}x{6})", xbe, isGrabbed(), containsGlobal(xbe.get_x_root(), xbe.get_y_root()), getAbsoluteX(), getAbsoluteY(), getWidth(), getHeight()); } @@ -2156,7 +2156,7 @@ // translation) XBaseWindow target = XToolkit.windowToXWindow(xbe.get_window()); try { - if (grabLog.isLoggable(PlatformLogger.FINER)) { + if (grabLog.isLoggable(PlatformLogger.Level.FINER)) { grabLog.finer(" - Grab event target {0} (press target {1})", target, pressTarget); } if (xbe.get_type() == XConstants.ButtonPress @@ -2192,7 +2192,7 @@ // According to the specification of UngrabEvent, post it // when press occurs outside of the window and not on its owned windows if (xbe.get_type() == XConstants.ButtonPress) { - if (grabLog.isLoggable(PlatformLogger.FINE)) { + if (grabLog.isLoggable(PlatformLogger.Level.FINE)) { grabLog.fine("Generating UngrabEvent on {0} because not inside of shell", this); } postEventToEventQueue(new sun.awt.UngrabEvent(getEventSource())); @@ -2213,7 +2213,7 @@ // toplevel == null - outside of // hierarchy, toplevel is Dialog - should // send ungrab (but shouldn't for Window) - if (grabLog.isLoggable(PlatformLogger.FINE)) { + if (grabLog.isLoggable(PlatformLogger.Level.FINE)) { grabLog.fine("Generating UngrabEvent on {0} because hierarchy ended", this); } postEventToEventQueue(new sun.awt.UngrabEvent(getEventSource())); @@ -2220,7 +2220,7 @@ } } else { // toplevel is null - outside of hierarchy - if (grabLog.isLoggable(PlatformLogger.FINE)) { + if (grabLog.isLoggable(PlatformLogger.Level.FINE)) { grabLog.fine("Generating UngrabEvent on {0} because toplevel is null", this); } postEventToEventQueue(new sun.awt.UngrabEvent(getEventSource())); @@ -2228,7 +2228,7 @@ } } else { // target doesn't map to XAWT window - outside of hierarchy - if (grabLog.isLoggable(PlatformLogger.FINE)) { + if (grabLog.isLoggable(PlatformLogger.Level.FINE)) { grabLog.fine("Generating UngrabEvent on because target is null {0}", this); } postEventToEventQueue(new sun.awt.UngrabEvent(getEventSource()));