diff options
Diffstat (limited to 'src/solaris/classes/sun/awt')
47 files changed, 356 insertions, 356 deletions
diff --git a/src/solaris/classes/sun/awt/X11/ListHelper.java b/src/solaris/classes/sun/awt/X11/ListHelper.java index 9301eaf6ed..2881501dc7 100644 --- a/src/solaris/classes/sun/awt/X11/ListHelper.java +++ b/src/solaris/classes/sun/awt/X11/ListHelper.java @@ -261,7 +261,7 @@ public class ListHelper implements XScrollbarClient { } public int y2index(int y) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("y=" + y +", firstIdx=" + firstDisplayedIndex() +", itemHeight=" + getItemHeight() + ",item_margin=" + ITEM_MARGIN); } diff --git a/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java b/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java index 3295b827f0..8cbae2e040 100644 --- a/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java +++ b/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java @@ -59,7 +59,7 @@ class UnsafeXDisposerRecord implements sun.java2d.DisposerRecord { XToolkit.awtLock(); try { if (!disposed) { - if (XlibWrapper.isBuildInternal && "Java2D Disposer".equals(Thread.currentThread().getName()) && log.isLoggable(PlatformLogger.WARNING)) { + if (XlibWrapper.isBuildInternal && "Java2D Disposer".equals(Thread.currentThread().getName()) && log.isLoggable(PlatformLogger.Level.WARNING)) { if (place != null) { log.warning(name + " object was not disposed before finalization!", place); } else { diff --git a/src/solaris/classes/sun/awt/X11/XAWTXSettings.java b/src/solaris/classes/sun/awt/X11/XAWTXSettings.java index 4eeca36249..ebdc631df5 100644 --- a/src/solaris/classes/sun/awt/X11/XAWTXSettings.java +++ b/src/solaris/classes/sun/awt/X11/XAWTXSettings.java @@ -55,7 +55,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { } void initXSettings() { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Initializing XAWT XSettings"); } settings = new XMSelection("_XSETTINGS"); @@ -68,27 +68,27 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { } public void ownerDeath(int screen, XMSelection sel, long deadOwner) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Owner " + deadOwner + " died for selection " + sel + " screen "+ screen); } } public void ownerChanged(int screen, XMSelection sel, long newOwner, long data, long timestamp) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("New Owner "+ newOwner + " for selection = " + sel + " screen " +screen ); } } public void selectionChanged(int screen, XMSelection sel, long owner , XPropertyEvent event) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Selection changed on sel " + sel + " screen = " + screen + " owner = " + owner + " event = " + event); } updateXSettings(screen,owner); } void initPerScreenXSettings() { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Updating Per XSettings changes"); } @@ -124,7 +124,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { } private Map getUpdatedSettings(final long owner) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("owner =" + owner); } if (0 == owner) { @@ -140,7 +140,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { int status = getter.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); if (status != XConstants.Success || getter.getData() == 0) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("OH OH : getter failed status = " + status ); } settings = null; @@ -148,7 +148,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { long ptr = getter.getData(); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("noItems = " + getter.getNumberOfItems()); } byte array[] = Native.toBytes(ptr,getter.getNumberOfItems()); diff --git a/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java b/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java index f0b1aef36c..036c650324 100644 --- a/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java +++ b/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java @@ -330,7 +330,7 @@ abstract public class XBaseMenuWindow extends XWindow { items.add(mp); } } else { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("WARNING: Attempt to add menu item without a peer"); } } @@ -351,7 +351,7 @@ abstract public class XBaseMenuWindow extends XWindow { if (index < items.size()) { items.remove(index); } else { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("WARNING: Attempt to remove non-existing menu item, index : " + index + ", item count : " + items.size()); } } @@ -386,7 +386,7 @@ abstract public class XBaseMenuWindow extends XWindow { XMenuPeer showingSubmenu = getShowingSubmenu(); int newSelectedIndex = (item != null) ? items.indexOf(item) : -1; if (this.selectedIndex != newSelectedIndex) { - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Selected index changed, was : " + this.selectedIndex + ", new : " + newSelectedIndex); } this.selectedIndex = newSelectedIndex; @@ -426,7 +426,7 @@ abstract public class XBaseMenuWindow extends XWindow { try { synchronized(getMenuTreeLock()) { if (showingSubmenu != submenuToShow) { - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Changing showing submenu"); } if (showingSubmenu != null) { @@ -1122,7 +1122,7 @@ abstract public class XBaseMenuWindow extends XWindow { * that grabs input focus */ void doHandleJavaKeyEvent(KeyEvent event) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer(event.toString()); } if (event.getID() != KeyEvent.KEY_PRESSED) { diff --git a/src/solaris/classes/sun/awt/X11/XBaseWindow.java b/src/solaris/classes/sun/awt/X11/XBaseWindow.java index b6f9f811c9..28db82f8a9 100644 --- a/src/solaris/classes/sun/awt/X11/XBaseWindow.java +++ b/src/solaris/classes/sun/awt/X11/XBaseWindow.java @@ -160,7 +160,7 @@ public class XBaseWindow { * with class-specific values and perform post-initialization actions. */ void postInit(XCreateWindowParams params) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("WM name is " + getWMName()); } updateWMName(); @@ -362,7 +362,7 @@ public class XBaseWindow { value_mask |= XConstants.CWBitGravity; } - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Creating window for " + this + " with the following attributes: \n" + params); } window = XlibWrapper.XCreateWindow(XToolkit.getDisplay(), @@ -482,7 +482,7 @@ public class XBaseWindow { } public void setSizeHints(long flags, int x, int y, int width, int height) { - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("Setting hints, flags " + XlibWrapper.hintsToString(flags)); } XToolkit.awtLock(); @@ -545,7 +545,7 @@ public class XBaseWindow { flags |= XUtilConstants.PWinGravity; hints.set_flags(flags); hints.set_win_gravity((int)XConstants.NorthWestGravity); - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("Setting hints, resulted flags " + XlibWrapper.hintsToString(flags) + ", values " + hints); } @@ -599,7 +599,7 @@ public class XBaseWindow { public void xRequestFocus(long time) { XToolkit.awtLock(); try { - if (focusLog.isLoggable(PlatformLogger.FINER)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINER)) { focusLog.finer("XSetInputFocus on " + Long.toHexString(getWindow()) + " with time " + time); } XlibWrapper.XSetInputFocus2(XToolkit.getDisplay(), getWindow(), time); @@ -610,7 +610,7 @@ public class XBaseWindow { public void xRequestFocus() { XToolkit.awtLock(); try { - if (focusLog.isLoggable(PlatformLogger.FINER)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINER)) { focusLog.finer("XSetInputFocus on " + Long.toHexString(getWindow())); } XlibWrapper.XSetInputFocus(XToolkit.getDisplay(), getWindow()); @@ -629,7 +629,7 @@ public class XBaseWindow { } 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(); @@ -716,7 +716,7 @@ public class XBaseWindow { insLog.warning("Attempt to resize uncreated window"); throw new IllegalStateException("Attempt to resize uncreated window"); } - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("Setting bounds on " + this + " to (" + x + ", " + y + "), " + width + "x" + height); } width = Math.max(MIN_SIZE, width); @@ -834,7 +834,7 @@ public class XBaseWindow { * The active grab overrides activated automatic grab. */ public boolean grabInput() { - if (grabLog.isLoggable(PlatformLogger.FINE)) { + if (grabLog.isLoggable(PlatformLogger.Level.FINE)) { grabLog.fine("Grab input on {0}", this); } @@ -899,7 +899,7 @@ public class XBaseWindow { XToolkit.awtLock(); try { XBaseWindow grabWindow = XAwtState.getGrabWindow(); - if (grabLog.isLoggable(PlatformLogger.FINE)) { + if (grabLog.isLoggable(PlatformLogger.Level.FINE)) { grabLog.fine("UnGrab input on {0}", grabWindow); } if (grabWindow != null) { @@ -943,7 +943,7 @@ public class XBaseWindow { mapped = false; } public void handleReparentNotifyEvent(XEvent xev) { - if (eventLog.isLoggable(PlatformLogger.FINER)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINER)) { XReparentEvent msg = xev.get_xreparent(); eventLog.finer(msg.toString()); } @@ -953,7 +953,7 @@ public class XBaseWindow { if (XPropertyCache.isCachingSupported()) { XPropertyCache.clearCache(window, XAtom.get(msg.get_atom())); } - if (eventLog.isLoggable(PlatformLogger.FINER)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINER)) { eventLog.finer("{0}", msg); } } @@ -983,7 +983,7 @@ public class XBaseWindow { } public void handleClientMessage(XEvent xev) { - if (eventLog.isLoggable(PlatformLogger.FINER)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINER)) { XClientMessageEvent msg = xev.get_xclient(); eventLog.finer(msg.toString()); } @@ -1039,7 +1039,7 @@ public class XBaseWindow { } public void handleConfigureNotifyEvent(XEvent xev) { XConfigureEvent xe = xev.get_xconfigure(); - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("Configure, {0}", xe); } x = xe.get_x(); @@ -1092,7 +1092,7 @@ public class XBaseWindow { } public void dispatchEvent(XEvent xev) { - if (eventLog.isLoggable(PlatformLogger.FINEST)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) { eventLog.finest(xev.toString()); } int type = xev.get_type(); diff --git a/src/solaris/classes/sun/awt/X11/XCheckboxPeer.java b/src/solaris/classes/sun/awt/X11/XCheckboxPeer.java index 47288116ce..50ca931040 100644 --- a/src/solaris/classes/sun/awt/X11/XCheckboxPeer.java +++ b/src/solaris/classes/sun/awt/X11/XCheckboxPeer.java @@ -172,7 +172,7 @@ class XCheckboxPeer extends XComponentPeer implements CheckboxPeer { Checkbox cb = (Checkbox) e.getSource(); if (cb.contains(e.getX(), e.getY())) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("mousePressed() on " + target.getName() + " : armed = " + armed + ", pressed = " + pressed + ", selected = " + selected + ", enabled = " + isEnabled()); } @@ -190,7 +190,7 @@ class XCheckboxPeer extends XComponentPeer implements CheckboxPeer { } public void mouseReleased(MouseEvent e) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("mouseReleased() on " + target.getName() + ": armed = " + armed + ", pressed = " + pressed + ", selected = " + selected + ", enabled = " + isEnabled()); } @@ -215,7 +215,7 @@ class XCheckboxPeer extends XComponentPeer implements CheckboxPeer { } public void mouseEntered(MouseEvent e) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("mouseEntered() on " + target.getName() + ": armed = " + armed + ", pressed = " + pressed + ", selected = " + selected + ", enabled = " + isEnabled()); } @@ -226,7 +226,7 @@ class XCheckboxPeer extends XComponentPeer implements CheckboxPeer { } public void mouseExited(MouseEvent e) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("mouseExited() on " + target.getName() + ": armed = " + armed + ", pressed = " + pressed + ", selected = " + selected + ", enabled = " + isEnabled()); } diff --git a/src/solaris/classes/sun/awt/X11/XChoicePeer.java b/src/solaris/classes/sun/awt/X11/XChoicePeer.java index a9fc496987..855ce05977 100644 --- a/src/solaris/classes/sun/awt/X11/XChoicePeer.java +++ b/src/solaris/classes/sun/awt/X11/XChoicePeer.java @@ -892,7 +892,7 @@ public class XChoicePeer extends XComponentPeer implements ChoicePeer, ToplevelS if (transX > 0 && transX < width && transY > 0 && transY < height) { int newIdx = helper.y2index(transY); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("transX=" + transX + ", transY=" + transY + ",width=" + width + ", height=" + height + ", newIdx=" + newIdx + " on " + target); diff --git a/src/solaris/classes/sun/awt/X11/XComponentPeer.java b/src/solaris/classes/sun/awt/X11/XComponentPeer.java index ed50b9fe1a..aa74d923e5 100644 --- a/src/solaris/classes/sun/awt/X11/XComponentPeer.java +++ b/src/solaris/classes/sun/awt/X11/XComponentPeer.java @@ -214,7 +214,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget * Called when component receives focus */ public void focusGained(FocusEvent e) { - if (focusLog.isLoggable(PlatformLogger.FINE)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINE)) { focusLog.fine("{0}", e); } bHasFocus = true; @@ -224,7 +224,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget * Called when component loses focus */ public void focusLost(FocusEvent e) { - if (focusLog.isLoggable(PlatformLogger.FINE)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINE)) { focusLog.fine("{0}", e); } bHasFocus = false; @@ -298,7 +298,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget 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(PlatformLogger.FINER)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINER)) { focusLog.finer("Proceeding with request to " + lightweightChild + " in " + target); } @@ -325,7 +325,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget */ boolean res = wpeer.requestWindowFocus(null); - if (focusLog.isLoggable(PlatformLogger.FINER)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINER)) { focusLog.finer("Requested window focus: " + res); } // If parent window can be made focused and has been made focused(synchronously) @@ -347,7 +347,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget } private boolean rejectFocusRequestHelper(String logMsg) { - if (focusLog.isLoggable(PlatformLogger.FINER)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINER)) { focusLog.finer(logMsg); } XKeyboardFocusManagerPeer.removeLastFocusRequest(target); @@ -355,7 +355,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget } void handleJavaFocusEvent(AWTEvent e) { - if (focusLog.isLoggable(PlatformLogger.FINER)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINER)) { focusLog.finer(e.toString()); } if (e.getID() == FocusEvent.FOCUS_GAINED) { @@ -386,7 +386,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget * @see java.awt.peer.ComponentPeer */ public void setEnabled(final boolean value) { - if (enableLog.isLoggable(PlatformLogger.FINE)) { + if (enableLog.isLoggable(PlatformLogger.Level.FINE)) { enableLog.fine("{0}ing {1}", (value ? "Enabl" : "Disabl"), this); } boolean status = value; @@ -467,13 +467,13 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget if (true) { switch(e.getID()) { case PaintEvent.UPDATE: - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("XCP coalescePaintEvent : UPDATE : add : x = " + r.x + ", y = " + r.y + ", width = " + r.width + ",height = " + r.height); } return; case PaintEvent.PAINT: - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("XCP coalescePaintEvent : PAINT : add : x = " + r.x + ", y = " + r.y + ", width = " + r.width + ",height = " + r.height); } @@ -640,7 +640,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget } public void setBackground(Color c) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Set background to " + c); } synchronized (getStateLock()) { @@ -651,7 +651,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget } public void setForeground(Color c) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Set foreground to " + c); } synchronized (getStateLock()) { @@ -672,7 +672,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget * @since JDK1.0 */ public FontMetrics getFontMetrics(Font font) { - if (fontLog.isLoggable(PlatformLogger.FINE)) { + if (fontLog.isLoggable(PlatformLogger.Level.FINE)) { fontLog.fine("Getting font metrics for " + font); } return sun.font.FontDesignMetrics.getMetrics(font); @@ -1158,7 +1158,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget public void createBuffers(int numBuffers, BufferCapabilities caps) throws AWTException { - if (buffersLog.isLoggable(PlatformLogger.FINE)) { + if (buffersLog.isLoggable(PlatformLogger.Level.FINE)) { buffersLog.fine("createBuffers(" + numBuffers + ", " + caps + ")"); } // set the caps first, they're used when creating the bb @@ -1176,7 +1176,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget public void flip(int x1, int y1, int x2, int y2, BufferCapabilities.FlipContents flipAction) { - if (buffersLog.isLoggable(PlatformLogger.FINE)) { + if (buffersLog.isLoggable(PlatformLogger.Level.FINE)) { buffersLog.fine("flip(" + flipAction + ")"); } if (backBuffer == 0) { @@ -1187,7 +1187,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget } public Image getBackBuffer() { - if (buffersLog.isLoggable(PlatformLogger.FINE)) { + if (buffersLog.isLoggable(PlatformLogger.Level.FINE)) { buffersLog.fine("getBackBuffer()"); } if (backBuffer == 0) { @@ -1197,7 +1197,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget } public void destroyBuffers() { - if (buffersLog.isLoggable(PlatformLogger.FINE)) { + if (buffersLog.isLoggable(PlatformLogger.Level.FINE)) { buffersLog.fine("destroyBuffers()"); } graphicsConfig.destroyBackBuffer(backBuffer); @@ -1232,7 +1232,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget * ButtonPress, ButtonRelease, KeyPress, KeyRelease, EnterNotify, LeaveNotify, MotionNotify */ protected boolean isEventDisabled(XEvent e) { - if (enableLog.isLoggable(PlatformLogger.FINEST)) { + if (enableLog.isLoggable(PlatformLogger.Level.FINEST)) { enableLog.finest("Component is {1}, checking for disabled event {0}", e, (isEnabled()?"enabled":"disable")); } if (!isEnabled()) { @@ -1244,7 +1244,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget case XConstants.EnterNotify: case XConstants.LeaveNotify: case XConstants.MotionNotify: - if (enableLog.isLoggable(PlatformLogger.FINER)) { + if (enableLog.isLoggable(PlatformLogger.Level.FINER)) { enableLog.finer("Event {0} is disable", e); } return true; @@ -1367,7 +1367,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget */ public void applyShape(Region shape) { if (XlibUtil.isShapingSupported()) { - if (shapeLog.isLoggable(PlatformLogger.FINER)) { + if (shapeLog.isLoggable(PlatformLogger.Level.FINER)) { shapeLog.finer( "*** INFO: Setting shape: PEER: " + this + "; WINDOW: " + getWindow() @@ -1397,7 +1397,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget XToolkit.awtUnlock(); } } else { - if (shapeLog.isLoggable(PlatformLogger.FINER)) { + if (shapeLog.isLoggable(PlatformLogger.Level.FINER)) { shapeLog.finer("*** WARNING: Shaping is NOT supported!"); } } diff --git a/src/solaris/classes/sun/awt/X11/XContentWindow.java b/src/solaris/classes/sun/awt/X11/XContentWindow.java index fa90cf19a4..4eabc229ee 100644 --- a/src/solaris/classes/sun/awt/X11/XContentWindow.java +++ b/src/solaris/classes/sun/awt/X11/XContentWindow.java @@ -115,7 +115,7 @@ public final class XContentWindow extends XWindow { if (in != null) { newBounds.setLocation(-in.left, -in.top); } - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("Setting content bounds {0}, old bounds {1}", newBounds, getBounds()); } diff --git a/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java b/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java index feb8e53089..350813eb2e 100644 --- a/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java +++ b/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java @@ -78,7 +78,7 @@ abstract class XDecoratedPeer extends XWindowPeer { Rectangle bounds = (Rectangle)params.get(BOUNDS); dimensions = new WindowDimensions(bounds, getRealInsets(), false); params.put(BOUNDS, dimensions.getClientRect()); - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("Initial dimensions {0}", dimensions); } @@ -181,7 +181,7 @@ abstract class XDecoratedPeer extends XWindowPeer { } public void setTitle(String title) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Title is " + title); } winAttr.title = title; @@ -231,7 +231,7 @@ abstract class XDecoratedPeer extends XWindowPeer { // If we somehow received focus events forward it instead to proxy // FIXME: Shouldn't we instead check for inferrior? - if (focusLog.isLoggable(PlatformLogger.FINER)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINER)) { focusLog.finer("Received focus event on shell: " + xfe); } // focusProxy.xRequestFocus(); @@ -275,7 +275,7 @@ abstract class XDecoratedPeer extends XWindowPeer { wm_set_insets = XWM.getInsetsFromProp(getWindow(), changedAtom); } - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("FRAME_EXTENTS: {0}", wm_set_insets); } @@ -304,7 +304,7 @@ abstract class XDecoratedPeer extends XWindowPeer { public void handleReparentNotifyEvent(XEvent xev) { XReparentEvent xe = xev.get_xreparent(); - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine(xe.toString()); } reparent_serial = xe.get_serial(); @@ -345,7 +345,7 @@ abstract class XDecoratedPeer extends XWindowPeer { // Check if we have insets provided by the WM Insets correctWM = getWMSetInsets(null); if (correctWM != null) { - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("wm-provided insets {0}", correctWM); } // If these insets are equal to our current insets - no actions are necessary @@ -360,7 +360,7 @@ abstract class XDecoratedPeer extends XWindowPeer { } else { correctWM = XWM.getWM().getInsets(this, xe.get_window(), xe.get_parent()); - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { if (correctWM != null) { insLog.finer("correctWM {0}", correctWM); } else { @@ -386,7 +386,7 @@ abstract class XDecoratedPeer extends XWindowPeer { * initial insets were wrong (most likely they were). */ Insets correction = difference(correctWM, currentInsets); - if (insLog.isLoggable(PlatformLogger.FINEST)) { + if (insLog.isLoggable(PlatformLogger.Level.FINEST)) { insLog.finest("Corrention {0}", correction); } if (!isNull(correction)) { @@ -398,7 +398,7 @@ abstract class XDecoratedPeer extends XWindowPeer { //update minimum size hints updateMinSizeHints(); } - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("Dimensions before reparent: " + dimensions); } @@ -473,7 +473,7 @@ abstract class XDecoratedPeer extends XWindowPeer { public Insets getInsets() { Insets in = copy(getRealInsets()); in.top += getMenuBarHeight(); - if (insLog.isLoggable(PlatformLogger.FINEST)) { + if (insLog.isLoggable(PlatformLogger.Level.FINEST)) { insLog.finest("Get insets returns {0}", in); } return in; @@ -503,7 +503,7 @@ abstract class XDecoratedPeer extends XWindowPeer { public void reshape(WindowDimensions newDimensions, int op, boolean userReshape) { - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("Reshaping " + this + " to " + newDimensions + " op " + op + " user reshape " + userReshape); } if (userReshape) { @@ -524,7 +524,7 @@ abstract class XDecoratedPeer extends XWindowPeer { XToolkit.awtLock(); try { if (!isReparented() || !isVisible()) { - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("- not reparented({0}) or not visible({1}), default reshape", Boolean.valueOf(isReparented()), Boolean.valueOf(visible)); } @@ -632,7 +632,7 @@ abstract class XDecoratedPeer extends XWindowPeer { dims.setSize(width, height); break; } - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("For the operation {0} new dimensions are {1}", operationToString(operation), dims); } @@ -665,7 +665,7 @@ abstract class XDecoratedPeer extends XWindowPeer { public void handleConfigureNotifyEvent(XEvent xev) { assert (SunToolkit.isAWTLockHeldByCurrentThread()); XConfigureEvent xe = xev.get_xconfigure(); - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("Configure notify {0}", xe); } @@ -704,7 +704,7 @@ abstract class XDecoratedPeer extends XWindowPeer { * it!!!! or we wind up in a bogus location. */ int runningWM = XWM.getWMID(); - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("reparented={0}, visible={1}, WM={2}, decorations={3}", isReparented(), isVisible(), runningWM, getDecorations()); } @@ -718,7 +718,7 @@ abstract class XDecoratedPeer extends XWindowPeer { if (!insets_corrected && getDecorations() != XWindowAttributesData.AWT_DECOR_NONE) { long parent = XlibUtil.getParentWindow(window); Insets correctWM = (parent != -1) ? XWM.getWM().getInsets(this, window, parent) : null; - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { if (correctWM != null) { insLog.finer("Configure notify - insets : " + correctWM); } else { @@ -758,7 +758,7 @@ abstract class XDecoratedPeer extends XWindowPeer { case XWM.SAWFISH_WM: { Point xlocation = queryXLocation(); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("New X location: {0}", xlocation); } if (xlocation != null) { @@ -777,7 +777,7 @@ abstract class XDecoratedPeer extends XWindowPeer { copy(currentInsets), true); - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("Insets are {0}, new dimensions {1}", currentInsets, newDimensions); } @@ -815,7 +815,7 @@ abstract class XDecoratedPeer extends XWindowPeer { } public void setShellBounds(Rectangle rec) { - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("Setting shell bounds on " + this + " to " + rec); } XToolkit.awtLock(); @@ -829,7 +829,7 @@ abstract class XDecoratedPeer extends XWindowPeer { } } public void setShellSize(Rectangle rec) { - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("Setting shell size on " + this + " to " + rec); } XToolkit.awtLock(); @@ -842,7 +842,7 @@ abstract class XDecoratedPeer extends XWindowPeer { } } public void setShellPosition(Rectangle rec) { - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("Setting shell position on " + this + " to " + rec); } XToolkit.awtLock(); @@ -944,7 +944,7 @@ abstract class XDecoratedPeer extends XWindowPeer { return toGlobal(0,0); } else { Point location = target.getLocation(); - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("getLocationOnScreen {0} not reparented: {1} ", this, location); } @@ -984,7 +984,7 @@ abstract class XDecoratedPeer extends XWindowPeer { } public void setVisible(boolean vis) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Setting {0} to visible {1}", this, Boolean.valueOf(vis)); } if (vis && !isVisible()) { @@ -1037,7 +1037,7 @@ abstract class XDecoratedPeer extends XWindowPeer { } private void handleWmTakeFocus(XClientMessageEvent cl) { - if (focusLog.isLoggable(PlatformLogger.FINE)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINE)) { focusLog.fine("WM_TAKE_FOCUS on {0}", this); } requestWindowFocus(cl.get_data(1), true); @@ -1052,11 +1052,11 @@ abstract class XDecoratedPeer extends XWindowPeer { // by "proxy" - invisible mapped window. When we want to set X input focus to // toplevel set it on proxy instead. if (focusProxy == null) { - if (focusLog.isLoggable(PlatformLogger.WARNING)) { + if (focusLog.isLoggable(PlatformLogger.Level.WARNING)) { focusLog.warning("Focus proxy is null for " + this); } } else { - if (focusLog.isLoggable(PlatformLogger.FINE)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINE)) { focusLog.fine("Requesting focus to proxy: " + focusProxy); } if (timeProvided) { @@ -1150,7 +1150,7 @@ abstract class XDecoratedPeer extends XWindowPeer { Window focusedWindow = XKeyboardFocusManagerPeer.getInstance().getCurrentFocusedWindow(); Window activeWindow = XWindowPeer.getDecoratedOwner(focusedWindow); - if (focusLog.isLoggable(PlatformLogger.FINER)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINER)) { focusLog.finer("Current window is: active={0}, focused={1}", Boolean.valueOf(target == activeWindow), Boolean.valueOf(target == focusedWindow)); @@ -1177,20 +1177,20 @@ abstract class XDecoratedPeer extends XWindowPeer { return true; } Window realNativeFocusedWindow = XWindowPeer.getNativeFocusedWindow(); - if (focusLog.isLoggable(PlatformLogger.FINEST)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) { focusLog.finest("Real native focused window: " + realNativeFocusedWindow + "\nKFM's focused window: " + focusedWindow); } // A workaround for Metacity. See 6522725, 6613426, 7147075. if (target == realNativeFocusedWindow && XWM.getWMID() == XWM.METACITY_WM) { - if (focusLog.isLoggable(PlatformLogger.FINE)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINE)) { focusLog.fine("The window is already natively focused."); } return true; } } - if (focusLog.isLoggable(PlatformLogger.FINE)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINE)) { focusLog.fine("Requesting focus to " + (this == toFocus ? "this window" : toFocus)); } diff --git a/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java b/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java index c2da2e6999..8a22f65eba 100644 --- a/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java +++ b/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java @@ -395,7 +395,7 @@ class XDnDDragSourceProtocol extends XDragSourceProtocol { return false; } - if (logger.isLoggable(PlatformLogger.FINEST)) { + if (logger.isLoggable(PlatformLogger.Level.FINEST)) { logger.finest(" sourceWindow=" + sourceWindow + " get_window=" + xclient.get_window() + " xclient=" + xclient); diff --git a/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java b/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java index 3dc2c96efc..f0a6622c4b 100644 --- a/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java +++ b/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java @@ -993,7 +993,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol { if (sourceFormats != null && sourceFormats.length > 3) { data1 |= XDnDConstants.XDND_DATA_TYPES_BIT; } - if (logger.isLoggable(PlatformLogger.FINEST)) { + if (logger.isLoggable(PlatformLogger.Level.FINEST)) { logger.finest(" " + " entryVersion=" + version + " sourceProtocolVersion=" + @@ -1052,7 +1052,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol { public boolean forwardEventToEmbedded(long embedded, long ctxt, int eventID) { - if (logger.isLoggable(PlatformLogger.FINEST)) { + if (logger.isLoggable(PlatformLogger.Level.FINEST)) { logger.finest(" ctxt=" + ctxt + " type=" + (ctxt != 0 ? getMessageType(new @@ -1080,7 +1080,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol { long data3 = Native.getLong(ctxt + size + 2 * Native.getLongSize()); long data4 = Native.getLong(ctxt + size + 3 * Native.getLongSize()); - if (logger.isLoggable(PlatformLogger.FINEST)) { + if (logger.isLoggable(PlatformLogger.Level.FINEST)) { logger.finest(" 1 " + " embedded=" + embedded + " source=" + xclient.get_data(0) @@ -1114,7 +1114,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol { if ((XErrorHandlerUtil.saved_error != null) && (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) { - if (logger.isLoggable(PlatformLogger.WARNING)) { + if (logger.isLoggable(PlatformLogger.Level.WARNING)) { logger.warning("Cannot set XdndTypeList on the proxy window"); } } @@ -1122,7 +1122,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol { XToolkit.awtUnlock(); } } else { - if (logger.isLoggable(PlatformLogger.WARNING)) { + if (logger.isLoggable(PlatformLogger.Level.WARNING)) { logger.warning("Cannot read XdndTypeList from the source window"); } } @@ -1137,7 +1137,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol { overXEmbedClient = true; } - if (logger.isLoggable(PlatformLogger.FINEST)) { + if (logger.isLoggable(PlatformLogger.Level.FINEST)) { logger.finest(" 2 " + " embedded=" + embedded + " xclient=" + xclient); diff --git a/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java b/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java index c4ec7f766a..e762ae0118 100644 --- a/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java +++ b/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java @@ -542,7 +542,7 @@ public final class XDragSourceContextPeer return false; } - if (logger.isLoggable(PlatformLogger.FINEST)) { + if (logger.isLoggable(PlatformLogger.Level.FINEST)) { logger.finest(" proxyModeSourceWindow=" + getProxyModeSourceWindow() + " ev=" + ev); diff --git a/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java b/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java index 975d710264..b53e6e9fe0 100644 --- a/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java +++ b/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java @@ -199,7 +199,7 @@ final class XDropTargetContextPeer extends SunDropTargetContextPeer { structure. */ long ctxt = getNativeDragContext(); - if (logger.isLoggable(PlatformLogger.FINER)) { + if (logger.isLoggable(PlatformLogger.Level.FINER)) { logger.finer(" processing " + event + " ctxt=" + ctxt + " consumed=" + event.isConsumed()); } diff --git a/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java b/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java index 831766201a..8d0b09c1bc 100644 --- a/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java +++ b/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java @@ -116,7 +116,7 @@ abstract class XDropTargetProtocol { XClientMessageEvent xclient) { EmbedderRegistryEntry entry = getEmbedderRegistryEntry(toplevel); - if (logger.isLoggable(PlatformLogger.FINEST)) { + if (logger.isLoggable(PlatformLogger.Level.FINEST)) { logger.finest(" entry={0}", entry); } // Window not registered as an embedder for this protocol. @@ -124,7 +124,7 @@ abstract class XDropTargetProtocol { return false; } - if (logger.isLoggable(PlatformLogger.FINEST)) { + if (logger.isLoggable(PlatformLogger.Level.FINEST)) { logger.finest(" entry.isOverriden()={0}", entry.isOverriden()); } // Window didn't have an associated drop site, so there is no need @@ -137,7 +137,7 @@ abstract class XDropTargetProtocol { long proxy = entry.getProxy(); - if (logger.isLoggable(PlatformLogger.FINEST)) { + if (logger.isLoggable(PlatformLogger.Level.FINEST)) { logger.finest(" proxy={0} toplevel={1}", proxy, toplevel); } if (proxy == 0) { diff --git a/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java b/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java index f08db55c2b..8c1dab9a22 100644 --- a/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java +++ b/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java @@ -614,7 +614,7 @@ final class XDropTargetRegistry { if (info != null && info.getProtocolVersion() >= XDnDConstants.XDND_MIN_PROTOCOL_VERSION) { - if (logger.isLoggable(PlatformLogger.FINE)) { + if (logger.isLoggable(PlatformLogger.Level.FINE)) { logger.fine(" XEmbed drop site will be registered for " + Long.toHexString(clientWindow)); } registerEmbeddedDropSite(canvasWindow, clientWindow); @@ -628,14 +628,14 @@ final class XDropTargetRegistry { dropTargetProtocol.registerEmbeddedDropSite(clientWindow); } - if (logger.isLoggable(PlatformLogger.FINE)) { + if (logger.isLoggable(PlatformLogger.Level.FINE)) { logger.fine(" XEmbed drop site has been registered for " + Long.toHexString(clientWindow)); } } } public void unregisterXEmbedClient(long canvasWindow, long clientWindow) { - if (logger.isLoggable(PlatformLogger.FINE)) { + if (logger.isLoggable(PlatformLogger.Level.FINE)) { logger.fine(" XEmbed drop site will be unregistered for " + Long.toHexString(clientWindow)); } Iterator dropTargetProtocols = @@ -649,7 +649,7 @@ final class XDropTargetRegistry { unregisterEmbeddedDropSite(canvasWindow, clientWindow); - if (logger.isLoggable(PlatformLogger.FINE)) { + if (logger.isLoggable(PlatformLogger.Level.FINE)) { logger.fine(" XEmbed drop site has beed unregistered for " + Long.toHexString(clientWindow)); } } diff --git a/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java b/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java index 194eb8f751..167c3fe320 100644 --- a/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java +++ b/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java @@ -123,7 +123,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener } void initDispatching() { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("Init embedding for " + Long.toHexString(xembed.handle)); } XToolkit.awtLock(); @@ -142,7 +142,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener } void endDispatching() { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("End dispatching for " + Long.toHexString(xembed.handle)); } XToolkit.awtLock(); @@ -164,7 +164,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener } void childDestroyed() { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("Child " + Long.toHexString(xembed.handle) + " has self-destroyed."); } endDispatching(); @@ -196,10 +196,10 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener switch (ev.get_type()) { case XConstants.CreateNotify: XCreateWindowEvent cr = ev.get_xcreatewindow(); - if (xembedLog.isLoggable(PlatformLogger.FINEST)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINEST)) { xembedLog.finest("Message on embedder: " + cr); } - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Create notify for parent " + Long.toHexString(cr.get_parent()) + ", window " + Long.toHexString(cr.get_window())); } @@ -207,20 +207,20 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener break; case XConstants.DestroyNotify: XDestroyWindowEvent dn = ev.get_xdestroywindow(); - if (xembedLog.isLoggable(PlatformLogger.FINEST)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINEST)) { xembedLog.finest("Message on embedder: " + dn); } - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Destroy notify for parent: " + dn); } childDestroyed(); break; case XConstants.ReparentNotify: XReparentEvent rep = ev.get_xreparent(); - if (xembedLog.isLoggable(PlatformLogger.FINEST)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINEST)) { xembedLog.finest("Message on embedder: " + rep); } - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Reparent notify for parent " + Long.toHexString(rep.get_parent()) + ", window " + Long.toHexString(rep.get_window()) + ", event " + Long.toHexString(rep.get_event())); @@ -323,7 +323,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener } void childResized() { - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { Rectangle bounds = getClientBounds(); xembedLog.finer("Child resized: " + bounds); // It is not required to update embedder's size when client size changes @@ -388,7 +388,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener } void detachChild() { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("Detaching child " + Long.toHexString(xembed.handle)); } /** @@ -471,7 +471,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener try { XKeyEvent ke = new XKeyEvent(data); ke.set_window(xembed.handle); - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("Forwarding native key event: " + ke); } XToolkit.awtLock(); @@ -504,7 +504,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener postEvent(new InvocationEvent(target, new Runnable() { public void run() { GrabbedKey grab = new GrabbedKey(keysym, modifiers); - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("Grabbing key: " + grab); } synchronized(GRAB_LOCK) { @@ -518,7 +518,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener postEvent(new InvocationEvent(target, new Runnable() { public void run() { GrabbedKey grab = new GrabbedKey(keysym, modifiers); - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("UnGrabbing key: " + grab); } synchronized(GRAB_LOCK) { @@ -533,7 +533,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener public void run() { AWTKeyStroke stroke = xembed.getKeyStrokeForKeySym(keysym, modifiers); if (stroke != null) { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("Registering accelerator " + accel_id + " for " + stroke); } synchronized(ACCEL_LOCK) { @@ -553,7 +553,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener synchronized(ACCEL_LOCK) { stroke = accelerators.get(accel_id); if (stroke != null) { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("Unregistering accelerator: " + accel_id); } accelerators.remove(accel_id); @@ -601,7 +601,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener boolean result = false; - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Post-processing event " + e); } @@ -616,7 +616,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener } } if (exists) { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("Activating accelerator " + accel_id); } xembed.sendMessage(xembed.handle, XEMBED_ACTIVATE_ACCELERATOR, accel_id, 0, 0); // FIXME: How about overloaded? @@ -630,7 +630,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener exists = grabbed_keys.contains(key); } if (exists) { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("Forwarding grabbed key " + e); } forwardKeyEvent(e); @@ -651,11 +651,11 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener public void handleClientMessage(XEvent xev) { super.handleClientMessage(xev); XClientMessageEvent msg = xev.get_xclient(); - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Client message to embedder: " + msg); } if (msg.get_message_type() == xembed.XEmbed.getAtom()) { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine(xembed.XEmbedMessageToString(msg)); } } @@ -723,7 +723,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener } public boolean processXEmbedDnDEvent(long ctxt, int eventID) { - if (xembedLog.isLoggable(PlatformLogger.FINEST)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINEST)) { xembedLog.finest(" Drop target=" + target.getDropTarget()); } if (target.getDropTarget() instanceof XEmbedDropTarget) { @@ -758,7 +758,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener boolean new_mapped = (flags & XEMBED_MAPPED) != 0; boolean currently_mapped = XlibUtil.getWindowMapState(handle) != XConstants.IsUnmapped; if (new_mapped != currently_mapped) { - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Mapping state of the client has changed, old state: " + currently_mapped + ", new state: " + new_mapped); } if (new_mapped) { @@ -777,7 +777,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener } } } else { - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Mapping state didn't change, mapped: " + currently_mapped); } } @@ -790,7 +790,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener public void handlePropertyNotify(XEvent xev) { if (isXEmbedActive()) { XPropertyEvent ev = xev.get_xproperty(); - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Property change on client: " + ev); } if (ev.get_atom() == XAtom.XA_WM_NORMAL_HINTS) { @@ -813,7 +813,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener void handleConfigureNotify(XEvent xev) { if (isXEmbedActive()) { XConfigureEvent ev = xev.get_xconfigure(); - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Bounds change on client: " + ev); } if (xev.get_xany().get_window() == handle) { @@ -866,7 +866,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener // We recognize only these masks modifiers = ke.get_state() & (XConstants.ShiftMask | XConstants.ControlMask | XConstants.LockMask); - if (xembedLog.isLoggable(PlatformLogger.FINEST)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINEST)) { xembedLog.finest("Mapped " + e + " to " + this); } } finally { diff --git a/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java b/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java index 434e665ab3..e0ec7e83fe 100644 --- a/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java +++ b/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java @@ -53,7 +53,7 @@ public class XEmbedClientHelper extends XEmbedHelper implements XEventDispatcher } void setClient(XEmbeddedFramePeer client) { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("XEmbed client: " + client); } if (embedded != null) { @@ -67,7 +67,7 @@ public class XEmbedClientHelper extends XEmbedHelper implements XEventDispatcher } void install() { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("Installing xembedder on " + embedded); } long[] info = new long[] { XEMBED_VERSION, XEMBED_MAPPED }; @@ -95,11 +95,11 @@ public class XEmbedClientHelper extends XEmbedHelper implements XEventDispatcher void handleClientMessage(XEvent xev) { XClientMessageEvent msg = xev.get_xclient(); - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine(msg.toString()); } if (msg.get_message_type() == XEmbed.getAtom()) { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("Embedded message: " + msgidToString((int)msg.get_data(1))); } switch ((int)msg.get_data(1)) { diff --git a/src/solaris/classes/sun/awt/X11/XEmbedHelper.java b/src/solaris/classes/sun/awt/X11/XEmbedHelper.java index 3109d60d4a..49c7a5dcf0 100644 --- a/src/solaris/classes/sun/awt/X11/XEmbedHelper.java +++ b/src/solaris/classes/sun/awt/X11/XEmbedHelper.java @@ -82,13 +82,13 @@ public class XEmbedHelper { XEmbedHelper() { if (XEmbed == null) { XEmbed = XAtom.get("_XEMBED"); - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Created atom " + XEmbed.toString()); } } if (XEmbedInfo == null) { XEmbedInfo = XAtom.get("_XEMBED_INFO"); - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Created atom " + XEmbedInfo.toString()); } } @@ -110,7 +110,7 @@ public class XEmbedHelper { msg.set_data(4, data2); XToolkit.awtLock(); try { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("Sending " + XEmbedMessageToString(msg)); } XlibWrapper.XSendEvent(XToolkit.getDisplay(), window, false, XConstants.NoEventMask, msg.pData); diff --git a/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java b/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java index e588f8f5f3..e21d1d255f 100644 --- a/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java +++ b/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java @@ -81,7 +81,7 @@ public class XEmbedServerTester implements XEventDispatcher { throw new RuntimeException("Can't create robot"); } initAccel(); - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("XEmbed client(tester), embedder window: " + Long.toHexString(parent)); } } @@ -91,7 +91,7 @@ public class XEmbedServerTester implements XEventDispatcher { } private void dumpReceivedEvents() { - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Events received so far:"); int pos = 0; for (Integer event : events) { @@ -395,7 +395,7 @@ public class XEmbedServerTester implements XEventDispatcher { SubstructureNotifyMask | KeyPressMask)}); window = new XBaseWindow(params); - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Created tester window: " + window); } @@ -535,7 +535,7 @@ public class XEmbedServerTester implements XEventDispatcher { synchronized(EVENT_LOCK) { // Check for already received events after the request if (checkEventList(position, event) != -1) { - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("The event " + XEmbedHelper.msgidToString(event) + " has already been received"); } return; @@ -543,14 +543,14 @@ public class XEmbedServerTester implements XEventDispatcher { if (eventReceived == event) { // Already received - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Already received " + XEmbedHelper.msgidToString(event)); } return; } eventReceived = -1; eventWaited = event; - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Waiting for " + XEmbedHelper.msgidToString(event) + " starting from " + position); } try { @@ -563,7 +563,7 @@ public class XEmbedServerTester implements XEventDispatcher { dumpReceivedEvents(); throw new RuntimeException("Didn't receive event " + XEmbedHelper.msgidToString(event) + " but recevied " + XEmbedHelper.msgidToString(eventReceived)); } else { - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Successfully recevied " + XEmbedHelper.msgidToString(event)); } } @@ -648,7 +648,7 @@ public class XEmbedServerTester implements XEventDispatcher { if (ev.get_type() == ClientMessage) { XClientMessageEvent msg = ev.get_xclient(); if (msg.get_message_type() == xembed.XEmbed.getAtom()) { - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine("Embedded message: " + XEmbedHelper.msgidToString((int)msg.get_data(1))); } switch ((int)msg.get_data(1)) { @@ -675,12 +675,12 @@ public class XEmbedServerTester implements XEventDispatcher { synchronized(EVENT_LOCK) { events.add((int)msg.get_data(1)); - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Tester is waiting for " + XEmbedHelper.msgidToString(eventWaited)); } if ((int)msg.get_data(1) == eventWaited) { eventReceived = (int)msg.get_data(1); - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Notifying waiting object for event " + System.identityHashCode(EVENT_LOCK)); } EVENT_LOCK.notifyAll(); @@ -692,12 +692,12 @@ public class XEmbedServerTester implements XEventDispatcher { int eventID = (int)ev.get_type() | SYSTEM_EVENT_MASK; events.add(eventID); - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Tester is waiting for " + XEmbedHelper.msgidToString(eventWaited) + ", but we received " + ev + "(" + XEmbedHelper.msgidToString(eventID) + ")"); } if (eventID == eventWaited) { eventReceived = eventID; - if (xembedLog.isLoggable(PlatformLogger.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) { xembedLog.finer("Notifying waiting object" + System.identityHashCode(EVENT_LOCK)); } EVENT_LOCK.notifyAll(); diff --git a/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java b/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java index dfea40d78d..be1ebfb334 100644 --- a/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java +++ b/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java @@ -139,7 +139,7 @@ public class XEmbeddedFramePeer extends XFramePeer { { assert (SunToolkit.isAWTLockHeldByCurrentThread()); XConfigureEvent xe = xev.get_xconfigure(); - if (xembedLog.isLoggable(PlatformLogger.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) { xembedLog.fine(xe.toString()); } diff --git a/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java b/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java index 500226a040..e45f67ffde 100644 --- a/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java +++ b/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java @@ -119,7 +119,7 @@ public final class XErrorHandlerUtil { // Default XErrorHandler may just terminate the process. Don't call it. // return XlibWrapper.CallErrorHandler(saved_error_handler, display, error.pData); } - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Unhandled XErrorEvent: " + "id=" + error.get_resourceid() + ", " + "serial=" + error.get_serial() + ", " + diff --git a/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java b/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java index 0842417e71..b1c2b0ed84 100644 --- a/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java +++ b/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java @@ -720,7 +720,7 @@ class XFileDialogPeer extends XDialogPeer implements FileDialogPeer, ActionListe } File fe = new File(dir).getAbsoluteFile(); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Current directory : " + fe); } diff --git a/src/solaris/classes/sun/awt/X11/XFramePeer.java b/src/solaris/classes/sun/awt/X11/XFramePeer.java index 9a8212919a..050e0f2017 100644 --- a/src/solaris/classes/sun/awt/X11/XFramePeer.java +++ b/src/solaris/classes/sun/awt/X11/XFramePeer.java @@ -75,7 +75,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { winAttr.isResizable = true; // target.isResizable(); winAttr.title = target.getTitle(); winAttr.initialResizability = target.isResizable(); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Frame''s initial attributes: decor {0}, resizable {1}, undecorated {2}, initial state {3}", Integer.valueOf(winAttr.decorations), Boolean.valueOf(winAttr.initialResizability), Boolean.valueOf(!winAttr.nativeDecor), Integer.valueOf(winAttr.initialState)); @@ -209,7 +209,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { } public void setMaximizedBounds(Rectangle b) { - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("Setting maximized bounds to " + b); } if (b == null) return; @@ -228,7 +228,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { } else { hints.set_max_height((int)XlibWrapper.DisplayHeight(XToolkit.getDisplay(), XlibWrapper.DefaultScreen(XToolkit.getDisplay()))); } - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("Setting hints, flags " + XlibWrapper.hintsToString(hints.get_flags())); } XlibWrapper.XSetWMNormalHints(XToolkit.getDisplay(), window, hints.pData); @@ -258,18 +258,18 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { int changed = state ^ newState; int changeIconic = changed & Frame.ICONIFIED; boolean iconic = (newState & Frame.ICONIFIED) != 0; - if (stateLog.isLoggable(PlatformLogger.FINER)) { + if (stateLog.isLoggable(PlatformLogger.Level.FINER)) { stateLog.finer("Changing state, old state {0}, new state {1}(iconic {2})", Integer.valueOf(state), Integer.valueOf(newState), Boolean.valueOf(iconic)); } if (changeIconic != 0 && iconic) { - if (stateLog.isLoggable(PlatformLogger.FINER)) { + if (stateLog.isLoggable(PlatformLogger.Level.FINER)) { stateLog.finer("Iconifying shell " + getShell() + ", this " + this + ", screen " + getScreenNumber()); } XToolkit.awtLock(); try { int res = XlibWrapper.XIconifyWindow(XToolkit.getDisplay(), getShell(), getScreenNumber()); - if (stateLog.isLoggable(PlatformLogger.FINER)) { + if (stateLog.isLoggable(PlatformLogger.Level.FINER)) { stateLog.finer("XIconifyWindow returned " + res); } } @@ -281,7 +281,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { setExtendedState(newState); } if (changeIconic != 0 && !iconic) { - if (stateLog.isLoggable(PlatformLogger.FINER)) { + if (stateLog.isLoggable(PlatformLogger.Level.FINER)) { stateLog.finer("DeIconifying " + this); } xSetVisible(true); @@ -296,7 +296,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { super.handlePropertyNotify(xev); XPropertyEvent ev = xev.get_xproperty(); - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Property change {0}", ev); } /* @@ -311,7 +311,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { final int newState = XWM.getWM().getState(this); int changed = state ^ newState; if (changed == 0) { - if (stateLog.isLoggable(PlatformLogger.FINER)) { + if (stateLog.isLoggable(PlatformLogger.Level.FINER)) { stateLog.finer("State is the same: " + state); } return; @@ -365,7 +365,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { XWMHints hints = getWMHints(); hints.set_flags((int)XUtilConstants.StateHint | hints.get_flags()); hints.set_initial_state(wm_state); - if (stateLog.isLoggable(PlatformLogger.FINE)) { + if (stateLog.isLoggable(PlatformLogger.Level.FINE)) { stateLog.fine("Setting initial WM state on " + this + " to " + wm_state); } XlibWrapper.XSetWMHints(XToolkit.getDisplay(), getWindow(), hints.pData); diff --git a/src/solaris/classes/sun/awt/X11/XIconWindow.java b/src/solaris/classes/sun/awt/X11/XIconWindow.java index 8c14887748..3a810c0187 100644 --- a/src/solaris/classes/sun/awt/X11/XIconWindow.java +++ b/src/solaris/classes/sun/awt/X11/XIconWindow.java @@ -61,7 +61,7 @@ public class XIconWindow extends XBaseWindow { final long screen = adata.get_awt_visInfo().get_screen(); final long display = XToolkit.getDisplay(); - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest(adata.toString()); } @@ -73,13 +73,13 @@ public class XIconWindow extends XBaseWindow { } int count = Native.getInt(XlibWrapper.iarg1); long sizes_ptr = Native.getLong(XlibWrapper.larg1); // XIconSize* - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("count = {1}, sizes_ptr = {0}", Long.valueOf(sizes_ptr), Integer.valueOf(count)); } XIconSize[] res = new XIconSize[count]; for (int i = 0; i < count; i++, sizes_ptr += XIconSize.getSize()) { res[i] = new XIconSize(sizes_ptr); - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("sizes_ptr[{1}] = {0}", res[i], Integer.valueOf(i)); } } @@ -98,7 +98,7 @@ public class XIconWindow extends XBaseWindow { } XIconSize[] sizeList = getIconSizes(); - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Icon sizes: {0}", (Object[]) sizeList); } if (sizeList == null) { @@ -147,11 +147,11 @@ public class XIconWindow extends XBaseWindow { } } } - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("found=" + found); } if (!found) { - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("widthHint=" + widthHint + ", heightHint=" + heightHint + ", saveWidth=" + saveWidth + ", saveHeight=" + saveHeight + ", max_width=" + sizeList[0].get_max_width() @@ -167,7 +167,7 @@ public class XIconWindow extends XBaseWindow { /* determine which way to scale */ int wdiff = widthHint - sizeList[0].get_max_width(); int hdiff = heightHint - sizeList[0].get_max_height(); - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("wdiff=" + wdiff + ", hdiff=" + hdiff); } if (wdiff >= hdiff) { /* need to scale width more */ @@ -199,7 +199,7 @@ public class XIconWindow extends XBaseWindow { XToolkit.awtUnlock(); } - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("return " + saveWidth + "x" + saveHeight); } return new Dimension(saveWidth, saveHeight); @@ -426,7 +426,7 @@ public class XIconWindow extends XBaseWindow { } } if (min != null) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Icon: {0}x{1}", min.getWidth(null), min.getHeight(null)); } setIconImage(min); @@ -454,7 +454,7 @@ public class XIconWindow extends XBaseWindow { } Dimension iconSize = getIconSize(width, height); if (iconSize != null) { - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Icon size: {0}", iconSize); } iconWidth = iconSize.width; diff --git a/src/solaris/classes/sun/awt/X11/XInputMethod.java b/src/solaris/classes/sun/awt/X11/XInputMethod.java index a616bdf07e..6392f2cbf8 100644 --- a/src/solaris/classes/sun/awt/X11/XInputMethod.java +++ b/src/solaris/classes/sun/awt/X11/XInputMethod.java @@ -102,7 +102,7 @@ public class XInputMethod extends X11InputMethod { protected ComponentPeer getPeer(Component client) { XComponentPeer peer; - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Client is " + client); } peer = (XComponentPeer)XToolkit.targetToPeer(client); @@ -110,7 +110,7 @@ public class XInputMethod extends X11InputMethod { client = getParent(client); peer = (XComponentPeer)XToolkit.targetToPeer(client); } - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Peer is {0}, client is {1}", peer, client); } diff --git a/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java b/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java index 79041cbbb9..463a58da8f 100644 --- a/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java +++ b/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java @@ -60,7 +60,7 @@ public class XKeyboardFocusManagerPeer extends KeyboardFocusManagerPeerImpl { @Override public void setCurrentFocusedWindow(Window win) { - if (focusLog.isLoggable(PlatformLogger.FINER)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINER)) { focusLog.finer("Setting current focused window " + win); } diff --git a/src/solaris/classes/sun/awt/X11/XListPeer.java b/src/solaris/classes/sun/awt/X11/XListPeer.java index eeeed3975c..00c45ad8b7 100644 --- a/src/solaris/classes/sun/awt/X11/XListPeer.java +++ b/src/solaris/classes/sun/awt/X11/XListPeer.java @@ -575,12 +575,12 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { } void mousePressed(MouseEvent mouseEvent) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer(mouseEvent.toString() + ", hsb " + hsbVis + ", vsb " + vsbVis); } if (isEnabled() && mouseEvent.getButton() == MouseEvent.BUTTON1) { if (inWindow(mouseEvent.getX(), mouseEvent.getY())) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Mouse press in items area"); } active = WINDOW; @@ -619,7 +619,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { currentIndex = -1; } } else if (inVerticalScrollbar(mouseEvent.getX(), mouseEvent.getY())) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Mouse press in vertical scrollbar"); } active = VERSCROLLBAR; @@ -628,7 +628,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { mouseEvent.getX() - (width - SCROLLBAR_WIDTH), mouseEvent.getY()); } else if (inHorizontalScrollbar(mouseEvent.getX(), mouseEvent.getY())) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Mouse press in horizontal scrollbar"); } active = HORSCROLLBAR; @@ -813,7 +813,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { void keyPressed(KeyEvent e) { int keyCode = e.getKeyCode(); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine(e.toString()); } switch(keyCode) { @@ -1000,7 +1000,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { */ public void notifyValue(XScrollbar obj, int type, int v, boolean isAdjusting) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Notify value changed on " + obj + " to " + v); } int value = obj.getValue(); @@ -1085,7 +1085,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { } } } - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Adding item '" + item + "' to " + addedIndex); } @@ -1105,7 +1105,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { | ((vsb.needsRepaint())?(PAINT_VSCROLL):0); } - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Last visible: " + getLastVisibleItem() + ", hsb changed : " + (hsbWasVis ^ hsbVis) + ", items changed " + repaintItems); } @@ -1123,11 +1123,11 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { boolean vsbWasVisible = vsbVis; int oldLastDisplayed = lastItemDisplayed(); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Deleting from " + s + " to " + e); } - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Last displayed item: " + oldLastDisplayed + ", items in window " + itemsInWindow() + ", size " + items.size()); } @@ -1197,7 +1197,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { options |= PAINT_FOCUS; } - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Multiple selections: " + multipleSelections); } @@ -1452,7 +1452,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { * y is the number of items to scroll */ void scrollVertical(int y) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Scrolling vertically by " + y); } int itemsInWin = itemsInWindow(); @@ -1494,7 +1494,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { * x is the number of pixels to scroll */ void scrollHorizontal(int x) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Scrolling horizontally by " + y); } int w = getListWidth(); @@ -1732,7 +1732,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { } if (localBuffer == null) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Creating buffer " + width + "x" + height); } // use GraphicsConfig.cCVI() instead of Component.cVI(), @@ -1771,7 +1771,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { private void paint(Graphics listG, int firstItem, int lastItem, int options, Rectangle source, Point distance) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Repaint from " + firstItem + " to " + lastItem + " options " + options); } if (firstItem > lastItem) { @@ -1862,7 +1862,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { } private void paintItems(Graphics g, int firstItem, int lastItem, int options) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Painting items from " + firstItem + " to " + lastItem + ", focused " + focusIndex + ", first " + getFirstVisibleItem() + ", last " + getLastVisibleItem()); } @@ -1875,7 +1875,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { firstItem = Math.max(getFirstVisibleItem(), firstItem); lastItem = Math.min(lastItem, items.size()-1); - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Actually painting items from " + firstItem + " to " + lastItem + ", items in window " + itemsInWindow()); } @@ -1885,7 +1885,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { } private void paintItem(Graphics g, int index) { - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Painting item " + index); } // 4895367 - only paint items which are visible @@ -1895,7 +1895,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { int h = getItemHeight(); int y = getItemY(index); int x = getItemX(); - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Setting clip " + new Rectangle(x, y, w - (SPACE*2), h-(SPACE*2))); } g.setClip(x, y, w - (SPACE*2), h-(SPACE*2)); @@ -1903,14 +1903,14 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { // Always paint the background so that focus is unpainted in // multiselect mode if (isSelected(index)) { - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Painted item is selected"); } g.setColor(getListForeground()); } else { g.setColor(getListBackground()); } - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Filling " + new Rectangle(x, y, w, h)); } g.fillRect(x, y, w, h); @@ -1936,7 +1936,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { } void paintScrollBar(XScrollbar scr, Graphics g, int x, int y, int width, int height, boolean paintAll) { - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Painting scrollbar " + scr + " width " + width + " height " + height + ", paintAll " + paintAll); } @@ -1976,19 +1976,19 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { if (paintFocus && !hasFocus()) { paintFocus = false; } - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Painting focus, focus index " + getFocusIndex() + ", focus is " + (isItemHidden(getFocusIndex())?("invisible"):("visible")) + ", paint focus is " + paintFocus); } Shape clip = g.getClip(); g.setClip(0, 0, listWidth, listHeight); - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Setting focus clip " + new Rectangle(0, 0, listWidth, listHeight)); } Rectangle rect = getFocusRect(); if (prevFocusRect != null) { // Erase focus rect - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Erasing previous focus rect " + prevFocusRect); } g.setColor(getListBackground()); @@ -1997,7 +1997,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { } if (paintFocus) { // Paint new - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Painting focus rect " + rect); } g.setColor(getListForeground()); // Focus color is always black on Linux diff --git a/src/solaris/classes/sun/awt/X11/XMSelection.java b/src/solaris/classes/sun/awt/X11/XMSelection.java index 997fa1c883..fbe396b62c 100644 --- a/src/solaris/classes/sun/awt/X11/XMSelection.java +++ b/src/solaris/classes/sun/awt/X11/XMSelection.java @@ -128,7 +128,7 @@ public class XMSelection { long display = XToolkit.getDisplay(); synchronized(this) { setOwner(owner, screen); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("New Selection Owner for screen " + screen + " = " + owner ); } XlibWrapper.XSelectInput(display, owner, XConstants.StructureNotifyMask | eventMask); @@ -150,14 +150,14 @@ public class XMSelection { try { try { long display = XToolkit.getDisplay(); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Grabbing XServer"); } XlibWrapper.XGrabServer(display); synchronized(this) { String selection_name = getName()+"_S"+screen; - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Screen = " + screen + " selection name = " + selection_name); } XAtom atom = XAtom.get(selection_name); @@ -166,7 +166,7 @@ public class XMSelection { long owner = XlibWrapper.XGetSelectionOwner(display, atom.getAtom()); if (owner != 0) { setOwner(owner, screen); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Selection Owner for screen " + screen + " = " + owner ); } XlibWrapper.XSelectInput(display, owner, XConstants.StructureNotifyMask | extra_mask); @@ -183,7 +183,7 @@ public class XMSelection { e.printStackTrace(); } finally { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("UnGrabbing XServer"); } XlibWrapper.XUngrabServer(XToolkit.getDisplay()); @@ -197,7 +197,7 @@ public class XMSelection { static boolean processClientMessage(XEvent xev, int screen) { XClientMessageEvent xce = xev.get_xclient(); if (xce.get_message_type() == XA_MANAGER.getAtom()) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("client messags = " + xce); } long timestamp = xce.get_data(0); @@ -306,7 +306,7 @@ public class XMSelection { synchronized void dispatchSelectionChanged( XPropertyEvent ev, int screen) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Selection Changed : Screen = " + screen + "Event =" + ev); } if (listeners != null) { @@ -319,7 +319,7 @@ public class XMSelection { } synchronized void dispatchOwnerDeath(XDestroyWindowEvent de, int screen) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Owner dead : Screen = " + screen + "Event =" + de); } if (listeners != null) { @@ -333,7 +333,7 @@ public class XMSelection { } void dispatchSelectionEvent(XEvent xev, int screen) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Event =" + xev); } if (xev.get_type() == XConstants.DestroyNotify) { diff --git a/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java b/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java index 3b04e74fe9..7cf0cd7312 100644 --- a/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java +++ b/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java @@ -519,7 +519,7 @@ public class XMenuBarPeer extends XBaseMenuWindow implements MenuBarPeer { */ public void handleKeyPress(XEvent xev) { XKeyEvent xkey = xev.get_xkey(); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine(xkey.toString()); } if (isEventDisabled(xev)) { diff --git a/src/solaris/classes/sun/awt/X11/XMenuPeer.java b/src/solaris/classes/sun/awt/X11/XMenuPeer.java index 5931d8fecb..d88c0c9972 100644 --- a/src/solaris/classes/sun/awt/X11/XMenuPeer.java +++ b/src/solaris/classes/sun/awt/X11/XMenuPeer.java @@ -111,7 +111,7 @@ public class XMenuPeer extends XMenuItemPeer implements MenuPeer { * for adding separators */ public void addSeparator() { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("addSeparator is not implemented"); } } @@ -121,7 +121,7 @@ public class XMenuPeer extends XMenuItemPeer implements MenuPeer { if (menuWindow != null) { menuWindow.addItem(item); } else { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Attempt to use XMenuWindowPeer without window"); } } @@ -132,7 +132,7 @@ public class XMenuPeer extends XMenuItemPeer implements MenuPeer { if (menuWindow != null) { menuWindow.delItem(index); } else { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Attempt to use XMenuWindowPeer without window"); } } diff --git a/src/solaris/classes/sun/awt/X11/XMenuWindow.java b/src/solaris/classes/sun/awt/X11/XMenuWindow.java index 3d19233c8a..a524f0d6e3 100644 --- a/src/solaris/classes/sun/awt/X11/XMenuWindow.java +++ b/src/solaris/classes/sun/awt/X11/XMenuWindow.java @@ -399,7 +399,7 @@ public class XMenuWindow extends XBaseMenuWindow { if (!isCreated()) { return; } - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("showing menu window + " + getWindow() + " at " + bounds); } XToolkit.awtLock(); diff --git a/src/solaris/classes/sun/awt/X11/XNETProtocol.java b/src/solaris/classes/sun/awt/X11/XNETProtocol.java index da35f123aa..33523c555b 100644 --- a/src/solaris/classes/sun/awt/X11/XNETProtocol.java +++ b/src/solaris/classes/sun/awt/X11/XNETProtocol.java @@ -43,7 +43,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt } public void setState(XWindowPeer window, int state) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Setting state of " + window + " to " + state); } if (window.isShowing()) { @@ -55,7 +55,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt private void setInitialState(XWindowPeer window, int state) { XAtomList old_state = window.getNETWMState(); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Current state of the window {0} is {1}", window, old_state); } if ((state & Frame.MAXIMIZED_VERT) != 0) { @@ -68,7 +68,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt } else { old_state.remove(XA_NET_WM_STATE_MAXIMIZED_HORZ); } - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Setting initial state of the window {0} to {1}", window, old_state); } window.setNETWMState(old_state); @@ -103,7 +103,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt default: return; } - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Requesting state on " + window + " for " + state); } req.set_type((int)XConstants.ClientMessage); @@ -187,7 +187,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt req.set_data(1, state.getAtom()); // Fix for 6735584: req.data[2] must be set to 0 when only one property is changed req.set_data(2, 0); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Setting _NET_STATE atom {0} on {1} for {2}", state, window, Boolean.valueOf(isAdd)); } XToolkit.awtLock(); @@ -214,7 +214,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt * @param reset Indicates operation, 'set' if false, 'reset' if true */ private void setStateHelper(XWindowPeer window, XAtom state, boolean set) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Window visibility is: withdrawn={0}, visible={1}, mapped={2} showing={3}", Boolean.valueOf(window.isWithdrawn()), Boolean.valueOf(window.isVisible()), Boolean.valueOf(window.isMapped()), Boolean.valueOf(window.isShowing())); @@ -223,7 +223,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt requestState(window, state, set); } else { XAtomList net_wm_state = window.getNETWMState(); - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Current state on {0} is {1}", window, net_wm_state); } if (!set) { @@ -231,7 +231,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt } else { net_wm_state.add(state); } - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Setting states on {0} to {1}", window, net_wm_state); } window.setNETWMState(net_wm_state); @@ -290,7 +290,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt } NetWindow = checkAnchor(XA_NET_SUPPORTING_WM_CHECK, XAtom.XA_WINDOW); supportChecked = true; - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("### " + this + " is active: " + (NetWindow != 0)); } } @@ -302,7 +302,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt boolean doStateProtocol() { boolean res = active() && checkProtocol(XA_NET_SUPPORTED, XA_NET_WM_STATE); - if (stateLog.isLoggable(PlatformLogger.FINER)) { + if (stateLog.isLoggable(PlatformLogger.Level.FINER)) { stateLog.finer("doStateProtocol() returns " + res); } return res; @@ -331,7 +331,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt if (net_wm_name_string == null) { return false; } - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("### WM_NAME = " + net_wm_name_string); } return net_wm_name_string.startsWith(name); diff --git a/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java b/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java index 97afe322b0..cbb71925b5 100644 --- a/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java +++ b/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java @@ -123,7 +123,7 @@ public class XPopupMenuPeer extends XMenuWindow implements PopupMenuPeer { * for adding separators */ public void addSeparator() { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("addSeparator is not implemented"); } } @@ -343,7 +343,7 @@ public class XPopupMenuPeer extends XMenuWindow implements PopupMenuPeer { */ public void handleKeyPress(XEvent xev) { XKeyEvent xkey = xev.get_xkey(); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine(xkey.toString()); } if (isEventDisabled(xev)) { diff --git a/src/solaris/classes/sun/awt/X11/XProtocol.java b/src/solaris/classes/sun/awt/X11/XProtocol.java index 81200b7679..bf3de6ef15 100644 --- a/src/solaris/classes/sun/awt/X11/XProtocol.java +++ b/src/solaris/classes/sun/awt/X11/XProtocol.java @@ -54,7 +54,7 @@ class XProtocol { } finally { if (firstCheck) { firstCheck = false; - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("{0}:{1} supports {2}", this, listName, protocols); } } diff --git a/src/solaris/classes/sun/awt/X11/XScrollbar.java b/src/solaris/classes/sun/awt/X11/XScrollbar.java index d8a8aaf847..6afbac21fe 100644 --- a/src/solaris/classes/sun/awt/X11/XScrollbar.java +++ b/src/solaris/classes/sun/awt/X11/XScrollbar.java @@ -118,7 +118,7 @@ abstract class XScrollbar { abstract protected void rebuildArrows(); public void setSize(int width, int height) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Setting scroll bar " + this + " size to " + width + "x" + height); } this.width = width; @@ -166,7 +166,7 @@ abstract class XScrollbar { * @param paintAll paint the whole scrollbar if true, just the thumb is false */ void paint(Graphics g, Color colors[], boolean paintAll) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Painting scrollbar " + this); } @@ -339,7 +339,7 @@ abstract class XScrollbar { * Tell the scroller to start scrolling. */ void startScrolling() { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Start scrolling on " + this); } // Make sure that we scroll at least once @@ -361,7 +361,7 @@ abstract class XScrollbar { * See 6243382 for more information */ void startScrollingInstance() { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Start scrolling on " + this); } // Make sure that we scroll at least once @@ -376,7 +376,7 @@ abstract class XScrollbar { * See 6243382 for more information */ void stopScrollingInstance() { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Stop scrolling on " + this); } @@ -464,7 +464,7 @@ abstract class XScrollbar { return; } - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { String type; switch (id) { case MouseEvent.MOUSE_PRESSED: diff --git a/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java b/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java index f77519c6d3..2180f2961d 100644 --- a/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java +++ b/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java @@ -156,7 +156,7 @@ class XScrollbarPeer extends XComponentPeer implements ScrollbarPeer, XScrollbar public void handleJavaKeyEvent(KeyEvent event) { super.handleJavaKeyEvent(event); - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("KeyEvent on scrollbar: " + event); } if (!(event.isConsumed()) && event.getID() == KeyEvent.KEY_RELEASED) { diff --git a/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java b/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java index 2407ccb174..eb1774c766 100644 --- a/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java +++ b/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java @@ -58,7 +58,7 @@ public class XSystemTrayPeer implements SystemTrayPeer, XMSelectionListener { long selection_owner = selection.getOwner(SCREEN); available = (selection_owner != XConstants.None); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine(" check if system tray is available. selection owner: " + selection_owner); } } @@ -108,7 +108,7 @@ public class XSystemTrayPeer implements SystemTrayPeer, XMSelectionListener { void addTrayIcon(XTrayIconPeer tiPeer) throws AWTException { long selection_owner = selection.getOwner(SCREEN); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine(" send SYSTEM_TRAY_REQUEST_DOCK message to owner: " + selection_owner); } diff --git a/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java b/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java index c87d7a1ec2..be948e2a70 100644 --- a/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java +++ b/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java @@ -258,7 +258,7 @@ public class XTextFieldPeer extends XComponentPeer implements TextFieldPeer { } public void setBackground(Color c) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("target="+ target + ", old=" + background + ", new=" + c); } background = c; diff --git a/src/solaris/classes/sun/awt/X11/XToolkit.java b/src/solaris/classes/sun/awt/X11/XToolkit.java index 607537cdaa..32eceaae3b 100644 --- a/src/solaris/classes/sun/awt/X11/XToolkit.java +++ b/src/solaris/classes/sun/awt/X11/XToolkit.java @@ -266,7 +266,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { ((XAWTXSettings)xs).dispose(); } freeXKB(); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { dumpPeers(); } } @@ -524,7 +524,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } static void processException(Throwable thr) { - if (log.isLoggable(PlatformLogger.WARNING)) { + if (log.isLoggable(PlatformLogger.Level.WARNING)) { log.warning("Exception on Toolkit thread", thr); } } @@ -586,7 +586,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { continue; } - if (eventLog.isLoggable(PlatformLogger.FINER)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINER)) { eventLog.finer("{0}", ev); } @@ -602,13 +602,13 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } } } - if( keyEventLog.isLoggable(PlatformLogger.FINE) && (ev.get_type() == XConstants.KeyPress || ev.get_type() == XConstants.KeyRelease) ) { + if( keyEventLog.isLoggable(PlatformLogger.Level.FINE) && (ev.get_type() == XConstants.KeyPress || ev.get_type() == XConstants.KeyRelease) ) { keyEventLog.fine("before XFilterEvent:"+ev); } if (XlibWrapper.XFilterEvent(ev.getPData(), w)) { continue; } - if( keyEventLog.isLoggable(PlatformLogger.FINE) && (ev.get_type() == XConstants.KeyPress || ev.get_type() == XConstants.KeyRelease) ) { + if( keyEventLog.isLoggable(PlatformLogger.Level.FINE) && (ev.get_type() == XConstants.KeyPress || ev.get_type() == XConstants.KeyRelease) ) { keyEventLog.fine("after XFilterEvent:"+ev); // IS THIS CORRECT? } @@ -1321,7 +1321,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } static void dumpPeers() { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Mapped windows:"); Iterator iter = winMap.entrySet().iterator(); while (iter.hasNext()) { @@ -1417,7 +1417,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } } catch (InterruptedException ie) { // Note: the returned timeStamp can be incorrect in this case. - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Catched exception, timeStamp may not be correct (ie = " + ie + ")"); } } @@ -1584,7 +1584,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { name = "gnome." + name; setDesktopProperty(name, e.getValue()); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("name = " + name + " value = " + e.getValue()); } @@ -1773,7 +1773,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } finally { awtUnlock(); } - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("metaMask = " + metaMask); log.fine("altMask = " + altMask); log.fine("numLockMask = " + numLockMask); @@ -1795,11 +1795,11 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } awtLock(); try { - if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) { + if (timeoutTaskLog.isLoggable(PlatformLogger.Level.FINER)) { timeoutTaskLog.finer("Removing task " + task); } if (timeoutTasks == null) { - if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) { + if (timeoutTaskLog.isLoggable(PlatformLogger.Level.FINER)) { timeoutTaskLog.finer("Task is not scheduled"); } return; @@ -1846,7 +1846,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { awtLock(); try { - if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) { + if (timeoutTaskLog.isLoggable(PlatformLogger.Level.FINER)) { timeoutTaskLog.finer("XToolkit.schedule(): current time={0}" + "; interval={1}" + "; task being added={2}" + "; tasks before addition={3}", @@ -1893,7 +1893,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { * Called from run() under awtLock. */ private static void callTimeoutTasks() { - if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) { + if (timeoutTaskLog.isLoggable(PlatformLogger.Level.FINER)) { timeoutTaskLog.finer("XToolkit.callTimeoutTasks(): current time={0}" + "; tasks={1}", Long.valueOf(System.currentTimeMillis()), timeoutTasks); } @@ -1911,7 +1911,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { for (Iterator iter = tasks.iterator(); iter.hasNext();) { Runnable task = (Runnable)iter.next(); - if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) { + if (timeoutTaskLog.isLoggable(PlatformLogger.Level.FINER)) { timeoutTaskLog.finer("XToolkit.callTimeoutTasks(): current time={0}" + "; about to run task={1}", Long.valueOf(currentTime), task); } @@ -1986,7 +1986,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { */ long current_time_utc = System.currentTimeMillis(); - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("reset_time=" + reset_time_utc + ", current_time=" + current_time_utc + ", server_offset=" + server_offset + ", wrap_time=" + WRAP_TIME_MILLIS); } @@ -1995,7 +1995,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { reset_time_utc = System.currentTimeMillis() - getCurrentServerTime(); } - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("result = " + (reset_time_utc + server_offset)); } return reset_time_utc + server_offset; @@ -2074,14 +2074,14 @@ public final class XToolkit extends UNIXToolkit implements Runnable { if (prop == null) { backingStoreType = XConstants.NotUseful; - if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) { + if (backingStoreLog.isLoggable(PlatformLogger.Level.CONFIG)) { backingStoreLog.config("The system property sun.awt.backingStore is not set" + ", by default backingStore=NotUseful"); } return; } - if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) { + if (backingStoreLog.isLoggable(PlatformLogger.Level.CONFIG)) { backingStoreLog.config("The system property sun.awt.backingStore is " + prop); } prop = prop.toLowerCase(); @@ -2093,7 +2093,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { backingStoreType = XConstants.NotUseful; } - if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) { + if (backingStoreLog.isLoggable(PlatformLogger.Level.CONFIG)) { backingStoreLog.config("backingStore(as provided by the system property)=" + ( backingStoreType == XConstants.NotUseful ? "NotUseful" : backingStoreType == XConstants.WhenMapped ? @@ -2103,7 +2103,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { if (sun.java2d.x11.X11SurfaceData.isDgaAvailable()) { backingStoreType = XConstants.NotUseful; - if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) { + if (backingStoreLog.isLoggable(PlatformLogger.Level.CONFIG)) { backingStoreLog.config("DGA is available, backingStore=NotUseful"); } @@ -2118,7 +2118,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { == XConstants.NotUseful) { backingStoreType = XConstants.NotUseful; - if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) { + if (backingStoreLog.isLoggable(PlatformLogger.Level.CONFIG)) { backingStoreLog.config("Backing store is not available on the screen " + i + ", backingStore=NotUseful"); } @@ -2396,7 +2396,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { // Wait for selection notify for oops on win long event_number = getEventNumber(); XAtom atom = XAtom.get("WM_S0"); - if (eventLog.isLoggable(PlatformLogger.FINER)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINER)) { eventLog.finer("WM_S0 selection owner {0}", XlibWrapper.XGetSelectionOwner(getDisplay(), atom.getAtom())); } XlibWrapper.XConvertSelection(getDisplay(), atom.getAtom(), diff --git a/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java b/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java index 5ee6b65ec5..24f2656f89 100644 --- a/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java +++ b/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java @@ -106,7 +106,7 @@ public class XTrayIconPeer implements TrayIconPeer, XConfigureEvent ce = ev.get_xconfigure(); - if (ctrLog.isLoggable(PlatformLogger.FINE)) { + if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) { ctrLog.fine("ConfigureNotify on parent of {0}: {1}x{2}+{3}+{4} (old: {5}+{6})", XTrayIconPeer.this, ce.get_width(), ce.get_height(), ce.get_x(), ce.get_y(), old_x, old_y); @@ -130,7 +130,7 @@ public class XTrayIconPeer implements TrayIconPeer, // If both the height and the width differ from the fixed size then WM // must level at least one side to the fixed size. For some reason it may take // a few hops (even after reparenting) and we have to skip the intermediate ones. - if (ctrLog.isLoggable(PlatformLogger.FINE)) { + if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) { ctrLog.fine("ConfigureNotify on parent of {0}. Skipping as intermediate resizing.", XTrayIconPeer.this); } @@ -138,7 +138,7 @@ public class XTrayIconPeer implements TrayIconPeer, } else if (ce.get_height() > TRAY_ICON_HEIGHT) { - if (ctrLog.isLoggable(PlatformLogger.FINE)) { + if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) { ctrLog.fine("ConfigureNotify on parent of {0}. Centering by \"Y\".", XTrayIconPeer.this); } @@ -153,7 +153,7 @@ public class XTrayIconPeer implements TrayIconPeer, } else if (ce.get_width() > TRAY_ICON_WIDTH) { - if (ctrLog.isLoggable(PlatformLogger.FINE)) { + if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) { ctrLog.fine("ConfigureNotify on parent of {0}. Centering by \"X\".", XTrayIconPeer.this); } @@ -173,7 +173,7 @@ public class XTrayIconPeer implements TrayIconPeer, if (ex_height != 0) { - if (ctrLog.isLoggable(PlatformLogger.FINE)) { + if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) { ctrLog.fine("ConfigureNotify on parent of {0}. Move detected. Centering by \"Y\".", XTrayIconPeer.this); } @@ -184,7 +184,7 @@ public class XTrayIconPeer implements TrayIconPeer, } else if (ex_width != 0) { - if (ctrLog.isLoggable(PlatformLogger.FINE)) { + if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) { ctrLog.fine("ConfigureNotify on parent of {0}. Move detected. Centering by \"X\".", XTrayIconPeer.this); } @@ -193,7 +193,7 @@ public class XTrayIconPeer implements TrayIconPeer, ce.get_x() + ex_width/2 - TRAY_ICON_WIDTH/2, ce.get_y()); } else { - if (ctrLog.isLoggable(PlatformLogger.FINE)) { + if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) { ctrLog.fine("ConfigureNotify on parent of {0}. Move detected. Skipping.", XTrayIconPeer.this); } diff --git a/src/solaris/classes/sun/awt/X11/XWINProtocol.java b/src/solaris/classes/sun/awt/X11/XWINProtocol.java index 35b5cfe703..f7e4ba1f8a 100644 --- a/src/solaris/classes/sun/awt/X11/XWINProtocol.java +++ b/src/solaris/classes/sun/awt/X11/XWINProtocol.java @@ -63,7 +63,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol { req.set_format(32); req.set_data(0, (WIN_STATE_MAXIMIZED_HORIZ | WIN_STATE_MAXIMIZED_VERT)); req.set_data(1, win_state); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Sending WIN_STATE to root to change the state to " + win_state); } try { @@ -113,7 +113,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol { win_state &= ~WIN_STATE_MAXIMIZED_HORIZ; } if ((old_win_state ^ win_state) != 0) { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Setting WIN_STATE on " + window + " to change the state to " + win_state); } XA_WIN_STATE.setCard32Property(window, win_state); @@ -160,7 +160,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol { req.set_data(0, layer == LAYER_NORMAL ? WIN_LAYER_NORMAL : WIN_LAYER_ONTOP); req.set_data(1, 0); req.set_data(2, 0); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Setting layer " + layer + " by root message : " + req); } XToolkit.awtLock(); @@ -177,7 +177,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol { } req.dispose(); } else { - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Setting layer property to " + layer); } XA_WIN_LAYER.setCard32Property(window, layer == LAYER_NORMAL ? WIN_LAYER_NORMAL : WIN_LAYER_ONTOP); @@ -205,7 +205,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol { } WinWindow = checkAnchor(XA_WIN_SUPPORTING_WM_CHECK, XAtom.XA_CARDINAL); supportChecked = true; - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("### " + this + " is active: " + (WinWindow != 0)); } } @@ -216,7 +216,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol { } boolean doStateProtocol() { boolean res = active() && checkProtocol(XA_WIN_PROTOCOLS, XA_WIN_STATE); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("### " + this + " supports state: " + res); } return res; @@ -224,7 +224,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol { boolean doLayerProtocol() { boolean res = active() && checkProtocol(XA_WIN_PROTOCOLS, XA_WIN_LAYER); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("### " + this + " supports layer: " + res); } return res; diff --git a/src/solaris/classes/sun/awt/X11/XWM.java b/src/solaris/classes/sun/awt/X11/XWM.java index 94410519dc..6fc8de4c59 100644 --- a/src/solaris/classes/sun/awt/X11/XWM.java +++ b/src/solaris/classes/sun/awt/X11/XWM.java @@ -148,7 +148,7 @@ final class XWM XWM(int WMID) { this.WMID = WMID; initializeProtocols(); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Window manager: " + toString()); } } @@ -254,7 +254,7 @@ final class XWM * having a window manager running. I.e. it does not reparent * top level shells. */ - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("eXcursion means NO_WM"); } return true; @@ -272,7 +272,7 @@ final class XWM long selection_owner = XlibWrapper.XGetSelectionOwner(XToolkit.getDisplay(), XAtom.get(selection_name).getAtom()); - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("selection owner of " + selection_name + " is " + selection_owner); } @@ -301,7 +301,7 @@ final class XWM XToolkit.getDefaultRootWindow(), XConstants.CWEventMask, substruct.pData); - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("It looks like there is no WM thus NO_WM"); } } @@ -345,7 +345,7 @@ final class XWM byte[] bytes = XlibWrapper.getStringBytes(getter.getData()); String id = new String(bytes); - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("ENLIGHTENMENT_COMMS is " + id); } @@ -354,15 +354,15 @@ final class XWM try { Matcher match = winIdPat.matcher(id); if (match.matches()) { - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Match group count: " + match.groupCount()); } String longId = match.group(1); - if (log.isLoggable(PlatformLogger.FINEST)) { + if (log.isLoggable(PlatformLogger.Level.FINEST)) { log.finest("Match group 1 " + longId); } long winid = Long.parseLong(longId, 16); - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Enlightenment communication window " + winid); } return winid; @@ -371,7 +371,7 @@ final class XWM return 0; } } catch (Exception e) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { e.printStackTrace(); } return 0; @@ -417,7 +417,7 @@ final class XWM static boolean isCDE() { if (!XA_DT_SM_WINDOW_INFO.isInterned()) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("{0} is not interned", XA_DT_SM_WINDOW_INFO); } return false; @@ -450,7 +450,7 @@ final class XWM /* Now check that this window has _DT_SM_STATE_INFO (ignore contents) */ if (!XA_DT_SM_STATE_INFO.isInterned()) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("{0} is not interned", XA_DT_SM_STATE_INFO); } return false; @@ -624,7 +624,7 @@ final class XWM */ if (!XA_ICEWM_WINOPTHINT.isInterned()) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("{0} is not interned", XA_ICEWM_WINOPTHINT); } return false; @@ -660,7 +660,7 @@ final class XWM */ static boolean isIceWM() { if (!XA_ICEWM_WINOPTHINT.isInterned()) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("{0} is not interned", XA_ICEWM_WINOPTHINT); } return false; @@ -673,7 +673,7 @@ final class XWM try { int status = getter.execute(); boolean res = (status == XConstants.Success && getter.getActualType() != 0); - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Status getting XA_ICEWM_WINOPTHINT: " + !res); } return !res || isNetWMName("IceWM"); @@ -729,7 +729,7 @@ final class XWM return wm; } static int getWMID() { - if (insLog.isLoggable(PlatformLogger.FINEST)) { + if (insLog.isLoggable(PlatformLogger.Level.FINEST)) { insLog.finest("awt_wmgr = " + awt_wmgr); } /* @@ -753,7 +753,7 @@ final class XWM // Later, WM will initialize its own version of protocol XNETProtocol l_net_protocol = g_net_protocol = new XNETProtocol(); l_net_protocol.detect(); - if (log.isLoggable(PlatformLogger.FINE) && l_net_protocol.active()) { + if (log.isLoggable(PlatformLogger.Level.FINE) && l_net_protocol.active()) { log.fine("_NET_WM_NAME is " + l_net_protocol.getWMName()); } XWINProtocol win = g_win_protocol = new XWINProtocol(); @@ -837,7 +837,7 @@ final class XWM } hints.set_flags(hints.get_flags() & ~mask); - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("Setting hints, flags " + XlibWrapper.hintsToString(hints.get_flags())); } XlibWrapper.XSetWMNormalHints(XToolkit.getDisplay(), @@ -896,7 +896,7 @@ final class XWM XAtomList decorDel = new XAtomList(); decorations = normalizeMotifDecor(decorations); - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("Setting OL_DECOR to " + Integer.toBinaryString(decorations)); } if ((decorations & MWMConstants.MWM_DECOR_TITLE) == 0) { @@ -915,7 +915,7 @@ final class XWM insLog.finer("Deleting OL_DECOR"); XA_OL_DECOR_DEL.DeleteProperty(window); } else { - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("Setting OL_DECOR to " + decorDel); } XA_OL_DECOR_DEL.setAtomListProperty(window, decorDel); @@ -945,7 +945,7 @@ final class XWM hints.set_functions(functions); hints.set_decorations(decorations); - if (stateLog.isLoggable(PlatformLogger.FINER)) { + if (stateLog.isLoggable(PlatformLogger.Level.FINER)) { stateLog.finer("Setting MWM_HINTS to " + hints); } window.setMWMHints(hints); @@ -1009,7 +1009,7 @@ final class XWM * Make specified shell resizable. */ static void setShellResizable(XDecoratedPeer window) { - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("Setting shell resizable " + window); } XToolkit.awtLock(); @@ -1041,7 +1041,7 @@ final class XWM static void setShellNotResizable(XDecoratedPeer window, WindowDimensions newDimensions, Rectangle shellBounds, boolean justChangeSize) { - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("Setting non-resizable shell " + window + ", dimensions " + newDimensions + ", shellBounds " + shellBounds +", just change size: " + justChangeSize); } @@ -1175,7 +1175,7 @@ final class XWM stateLog.finer("WithdrawnState"); return false; } else { - if (stateLog.isLoggable(PlatformLogger.FINER)) { + if (stateLog.isLoggable(PlatformLogger.Level.FINER)) { stateLog.finer("Window WM_STATE is " + wm_state); } } @@ -1186,7 +1186,7 @@ final class XWM for (XStateProtocol proto : getProtocols(XStateProtocol.class)) { is_state_change |= proto.isStateChange(e); - if (stateLog.isLoggable(PlatformLogger.FINEST)) { + if (stateLog.isLoggable(PlatformLogger.Level.FINEST)) { stateLog.finest(proto + ": is state changed = " + is_state_change); } } @@ -1340,7 +1340,7 @@ final class XWM res = defaultInsets; } } - if (insLog.isLoggable(PlatformLogger.FINEST)) { + if (insLog.isLoggable(PlatformLogger.Level.FINEST)) { insLog.finest("WM guessed insets: " + res); } return res; @@ -1411,7 +1411,7 @@ final class XWM XNETProtocol net_protocol = getWM().getNETProtocol(); if (net_protocol != null && net_protocol.active()) { Insets insets = getInsetsFromProp(window, XA_NET_FRAME_EXTENTS); - if (insLog.isLoggable(PlatformLogger.FINE)) { + if (insLog.isLoggable(PlatformLogger.Level.FINE)) { insLog.fine("_NET_FRAME_EXTENTS: {0}", insets); } @@ -1554,7 +1554,7 @@ final class XWM * [mwm, e!, kwin, fvwm2 ... ] */ Insets correctWM = XWM.getInsetsFromExtents(window); - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("Got insets from property: {0}", correctWM); } @@ -1617,7 +1617,7 @@ final class XWM } case XWM.OTHER_WM: default: { /* this is very similar to the E! case above */ - if (insLog.isLoggable(PlatformLogger.FINEST)) { + if (insLog.isLoggable(PlatformLogger.Level.FINEST)) { insLog.finest("Getting correct insets for OTHER_WM/default, parent: {0}", parent); } syncTopLevelPos(parent, lwinAttr); @@ -1646,7 +1646,7 @@ final class XWM && lwinAttr.get_width()+2*lwinAttr.get_border_width() == pattr.get_width() && lwinAttr.get_height()+2*lwinAttr.get_border_width() == pattr.get_height()) { - if (insLog.isLoggable(PlatformLogger.FINEST)) { + if (insLog.isLoggable(PlatformLogger.Level.FINEST)) { insLog.finest("Double reparenting detected, pattr({2})={0}, lwinAttr({3})={1}", lwinAttr, pattr, parent, window); } @@ -1676,7 +1676,7 @@ final class XWM * widths and inner/outer distinction, so for the time * being, just ignore it. */ - if (insLog.isLoggable(PlatformLogger.FINEST)) { + if (insLog.isLoggable(PlatformLogger.Level.FINEST)) { insLog.finest("Attrs before calculation: pattr({2})={0}, lwinAttr({3})={1}", lwinAttr, pattr, parent, window); } diff --git a/src/solaris/classes/sun/awt/X11/XWindow.java b/src/solaris/classes/sun/awt/X11/XWindow.java index 3eb4cc8726..1e913e4ba9 100644 --- a/src/solaris/classes/sun/awt/X11/XWindow.java +++ b/src/solaris/classes/sun/awt/X11/XWindow.java @@ -402,7 +402,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { ((Component)e.getSource()).dispatchEvent(e); } }, PeerEvent.ULTIMATE_PRIORITY_EVENT); - if (focusLog.isLoggable(PlatformLogger.FINER) && (e instanceof FocusEvent)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINER) && (e instanceof FocusEvent)) { focusLog.finer("Sending " + e); } XToolkit.postEvent(XToolkit.targetToAppContext(e.getSource()), pe); @@ -662,7 +662,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { if (isEventDisabled(xev)) { return; } - if (eventLog.isLoggable(PlatformLogger.FINE)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINE)) { eventLog.fine(xbe.toString()); } long when; @@ -698,7 +698,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { /* multiclick checking */ - if (eventLog.isLoggable(PlatformLogger.FINEST)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) { eventLog.finest("lastWindow = " + lastWindow + ", lastButton " + lastButton + ", lastTime " + lastTime + ", multiClickTime " + XToolkit.getMultiClickTime()); @@ -891,7 +891,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { super.handleXCrossingEvent(xev); XCrossingEvent xce = xev.get_xcrossing(); - if (eventLog.isLoggable(PlatformLogger.FINEST)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) { eventLog.finest(xce.toString()); } @@ -995,7 +995,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { Rectangle oldBounds = getBounds(); super.handleConfigureNotifyEvent(xev); - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("Configure, {0}, event disabled: {1}", xev.get_xconfigure(), isEventDisabled(xev)); } @@ -1017,7 +1017,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { public void handleMapNotifyEvent(XEvent xev) { super.handleMapNotifyEvent(xev); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Mapped {0}", this); } if (isEventDisabled(xev)) { @@ -1041,7 +1041,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { } private void dumpKeysymArray(XKeyEvent ev) { - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine(" "+Long.toHexString(XlibWrapper.XKeycodeToKeysym(XToolkit.getDisplay(), ev.get_keycode(), 0))+ "\n "+Long.toHexString(XlibWrapper.XKeycodeToKeysym(XToolkit.getDisplay(), ev.get_keycode(), 1))+ "\n "+Long.toHexString(XlibWrapper.XKeycodeToKeysym(XToolkit.getDisplay(), ev.get_keycode(), 2))+ @@ -1071,18 +1071,18 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { //return (uni > 0? uni + 0x01000000 : 0); } void logIncomingKeyEvent(XKeyEvent ev) { - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine("--XWindow.java:handleKeyEvent:"+ev); } dumpKeysymArray(ev); - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine("XXXXXXXXXXXXXX javakeycode will be most probably:0x"+ Integer.toHexString(XKeysym.getJavaKeycodeOnly(ev))); } } public void handleKeyPress(XEvent xev) { super.handleKeyPress(xev); XKeyEvent ev = xev.get_xkey(); - if (eventLog.isLoggable(PlatformLogger.FINE)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINE)) { eventLog.fine(ev.toString()); } if (isEventDisabled(xev)) { @@ -1097,14 +1097,14 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { int unicodeKey = 0; keysym[0] = XConstants.NoSymbol; - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { logIncomingKeyEvent( ev ); } if ( //TODO check if there's an active input method instance // without calling a native method. Is it necessary though? haveCurrentX11InputMethodInstance()) { if (x11inputMethodLookupString(ev.pData, keysym)) { - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine("--XWindow.java XIM did process event; return; dec keysym processed:"+(keysym[0])+ "; hex keysym processed:"+Long.toHexString(keysym[0]) ); @@ -1112,7 +1112,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { return; }else { unicodeKey = keysymToUnicode( keysym[0], ev.get_state() ); - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine("--XWindow.java XIM did NOT process event, hex keysym:"+Long.toHexString(keysym[0])+"\n"+ " unicode key:"+Integer.toHexString((int)unicodeKey)); } @@ -1122,7 +1122,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { // Produce do-it-yourself keysym and perhaps unicode character. keysym[0] = xkeycodeToKeysym(ev); unicodeKey = keysymToUnicode( keysym[0], ev.get_state() ); - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine("--XWindow.java XIM is absent; hex keysym:"+Long.toHexString(keysym[0])+"\n"+ " unicode key:"+Integer.toHexString((int)unicodeKey)); } @@ -1148,7 +1148,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { // is undefined, we still have a guess of what has been engraved on a keytop. int unicodeFromPrimaryKeysym = keysymToUnicode( xkeycodeToPrimaryKeysym(ev) ,0); - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine(">>>Fire Event:"+ (ev.get_type() == XConstants.KeyPress ? "KEY_PRESSED; " : "KEY_RELEASED; ")+ "jkeycode:decimal="+jkc.getJavaKeycode()+ @@ -1173,7 +1173,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { if (unicodeKey > 0 && !isDeadKey) { - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine("fire _TYPED on "+unicodeKey); } postKeyEvent( java.awt.event.KeyEvent.KEY_TYPED, @@ -1193,7 +1193,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { public void handleKeyRelease(XEvent xev) { super.handleKeyRelease(xev); XKeyEvent ev = xev.get_xkey(); - if (eventLog.isLoggable(PlatformLogger.FINE)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINE)) { eventLog.fine(ev.toString()); } if (isEventDisabled(xev)) { @@ -1205,7 +1205,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { private void handleKeyRelease(XKeyEvent ev) { int unicodeKey = 0; - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { logIncomingKeyEvent( ev ); } // Keysym should be converted to Unicode, if possible and necessary, @@ -1220,7 +1220,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { if( jkc == null ) { jkc = new XKeysym.Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_UNDEFINED, java.awt.event.KeyEvent.KEY_LOCATION_UNKNOWN); } - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine(">>>Fire Event:"+ (ev.get_type() == XConstants.KeyPress ? "KEY_PRESSED; " : "KEY_RELEASED; ")+ "jkeycode:decimal="+jkc.getJavaKeycode()+ @@ -1357,12 +1357,12 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { void updateSizeHints(int x, int y, int width, int height) { long flags = XUtilConstants.PSize | (isLocationByPlatform() ? 0 : (XUtilConstants.PPosition | XUtilConstants.USPosition)); if (!isResizable()) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Window {0} is not resizable", this); } flags |= XUtilConstants.PMinSize | XUtilConstants.PMaxSize; } else { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Window {0} is resizable", this); } } @@ -1372,12 +1372,12 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { void updateSizeHints(int x, int y) { long flags = isLocationByPlatform() ? 0 : (XUtilConstants.PPosition | XUtilConstants.USPosition); if (!isResizable()) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Window {0} is not resizable", this); } flags |= XUtilConstants.PMinSize | XUtilConstants.PMaxSize | XUtilConstants.PSize; } else { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Window {0} is resizable", this); } } diff --git a/src/solaris/classes/sun/awt/X11/XWindowPeer.java b/src/solaris/classes/sun/awt/X11/XWindowPeer.java index bab9ee1194..32623712c5 100644 --- a/src/solaris/classes/sun/awt/X11/XWindowPeer.java +++ b/src/solaris/classes/sun/awt/X11/XWindowPeer.java @@ -226,7 +226,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, for (Iterator<Image> 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, } } - 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, * Dumps each icon from the list */ static void dumpIcons(java.util.List<XIconInfo> icons) { - if (iconLog.isLoggable(PlatformLogger.FINEST)) { + if (iconLog.isLoggable(PlatformLogger.Level.FINEST)) { iconLog.finest(">>> Sizes of icon images:"); for (Iterator<XIconInfo> i = icons.iterator(); i.hasNext(); ) { iconLog.finest(" {0}", i.next()); @@ -667,7 +667,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, } } 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, // 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, } 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, @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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, // 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, // 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, // 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,14 +2213,14 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, // 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())); } } 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 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, } } 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())); diff --git a/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java b/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java index ffb920b636..4e1c816fd1 100644 --- a/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java +++ b/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java @@ -324,7 +324,7 @@ public class X11GraphicsEnvironment // pRunningXinerama() simply returns a global boolean variable, // so there is no need to synchronize here xinerState = Boolean.valueOf(pRunningXinerama()); - if (screenLog.isLoggable(PlatformLogger.FINER)) { + if (screenLog.isLoggable(PlatformLogger.Level.FINER)) { screenLog.finer("Running Xinerama: " + xinerState); } } @@ -408,7 +408,7 @@ public class X11GraphicsEnvironment (unionRect.width / 2) + unionRect.x < center.x + 1 && (unionRect.height / 2) + unionRect.y < center.y + 1) { - if (screenLog.isLoggable(PlatformLogger.FINER)) { + if (screenLog.isLoggable(PlatformLogger.Level.FINER)) { screenLog.finer("Video Wall: center point is at center of all displays."); } return unionRect; @@ -416,7 +416,7 @@ public class X11GraphicsEnvironment // next, check if at center of one monitor if (centerMonitorRect != null) { - if (screenLog.isLoggable(PlatformLogger.FINER)) { + if (screenLog.isLoggable(PlatformLogger.Level.FINER)) { screenLog.finer("Center point at center of a particular " + "monitor, but not of the entire virtual display."); } @@ -424,7 +424,7 @@ public class X11GraphicsEnvironment } // otherwise, the center is at some weird spot: return unionRect - if (screenLog.isLoggable(PlatformLogger.FINER)) { + if (screenLog.isLoggable(PlatformLogger.Level.FINER)) { screenLog.finer("Center point is somewhere strange - return union of all bounds."); } return unionRect; diff --git a/src/solaris/classes/sun/awt/X11InputMethod.java b/src/solaris/classes/sun/awt/X11InputMethod.java index eb88cbd6cf..61e9869219 100644 --- a/src/solaris/classes/sun/awt/X11InputMethod.java +++ b/src/solaris/classes/sun/awt/X11InputMethod.java @@ -326,7 +326,7 @@ public abstract class X11InputMethod extends InputMethodAdapter { return; if (lastXICFocussedComponent != null){ - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("XICFocused {0}, AWTFocused {1}", lastXICFocussedComponent, awtFocussedComponent); } |