diff options
| author | mchung <none@none> | 2009-09-29 16:03:03 -0700 |
|---|---|---|
| committer | mchung <none@none> | 2009-09-29 16:03:03 -0700 |
| commit | ae106b81b46d4e003648bb17da94f7c437a52c34 (patch) | |
| tree | 75efe1c847547b27a61d80ef433ebcc92525435a /src/solaris/classes | |
| parent | 9a4607cb9ffe8f9d4d2e8f03079ca9f42112f1d3 (diff) | |
| download | jdk8u_jdk-ae106b81b46d4e003648bb17da94f7c437a52c34.tar.gz | |
6879044: Eliminate the dependency on logging from the AWT/2D/Swing classes
Summary: Replace calls to Logger with sun.util.logging.PlatformLogger
Reviewed-by: prr, art, alexp, dcherepanov, igor, dav, anthony
Diffstat (limited to 'src/solaris/classes')
60 files changed, 564 insertions, 593 deletions
diff --git a/src/solaris/classes/sun/awt/X11/InfoWindow.java b/src/solaris/classes/sun/awt/X11/InfoWindow.java index ea485b2be9..d0abaa0a97 100644 --- a/src/solaris/classes/sun/awt/X11/InfoWindow.java +++ b/src/solaris/classes/sun/awt/X11/InfoWindow.java @@ -31,8 +31,6 @@ import java.awt.peer.TrayIconPeer; import sun.awt.*; import java.awt.image.*; import java.text.BreakIterator; -import java.util.logging.Logger; -import java.util.logging.Level; import java.util.concurrent.ArrayBlockingQueue; import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/src/solaris/classes/sun/awt/X11/ListHelper.java b/src/solaris/classes/sun/awt/X11/ListHelper.java index 3291b1e510..38e94e0f3a 100644 --- a/src/solaris/classes/sun/awt/X11/ListHelper.java +++ b/src/solaris/classes/sun/awt/X11/ListHelper.java @@ -33,7 +33,7 @@ import java.util.List; import java.util.ArrayList; import java.util.Iterator; import sun.awt.motif.X11FontMetrics; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; // FIXME: implement multi-select /* @@ -43,7 +43,7 @@ import java.util.logging.*; * posting of Item or ActionEvents */ public class ListHelper implements XScrollbarClient { - private static final Logger log = Logger.getLogger("sun.awt.X11.ListHelper"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.ListHelper"); private final int FOCUS_INSET = 1; @@ -263,7 +263,7 @@ public class ListHelper implements XScrollbarClient { } public int y2index(int y) { - if (log.isLoggable(Level.FINE)) { + if (log.isLoggable(PlatformLogger.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 eee63aee4a..fded9dc2fc 100644 --- a/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java +++ b/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java @@ -25,10 +25,10 @@ package sun.awt.X11; import sun.misc.Unsafe; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; class UnsafeXDisposerRecord implements sun.java2d.DisposerRecord { - private static final Logger log = Logger.getLogger("sun.awt.X11.UnsafeXDisposerRecord"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.UnsafeXDisposerRecord"); private static Unsafe unsafe = XlibWrapper.unsafe; final long[] unsafe_ptrs, x_ptrs; final String name; @@ -59,11 +59,11 @@ class UnsafeXDisposerRecord implements sun.java2d.DisposerRecord { XToolkit.awtLock(); try { if (!disposed) { - if (XlibWrapper.isBuildInternal && "Java2D Disposer".equals(Thread.currentThread().getName()) && log.isLoggable(Level.WARNING)) { + if (XlibWrapper.isBuildInternal && "Java2D Disposer".equals(Thread.currentThread().getName()) && log.isLoggable(PlatformLogger.WARNING)) { if (place != null) { - log.log(Level.WARNING, name + " object was not disposed before finalization!", place); + log.warning(name + " object was not disposed before finalization!", place); } else { - log.log(Level.WARNING, name + " object was not disposed before finalization!"); + log.warning(name + " object was not disposed before finalization!"); } } diff --git a/src/solaris/classes/sun/awt/X11/XAWTXSettings.java b/src/solaris/classes/sun/awt/X11/XAWTXSettings.java index e022ae90b8..c2a3d3cfbe 100644 --- a/src/solaris/classes/sun/awt/X11/XAWTXSettings.java +++ b/src/solaris/classes/sun/awt/X11/XAWTXSettings.java @@ -35,15 +35,14 @@ package sun.awt.X11; import java.util.*; import java.awt.*; import sun.awt.XSettings; -import java.util.logging.*; - +import sun.util.logging.PlatformLogger; class XAWTXSettings extends XSettings implements XMSelectionListener { private final XAtom xSettingsPropertyAtom = XAtom.get("_XSETTINGS_SETTINGS"); - private static Logger log = Logger.getLogger("sun.awt.X11.XAWTXSettings"); + private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XAWTXSettings"); /* The maximal length of the property data. */ public static final long MAX_LENGTH = 1000000; @@ -56,7 +55,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { } void initXSettings() { - if (log.isLoggable(Level.FINE)) log.fine("Initializing XAWT XSettings"); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Initializing XAWT XSettings"); settings = new XMSelection("_XSETTINGS"); settings.addSelectionListener(this); initPerScreenXSettings(); @@ -67,12 +66,12 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { } public void ownerDeath(int screen, XMSelection sel, long deadOwner) { - if (log.isLoggable(Level.FINE)) log.fine("Owner " + deadOwner + " died for selection " + sel + " screen "+ screen); + if (log.isLoggable(PlatformLogger.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(Level.FINE)) log.fine("New Owner "+ newOwner + " for selection = " + sel + " screen " +screen ); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("New Owner "+ newOwner + " for selection = " + sel + " screen " +screen ); } public void selectionChanged(int screen, XMSelection sel, long owner , XPropertyEvent event) { @@ -81,7 +80,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { } void initPerScreenXSettings() { - if (log.isLoggable(Level.FINE)) log.fine("Updating Per XSettings changes"); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Updating Per XSettings changes"); /* * As toolkit cannot yet cope with per-screen desktop properties, @@ -115,7 +114,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { } private Map getUpdatedSettings(final long owner) { - if (log.isLoggable(Level.FINE)) log.fine("owner =" + owner); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("owner =" + owner); if (0 == owner) { return null; } @@ -129,13 +128,13 @@ class XAWTXSettings extends XSettings implements XMSelectionListener { int status = getter.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance()); if (status != XConstants.Success || getter.getData() == 0) { - if (log.isLoggable(Level.FINE)) log.fine("OH OH : getter failed status = " + status ); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("OH OH : getter failed status = " + status ); settings = null; } long ptr = getter.getData(); - if (log.isLoggable(Level.FINE)) log.fine("noItems = " + getter.getNumberOfItems()); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("noItems = " + getter.getNumberOfItems()); byte array[] = Native.toBytes(ptr,getter.getNumberOfItems()); if (array != null) { settings = update(array); diff --git a/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java b/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java index 1655be61ec..f53d68dc7a 100644 --- a/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java +++ b/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java @@ -33,7 +33,7 @@ import sun.awt.*; import java.util.ArrayList; import java.util.Vector; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; import sun.java2d.SurfaceData; import sun.java2d.SunGraphics2D; @@ -49,7 +49,7 @@ abstract public class XBaseMenuWindow extends XWindow { * ************************************************/ - private static Logger log = Logger.getLogger("sun.awt.X11.XBaseMenuWindow"); + private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XBaseMenuWindow"); /* * Colors are calculated using MotifColorUtilities class @@ -330,7 +330,7 @@ abstract public class XBaseMenuWindow extends XWindow { items.add(mp); } } else { - if (log.isLoggable(Level.FINE)) { + if (log.isLoggable(PlatformLogger.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(Level.FINE)) { + if (log.isLoggable(PlatformLogger.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(Level.FINEST)) { + if (log.isLoggable(PlatformLogger.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(Level.FINER)) { + if (log.isLoggable(PlatformLogger.FINER)) { 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(Level.FINER)) log.finer(event.toString()); + if (log.isLoggable(PlatformLogger.FINER)) log.finer(event.toString()); if (event.getID() != KeyEvent.KEY_PRESSED) { return; } diff --git a/src/solaris/classes/sun/awt/X11/XBaseWindow.java b/src/solaris/classes/sun/awt/X11/XBaseWindow.java index 095f36c5ef..e531583f25 100644 --- a/src/solaris/classes/sun/awt/X11/XBaseWindow.java +++ b/src/solaris/classes/sun/awt/X11/XBaseWindow.java @@ -27,15 +27,15 @@ package sun.awt.X11; import java.awt.*; import sun.awt.*; -import java.util.logging.*; import java.util.*; +import sun.util.logging.PlatformLogger; public class XBaseWindow { - private static final Logger log = Logger.getLogger("sun.awt.X11.XBaseWindow"); - private static final Logger insLog = Logger.getLogger("sun.awt.X11.insets.XBaseWindow"); - private static final Logger eventLog = Logger.getLogger("sun.awt.X11.event.XBaseWindow"); - private static final Logger focusLog = Logger.getLogger("sun.awt.X11.focus.XBaseWindow"); - private static final Logger grabLog = Logger.getLogger("sun.awt.X11.grab.XBaseWindow"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XBaseWindow"); + private static final PlatformLogger insLog = PlatformLogger.getLogger("sun.awt.X11.insets.XBaseWindow"); + private static final PlatformLogger eventLog = PlatformLogger.getLogger("sun.awt.X11.event.XBaseWindow"); + private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.awt.X11.focus.XBaseWindow"); + private static final PlatformLogger grabLog = PlatformLogger.getLogger("sun.awt.X11.grab.XBaseWindow"); public static final String PARENT_WINDOW = "parent window", // parent window, Long @@ -160,7 +160,7 @@ public class XBaseWindow { * with class-specific values and perform post-initialization actions. */ void postInit(XCreateWindowParams params) { - if (log.isLoggable(Level.FINE)) log.fine("WM name is " + getWMName()); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("WM name is " + getWMName()); updateWMName(); // Set WM_CLIENT_LEADER property @@ -198,7 +198,7 @@ public class XBaseWindow { awtUnlock(); throw re; } catch (Throwable t) { - log.log(Level.WARNING, "Exception during peer initialization", t); + log.warning("Exception during peer initialization", t); awtLock(); initialising = InitialiseState.FAILED_INITIALISATION; awtLockNotifyAll(); @@ -360,7 +360,7 @@ public class XBaseWindow { value_mask |= XConstants.CWBitGravity; } - if (log.isLoggable(Level.FINE)) { + if (log.isLoggable(PlatformLogger.FINE)) { log.fine("Creating window for " + this + " with the following attributes: \n" + params); } window = XlibWrapper.XCreateWindow(XToolkit.getDisplay(), @@ -480,7 +480,7 @@ public class XBaseWindow { } public void setSizeHints(long flags, int x, int y, int width, int height) { - if (insLog.isLoggable(Level.FINER)) insLog.finer("Setting hints, flags " + XlibWrapper.hintsToString(flags)); + if (insLog.isLoggable(PlatformLogger.FINER)) insLog.finer("Setting hints, flags " + XlibWrapper.hintsToString(flags)); XToolkit.awtLock(); try { XSizeHints hints = getHints(); @@ -541,7 +541,7 @@ public class XBaseWindow { flags |= XUtilConstants.PWinGravity; hints.set_flags(flags); hints.set_win_gravity((int)XConstants.NorthWestGravity); - if (insLog.isLoggable(Level.FINER)) insLog.finer("Setting hints, resulted flags " + XlibWrapper.hintsToString(flags) + + if (insLog.isLoggable(PlatformLogger.FINER)) insLog.finer("Setting hints, resulted flags " + XlibWrapper.hintsToString(flags) + ", values " + hints); XlibWrapper.XSetWMNormalHints(XToolkit.getDisplay(), getWindow(), hints.pData); } finally { @@ -593,7 +593,7 @@ public class XBaseWindow { public void xRequestFocus(long time) { XToolkit.awtLock(); try { - if (focusLog.isLoggable(Level.FINER)) focusLog.finer("XSetInputFocus on " + Long.toHexString(getWindow()) + " with time " + time); + if (focusLog.isLoggable(PlatformLogger.FINER)) focusLog.finer("XSetInputFocus on " + Long.toHexString(getWindow()) + " with time " + time); XlibWrapper.XSetInputFocus2(XToolkit.getDisplay(), getWindow(), time); } finally { XToolkit.awtUnlock(); @@ -602,7 +602,7 @@ public class XBaseWindow { public void xRequestFocus() { XToolkit.awtLock(); try { - if (focusLog.isLoggable(Level.FINER)) focusLog.finer("XSetInputFocus on " + Long.toHexString(getWindow())); + if (focusLog.isLoggable(PlatformLogger.FINER)) focusLog.finer("XSetInputFocus on " + Long.toHexString(getWindow())); XlibWrapper.XSetInputFocus(XToolkit.getDisplay(), getWindow()); } finally { XToolkit.awtUnlock(); @@ -619,7 +619,7 @@ public class XBaseWindow { } public void xSetVisible(boolean visible) { - if (log.isLoggable(Level.FINE)) log.fine("Setting visible on " + this + " to " + visible); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Setting visible on " + this + " to " + visible); XToolkit.awtLock(); try { this.visible = visible; @@ -824,7 +824,7 @@ public class XBaseWindow { * The active grab overrides activated automatic grab. */ public boolean grabInput() { - grabLog.log(Level.FINE, "Grab input on {0}", new Object[] {this}); + grabLog.fine("Grab input on {0}", this); XToolkit.awtLock(); try { @@ -887,7 +887,7 @@ public class XBaseWindow { XToolkit.awtLock(); try { XBaseWindow grabWindow = XAwtState.getGrabWindow(); - grabLog.log(Level.FINE, "UnGrab input on {0}", new Object[] {grabWindow}); + grabLog.fine("UnGrab input on {0}", grabWindow); if (grabWindow != null) { grabWindow.ungrabInputImpl(); if (!XToolkit.getSunAwtDisableGrab()) { @@ -929,7 +929,7 @@ public class XBaseWindow { mapped = false; } public void handleReparentNotifyEvent(XEvent xev) { - if (eventLog.isLoggable(Level.FINER)) { + if (eventLog.isLoggable(PlatformLogger.FINER)) { XReparentEvent msg = xev.get_xreparent(); eventLog.finer(msg.toString()); } @@ -939,8 +939,8 @@ public class XBaseWindow { if (XPropertyCache.isCachingSupported()) { XPropertyCache.clearCache(window, XAtom.get(msg.get_atom())); } - if (eventLog.isLoggable(Level.FINER)) { - eventLog.log(Level.FINER, "{0}", new Object[] {msg}); + if (eventLog.isLoggable(PlatformLogger.FINER)) { + eventLog.finer("{0}", msg); } } @@ -969,7 +969,7 @@ public class XBaseWindow { } public void handleClientMessage(XEvent xev) { - if (eventLog.isLoggable(Level.FINER)) { + if (eventLog.isLoggable(PlatformLogger.FINER)) { XClientMessageEvent msg = xev.get_xclient(); eventLog.finer(msg.toString()); } @@ -1021,8 +1021,7 @@ public class XBaseWindow { } public void handleConfigureNotifyEvent(XEvent xev) { XConfigureEvent xe = xev.get_xconfigure(); - insLog.log(Level.FINER, "Configure, {0}", - new Object[] {xe}); + insLog.finer("Configure, {0}", xe); x = xe.get_x(); y = xe.get_y(); width = xe.get_width(); @@ -1073,7 +1072,7 @@ public class XBaseWindow { } public void dispatchEvent(XEvent xev) { - if (eventLog.isLoggable(Level.FINEST)) eventLog.finest(xev.toString()); + if (eventLog.isLoggable(PlatformLogger.FINEST)) eventLog.finest(xev.toString()); int type = xev.get_type(); if (isDisposed()) { diff --git a/src/solaris/classes/sun/awt/X11/XCheckboxMenuItemPeer.java b/src/solaris/classes/sun/awt/X11/XCheckboxMenuItemPeer.java index f2e1ef6f04..b54dfbd9ec 100644 --- a/src/solaris/classes/sun/awt/X11/XCheckboxMenuItemPeer.java +++ b/src/solaris/classes/sun/awt/X11/XCheckboxMenuItemPeer.java @@ -29,8 +29,6 @@ import java.awt.*; import java.awt.peer.*; import java.awt.event.*; -import java.util.logging.*; - import java.lang.reflect.Field; import sun.awt.SunToolkit; @@ -42,8 +40,6 @@ class XCheckboxMenuItemPeer extends XMenuItemPeer implements CheckboxMenuItemPee * ************************************************/ - private static Logger log = Logger.getLogger("sun.awt.X11.XCheckboxMenuItemPeer"); - /* * CheckboxMenuItem's fields */ diff --git a/src/solaris/classes/sun/awt/X11/XCheckboxPeer.java b/src/solaris/classes/sun/awt/X11/XCheckboxPeer.java index 4f57de624b..f819d45c1d 100644 --- a/src/solaris/classes/sun/awt/X11/XCheckboxPeer.java +++ b/src/solaris/classes/sun/awt/X11/XCheckboxPeer.java @@ -32,11 +32,11 @@ import java.awt.image.BufferedImage; import javax.swing.plaf.basic.BasicGraphicsUtils; import java.awt.geom.AffineTransform; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; class XCheckboxPeer extends XComponentPeer implements CheckboxPeer { - private static final Logger log = Logger.getLogger("sun.awt.X11.XCheckboxPeer"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XCheckboxPeer"); private static final Insets focusInsets = new Insets(0,0,0,0); private static final Insets borderInsets = new Insets(2,2,2,2); @@ -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(Level.FINER)) { + if (log.isLoggable(PlatformLogger.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(Level.FINER)) { + if (log.isLoggable(PlatformLogger.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(Level.FINER)) { + if (log.isLoggable(PlatformLogger.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(Level.FINER)) { + if (log.isLoggable(PlatformLogger.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 510d75e867..4e84d39bba 100644 --- a/src/solaris/classes/sun/awt/X11/XChoicePeer.java +++ b/src/solaris/classes/sun/awt/X11/XChoicePeer.java @@ -28,7 +28,7 @@ package sun.awt.X11; import java.awt.*; import java.awt.peer.*; import java.awt.event.*; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; // FIXME: tab traversal should be disabled when mouse is captured (4816336) @@ -43,7 +43,7 @@ import java.util.logging.*; // TODO: make painting more efficient (i.e. when down arrow is pressed, only two items should need to be repainted. public class XChoicePeer extends XComponentPeer implements ChoicePeer, ToplevelStateListener { - private static final Logger log = Logger.getLogger("sun.awt.X11.XChoicePeer"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XChoicePeer"); private static final int MAX_UNFURLED_ITEMS = 10; // Maximum number of // items to be displayed @@ -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(Level.FINE)) { + if (log.isLoggable(PlatformLogger.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 cb842d4d64..a0ca6efb43 100644 --- a/src/solaris/classes/sun/awt/X11/XComponentPeer.java +++ b/src/solaris/classes/sun/awt/X11/XComponentPeer.java @@ -66,7 +66,8 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; import java.util.Vector; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; + import sun.awt.*; import sun.awt.event.IgnorePaintEvent; import sun.awt.image.SunVolatileImage; @@ -77,12 +78,12 @@ import sun.java2d.pipe.Region; public class XComponentPeer extends XWindow implements ComponentPeer, DropTargetPeer, BackBufferCapsProvider { - private static final Logger log = Logger.getLogger("sun.awt.X11.XComponentPeer"); - private static final Logger buffersLog = Logger.getLogger("sun.awt.X11.XComponentPeer.multibuffer"); - private static final Logger focusLog = Logger.getLogger("sun.awt.X11.focus.XComponentPeer"); - private static final Logger fontLog = Logger.getLogger("sun.awt.X11.font.XComponentPeer"); - private static final Logger enableLog = Logger.getLogger("sun.awt.X11.enable.XComponentPeer"); - private static final Logger shapeLog = Logger.getLogger("sun.awt.X11.shape.XComponentPeer"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XComponentPeer"); + private static final PlatformLogger buffersLog = PlatformLogger.getLogger("sun.awt.X11.XComponentPeer.multibuffer"); + private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.awt.X11.focus.XComponentPeer"); + private static final PlatformLogger fontLog = PlatformLogger.getLogger("sun.awt.X11.font.XComponentPeer"); + private static final PlatformLogger enableLog = PlatformLogger.getLogger("sun.awt.X11.enable.XComponentPeer"); + private static final PlatformLogger shapeLog = PlatformLogger.getLogger("sun.awt.X11.shape.XComponentPeer"); boolean paintPending = false; boolean isLayouting = false; @@ -159,7 +160,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget break; } } - enableLog.log(Level.FINE, "Initial enable state: {0}", new Object[] {Boolean.valueOf(enabled)}); + enableLog.fine("Initial enable state: {0}", Boolean.valueOf(enabled)); if (target.isVisible()) { setVisible(true); @@ -253,7 +254,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget * Called when component receives focus */ public void focusGained(FocusEvent e) { - focusLog.log(Level.FINE, "{0}", new Object[] {e}); + focusLog.fine("{0}", e); bHasFocus = true; } @@ -261,7 +262,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget * Called when component loses focus */ public void focusLost(FocusEvent e) { - focusLog.log(Level.FINE, "{0}", new Object[] {e}); + focusLog.fine("{0}", e); bHasFocus = false; } @@ -333,7 +334,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(Level.FINER)) focusLog.finer("Proceeding with request to " + + if (focusLog.isLoggable(PlatformLogger.FINER)) focusLog.finer("Proceeding with request to " + lightweightChild + " in " + target); /** * The problems with requests in non-focused window arise because shouldNativelyFocusHeavyweight @@ -358,7 +359,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget */ boolean res = wpeer.requestWindowFocus(null); - if (focusLog.isLoggable(Level.FINER)) focusLog.finer("Requested window focus: " + res); + if (focusLog.isLoggable(PlatformLogger.FINER)) focusLog.finer("Requested window focus: " + res); // If parent window can be made focused and has been made focused(synchronously) // then we can proceed with children, otherwise we retreat. if (!(res && parentWindow.isFocused())) { @@ -378,13 +379,13 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget } private boolean rejectFocusRequestHelper(String logMsg) { - if (focusLog.isLoggable(Level.FINER)) focusLog.finer(logMsg); + if (focusLog.isLoggable(PlatformLogger.FINER)) focusLog.finer(logMsg); XKeyboardFocusManagerPeer.removeLastFocusRequest(target); return false; } void handleJavaFocusEvent(AWTEvent e) { - if (focusLog.isLoggable(Level.FINER)) focusLog.finer(e.toString()); + if (focusLog.isLoggable(PlatformLogger.FINER)) focusLog.finer(e.toString()); if (e.getID() == FocusEvent.FOCUS_GAINED) { focusGained((FocusEvent)e); } else { @@ -414,7 +415,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget * @see java.awt.peer.ComponentPeer */ public void setEnabled(boolean value) { - enableLog.log(Level.FINE, "{0}ing {1}", new Object[] {(value?"Enabl":"Disabl"), this}); + enableLog.fine("{0}ing {1}", (value?"Enabl":"Disabl"), this); boolean repaintNeeded = (enabled != value); enabled = value; if (target instanceof Container) { @@ -690,7 +691,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget } public void setBackground(Color c) { - if (log.isLoggable(Level.FINE)) log.fine("Set background to " + c); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Set background to " + c); synchronized (getStateLock()) { background = c; } @@ -699,7 +700,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget } public void setForeground(Color c) { - if (log.isLoggable(Level.FINE)) log.fine("Set foreground to " + c); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Set foreground to " + c); synchronized (getStateLock()) { foreground = c; } @@ -718,7 +719,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget * @since JDK1.0 */ public FontMetrics getFontMetrics(Font font) { - if (fontLog.isLoggable(Level.FINE)) fontLog.fine("Getting font metrics for " + font); + if (fontLog.isLoggable(PlatformLogger.FINE)) fontLog.fine("Getting font metrics for " + font); return sun.font.FontDesignMetrics.getMetrics(font); } @@ -1188,7 +1189,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget public void createBuffers(int numBuffers, BufferCapabilities caps) throws AWTException { - if (buffersLog.isLoggable(Level.FINE)) { + if (buffersLog.isLoggable(PlatformLogger.FINE)) { buffersLog.fine("createBuffers(" + numBuffers + ", " + caps + ")"); } // set the caps first, they're used when creating the bb @@ -1206,7 +1207,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(Level.FINE)) { + if (buffersLog.isLoggable(PlatformLogger.FINE)) { buffersLog.fine("flip(" + flipAction + ")"); } if (backBuffer == 0) { @@ -1217,7 +1218,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget } public Image getBackBuffer() { - if (buffersLog.isLoggable(Level.FINE)) { + if (buffersLog.isLoggable(PlatformLogger.FINE)) { buffersLog.fine("getBackBuffer()"); } if (backBuffer == 0) { @@ -1227,7 +1228,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget } public void destroyBuffers() { - if (buffersLog.isLoggable(Level.FINE)) { + if (buffersLog.isLoggable(PlatformLogger.FINE)) { buffersLog.fine("destroyBuffers()"); } graphicsConfig.destroyBackBuffer(backBuffer); @@ -1262,7 +1263,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget * ButtonPress, ButtonRelease, KeyPress, KeyRelease, EnterNotify, LeaveNotify, MotionNotify */ protected boolean isEventDisabled(XEvent e) { - enableLog.log(Level.FINEST, "Component is {1}, checking for disabled event {0}", new Object[] {e, (isEnabled()?"enabled":"disable")}); + enableLog.finest("Component is {1}, checking for disabled event {0}", e, (isEnabled()?"enabled":"disable")); if (!isEnabled()) { switch (e.get_type()) { case XConstants.ButtonPress: @@ -1272,7 +1273,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget case XConstants.EnterNotify: case XConstants.LeaveNotify: case XConstants.MotionNotify: - enableLog.log(Level.FINER, "Event {0} is disable", new Object[] {e}); + enableLog.finer("Event {0} is disable", e); return true; } } @@ -1393,7 +1394,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget */ public void applyShape(Region shape) { if (XlibUtil.isShapingSupported()) { - if (shapeLog.isLoggable(Level.FINER)) { + if (shapeLog.isLoggable(PlatformLogger.FINER)) { shapeLog.finer( "*** INFO: Setting shape: PEER: " + this + "; WINDOW: " + getWindow() @@ -1423,7 +1424,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget XToolkit.awtUnlock(); } } else { - if (shapeLog.isLoggable(Level.FINER)) { + if (shapeLog.isLoggable(PlatformLogger.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 6a32fe9bdc..0c4cf626e0 100644 --- a/src/solaris/classes/sun/awt/X11/XContentWindow.java +++ b/src/solaris/classes/sun/awt/X11/XContentWindow.java @@ -30,8 +30,7 @@ import java.awt.Insets; import java.awt.event.ComponentEvent; -import java.util.logging.Level; -import java.util.logging.Logger; +import sun.util.logging.PlatformLogger; import sun.awt.ComponentAccessor; @@ -44,7 +43,7 @@ import sun.awt.ComponentAccessor; * decorated window. So coordinates in it would be the same as java coordinates. */ public final class XContentWindow extends XWindow { - private static Logger insLog = Logger.getLogger("sun.awt.X11.insets.XContentWindow"); + private static PlatformLogger insLog = PlatformLogger.getLogger("sun.awt.X11.insets.XContentWindow"); static XContentWindow createContent(XDecoratedPeer parentFrame) { final WindowDimensions dims = parentFrame.getDimensions(); @@ -116,8 +115,8 @@ public final class XContentWindow extends XWindow { if (in != null) { newBounds.setLocation(-in.left, -in.top); } - if (insLog.isLoggable(Level.FINE)) insLog.log(Level.FINE, "Setting content bounds {0}, old bounds {1}", - new Object[] {newBounds, getBounds()}); + if (insLog.isLoggable(PlatformLogger.FINE)) insLog.fine("Setting content bounds {0}, old bounds {1}", + newBounds, getBounds()); // Fix for 5023533: // Change in the size of the content window means, well, change of the size // Change in the location of the content window means change in insets diff --git a/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java b/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java index 417cd3b006..a855ade046 100644 --- a/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java +++ b/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java @@ -30,17 +30,16 @@ import java.awt.event.ComponentEvent; import java.awt.event.InvocationEvent; import java.awt.event.WindowEvent; -import java.util.logging.Level; -import java.util.logging.Logger; +import sun.util.logging.PlatformLogger; import sun.awt.ComponentAccessor; import sun.awt.SunToolkit; abstract class XDecoratedPeer extends XWindowPeer { - private static final Logger log = Logger.getLogger("sun.awt.X11.XDecoratedPeer"); - private static final Logger insLog = Logger.getLogger("sun.awt.X11.insets.XDecoratedPeer"); - private static final Logger focusLog = Logger.getLogger("sun.awt.X11.focus.XDecoratedPeer"); - private static final Logger iconLog = Logger.getLogger("sun.awt.X11.icon.XDecoratedPeer"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XDecoratedPeer"); + private static final PlatformLogger insLog = PlatformLogger.getLogger("sun.awt.X11.insets.XDecoratedPeer"); + private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.awt.X11.focus.XDecoratedPeer"); + private static final PlatformLogger iconLog = PlatformLogger.getLogger("sun.awt.X11.icon.XDecoratedPeer"); // Set to true when we get the first ConfigureNotify after being // reparented - indicates that WM has adopted the top-level. @@ -79,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()); - insLog.log(Level.FINE, "Initial dimensions {0}", new Object[] { dimensions }); + insLog.fine("Initial dimensions {0}", dimensions); // Deny default processing of these events on the shell - proxy will take care of // them instead @@ -175,7 +174,7 @@ abstract class XDecoratedPeer extends XWindowPeer { } public void setTitle(String title) { - if (log.isLoggable(Level.FINE)) log.fine("Title is " + title); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Title is " + title); winAttr.title = title; updateWMName(); } @@ -265,7 +264,7 @@ abstract class XDecoratedPeer extends XWindowPeer { wm_set_insets = XWM.getInsetsFromProp(getWindow(), changedAtom); } - insLog.log(Level.FINER, "FRAME_EXTENTS: {0}", new Object[]{wm_set_insets}); + insLog.finer("FRAME_EXTENTS: {0}", wm_set_insets); if (wm_set_insets != null) { wm_set_insets = copy(wm_set_insets); @@ -292,7 +291,7 @@ abstract class XDecoratedPeer extends XWindowPeer { public void handleReparentNotifyEvent(XEvent xev) { XReparentEvent xe = xev.get_xreparent(); - if (insLog.isLoggable(Level.FINE)) insLog.fine(xe.toString()); + if (insLog.isLoggable(PlatformLogger.FINE)) insLog.fine(xe.toString()); reparent_serial = xe.get_serial(); XToolkit.awtLock(); try { @@ -331,7 +330,7 @@ abstract class XDecoratedPeer extends XWindowPeer { // Check if we have insets provided by the WM Insets correctWM = getWMSetInsets(null); if (correctWM != null) { - insLog.log(Level.FINER, "wm-provided insets {0}", new Object[]{correctWM}); + insLog.finer("wm-provided insets {0}", correctWM); // If these insets are equal to our current insets - no actions are necessary Insets dimInsets = dimensions.getInsets(); if (correctWM.equals(dimInsets)) { @@ -345,9 +344,9 @@ abstract class XDecoratedPeer extends XWindowPeer { correctWM = XWM.getWM().getInsets(this, xe.get_window(), xe.get_parent()); if (correctWM != null) { - insLog.log(Level.FINER, "correctWM {0}", new Object[] {correctWM}); + insLog.finer("correctWM {0}", correctWM); } else { - insLog.log(Level.FINER, "correctWM insets are not available, waiting for configureNotify"); + insLog.finer("correctWM insets are not available, waiting for configureNotify"); } } @@ -368,7 +367,7 @@ abstract class XDecoratedPeer extends XWindowPeer { * initial insets were wrong (most likely they were). */ Insets correction = difference(correctWM, currentInsets); - insLog.log(Level.FINEST, "Corrention {0}", new Object[] {correction}); + insLog.finest("Corrention {0}", correction); if (!isNull(correction)) { currentInsets = copy(correctWM); applyGuessedInsets(); @@ -378,7 +377,7 @@ abstract class XDecoratedPeer extends XWindowPeer { //update minimum size hints updateMinSizeHints(); } - if (insLog.isLoggable(Level.FINER)) insLog.finer("Dimensions before reparent: " + dimensions); + if (insLog.isLoggable(PlatformLogger.FINER)) insLog.finer("Dimensions before reparent: " + dimensions); dimensions.setInsets(getRealInsets()); insets_corrected = true; @@ -452,8 +451,8 @@ abstract class XDecoratedPeer extends XWindowPeer { public Insets getInsets() { Insets in = copy(getRealInsets()); in.top += getMenuBarHeight(); - if (insLog.isLoggable(Level.FINEST)) { - insLog.log(Level.FINEST, "Get insets returns {0}", new Object[] {in}); + if (insLog.isLoggable(PlatformLogger.FINEST)) { + insLog.finest("Get insets returns {0}", in); } return in; } @@ -482,7 +481,7 @@ abstract class XDecoratedPeer extends XWindowPeer { public void reshape(WindowDimensions newDimensions, int op, boolean userReshape) { - if (insLog.isLoggable(Level.FINE)) { + if (insLog.isLoggable(PlatformLogger.FINE)) { insLog.fine("Reshaping " + this + " to " + newDimensions + " op " + op + " user reshape " + userReshape); } if (userReshape) { @@ -503,8 +502,8 @@ abstract class XDecoratedPeer extends XWindowPeer { XToolkit.awtLock(); try { if (!isReparented() || !isVisible()) { - insLog.log(Level.FINE, "- not reparented({0}) or not visible({1}), default reshape", - new Object[] {Boolean.valueOf(isReparented()), Boolean.valueOf(visible)}); + insLog.fine("- not reparented({0}) or not visible({1}), default reshape", + Boolean.valueOf(isReparented()), Boolean.valueOf(visible)); // Fix for 6323293. // This actually is needed to preserve compatibility with previous releases - @@ -609,8 +608,9 @@ abstract class XDecoratedPeer extends XWindowPeer { dims.setSize(width, height); break; } - if (insLog.isLoggable(Level.FINE)) insLog.log(Level.FINE, "For the operation {0} new dimensions are {1}", - new Object[] {operationToString(operation), dims}); + if (insLog.isLoggable(PlatformLogger.FINE)) + insLog.fine("For the operation {0} new dimensions are {1}", + operationToString(operation), dims); reshape(dims, operation, userReshape); } @@ -640,7 +640,7 @@ abstract class XDecoratedPeer extends XWindowPeer { public void handleConfigureNotifyEvent(XEvent xev) { assert (SunToolkit.isAWTLockHeldByCurrentThread()); XConfigureEvent xe = xev.get_xconfigure(); - insLog.log(Level.FINE, "Configure notify {0}", new Object[] {xe}); + insLog.fine("Configure notify {0}", xe); // XXX: should really only consider synthetic events, but if (isReparented()) { @@ -677,9 +677,9 @@ abstract class XDecoratedPeer extends XWindowPeer { * it!!!! or we wind up in a bogus location. */ int runningWM = XWM.getWMID(); - if (insLog.isLoggable(Level.FINE)) { - insLog.log(Level.FINE, "reparented={0}, visible={1}, WM={2}, decorations={3}", - new Object[] {isReparented(), isVisible(), runningWM, getDecorations()}); + if (insLog.isLoggable(PlatformLogger.FINE)) { + insLog.fine("reparented={0}, visible={1}, WM={2}, decorations={3}", + isReparented(), isVisible(), runningWM, getDecorations()); } if (!isReparented() && isVisible() && runningWM != XWM.NO_WM && !XWM.isNonReparentingWM() @@ -691,7 +691,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(Level.FINER)) { + if (insLog.isLoggable(PlatformLogger.FINER)) { if (correctWM != null) { insLog.finer("Configure notify - insets : " + correctWM); } else { @@ -732,7 +732,7 @@ abstract class XDecoratedPeer extends XWindowPeer { case XWM.SAWFISH_WM: { Point xlocation = queryXLocation(); - if (log.isLoggable(Level.FINE)) log.log(Level.FINE, "New X location: {0}", new Object[]{xlocation}); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("New X location: {0}", xlocation); if (xlocation != null) { newLocation = xlocation; } @@ -749,8 +749,8 @@ abstract class XDecoratedPeer extends XWindowPeer { copy(currentInsets), true); - insLog.log(Level.FINER, "Insets are {0}, new dimensions {1}", - new Object[] {currentInsets, newDimensions}); + insLog.finer("Insets are {0}, new dimensions {1}", + currentInsets, newDimensions); checkIfOnNewScreen(newDimensions.getBounds()); @@ -789,8 +789,8 @@ abstract class XDecoratedPeer extends XWindowPeer { } public void setShellBounds(Rectangle rec) { - if (insLog.isLoggable(Level.FINE)) insLog.fine("Setting shell bounds on " + - this + " to " + rec); + if (insLog.isLoggable(PlatformLogger.FINE)) insLog.fine("Setting shell bounds on " + + this + " to " + rec); XToolkit.awtLock(); try { updateSizeHints(rec.x, rec.y, rec.width, rec.height); @@ -802,8 +802,8 @@ abstract class XDecoratedPeer extends XWindowPeer { } } public void setShellSize(Rectangle rec) { - if (insLog.isLoggable(Level.FINE)) insLog.fine("Setting shell size on " + - this + " to " + rec); + if (insLog.isLoggable(PlatformLogger.FINE)) insLog.fine("Setting shell size on " + + this + " to " + rec); XToolkit.awtLock(); try { updateSizeHints(rec.x, rec.y, rec.width, rec.height); @@ -814,8 +814,8 @@ abstract class XDecoratedPeer extends XWindowPeer { } } public void setShellPosition(Rectangle rec) { - if (insLog.isLoggable(Level.FINE)) insLog.fine("Setting shell position on " + - this + " to " + rec); + if (insLog.isLoggable(PlatformLogger.FINE)) insLog.fine("Setting shell position on " + + this + " to " + rec); XToolkit.awtLock(); try { updateSizeHints(rec.x, rec.y, rec.width, rec.height); @@ -915,9 +915,9 @@ abstract class XDecoratedPeer extends XWindowPeer { return toGlobal(0,0); } else { Point location = target.getLocation(); - if (insLog.isLoggable(Level.FINE)) - insLog.log(Level.FINE, "getLocationOnScreen {0} not reparented: {1} ", - new Object[] {this, location}); + if (insLog.isLoggable(PlatformLogger.FINE)) + insLog.fine("getLocationOnScreen {0} not reparented: {1} ", + this, location); return location; } } finally { @@ -954,7 +954,7 @@ abstract class XDecoratedPeer extends XWindowPeer { } public void setVisible(boolean vis) { - log.log(Level.FINER, "Setting {0} to visible {1}", new Object[] {this, Boolean.valueOf(vis)}); + log.finer("Setting {0} to visible {1}", this, Boolean.valueOf(vis)); if (vis && !isVisible()) { XWM.setShellDecor(this); super.setVisible(vis); @@ -1005,7 +1005,7 @@ abstract class XDecoratedPeer extends XWindowPeer { } private void handleWmTakeFocus(XClientMessageEvent cl) { - focusLog.log(Level.FINE, "WM_TAKE_FOCUS on {0}", new Object[]{this}); + focusLog.fine("WM_TAKE_FOCUS on {0}", this); requestWindowFocus(cl.get_data(1), true); } @@ -1018,9 +1018,9 @@ 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(Level.FINE)) focusLog.warning("Focus proxy is null for " + this); + if (focusLog.isLoggable(PlatformLogger.FINE)) focusLog.warning("Focus proxy is null for " + this); } else { - if (focusLog.isLoggable(Level.FINE)) focusLog.fine("Requesting focus to proxy: " + focusProxy); + if (focusLog.isLoggable(PlatformLogger.FINE)) focusLog.fine("Requesting focus to proxy: " + focusProxy); if (timeProvided) { focusProxy.xRequestFocus(time); } else { @@ -1111,9 +1111,9 @@ abstract class XDecoratedPeer extends XWindowPeer { Window focusedWindow = XKeyboardFocusManagerPeer.getCurrentNativeFocusedWindow(); Window activeWindow = XWindowPeer.getDecoratedOwner(focusedWindow); - focusLog.log(Level.FINER, "Current window is: active={0}, focused={1}", - new Object[]{ Boolean.valueOf(target == activeWindow), - Boolean.valueOf(target == focusedWindow)}); + focusLog.finer("Current window is: active={0}, focused={1}", + Boolean.valueOf(target == activeWindow), + Boolean.valueOf(target == focusedWindow)); XWindowPeer toFocus = this; while (toFocus.nextTransientFor != null) { diff --git a/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java b/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java index d88f95b753..f81e118b51 100644 --- a/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java +++ b/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java @@ -32,7 +32,7 @@ import java.awt.dnd.InvalidDnDOperationException; import java.util.Map; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; import sun.misc.Unsafe; @@ -42,8 +42,8 @@ import sun.misc.Unsafe; * @since 1.5 */ class XDnDDragSourceProtocol extends XDragSourceProtocol { - private static final Logger logger = - Logger.getLogger("sun.awt.X11.xembed.xdnd.XDnDDragSourceProtocol"); + private static final PlatformLogger logger = + PlatformLogger.getLogger("sun.awt.X11.xembed.xdnd.XDnDDragSourceProtocol"); private static final Unsafe unsafe = XlibWrapper.unsafe; @@ -395,7 +395,7 @@ class XDnDDragSourceProtocol extends XDragSourceProtocol { return false; } - if (logger.isLoggable(Level.FINEST)) { + if (logger.isLoggable(PlatformLogger.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 f2ba2dc28e..2a082d4419 100644 --- a/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java +++ b/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java @@ -33,7 +33,7 @@ import java.awt.event.MouseEvent; import java.io.IOException; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; import sun.misc.Unsafe; @@ -43,8 +43,8 @@ import sun.misc.Unsafe; * @since 1.5 */ class XDnDDropTargetProtocol extends XDropTargetProtocol { - private static final Logger logger = - Logger.getLogger("sun.awt.X11.xembed.xdnd.XDnDDropTargetProtocol"); + private static final PlatformLogger logger = + PlatformLogger.getLogger("sun.awt.X11.xembed.xdnd.XDnDDropTargetProtocol"); private static final Unsafe unsafe = XlibWrapper.unsafe; @@ -999,7 +999,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol { if (sourceFormats != null && sourceFormats.length > 3) { data1 |= XDnDConstants.XDND_DATA_TYPES_BIT; } - if (logger.isLoggable(Level.FINEST)) { + if (logger.isLoggable(PlatformLogger.FINEST)) { logger.finest(" " + " entryVersion=" + version + " sourceProtocolVersion=" + @@ -1058,7 +1058,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol { public boolean forwardEventToEmbedded(long embedded, long ctxt, int eventID) { - if (logger.isLoggable(Level.FINEST)) { + if (logger.isLoggable(PlatformLogger.FINEST)) { logger.finest(" ctxt=" + ctxt + " type=" + (ctxt != 0 ? getMessageType(new @@ -1086,7 +1086,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(Level.FINEST)) { + if (logger.isLoggable(PlatformLogger.FINEST)) { logger.finest(" 1 " + " embedded=" + embedded + " source=" + xclient.get_data(0) @@ -1120,7 +1120,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol { if (XToolkit.saved_error != null && XToolkit.saved_error.get_error_code() != XConstants.Success) { - if (logger.isLoggable(Level.WARNING)) { + if (logger.isLoggable(PlatformLogger.WARNING)) { logger.warning("Cannot set XdndTypeList on the proxy window"); } } @@ -1128,7 +1128,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol { XToolkit.awtUnlock(); } } else { - if (logger.isLoggable(Level.WARNING)) { + if (logger.isLoggable(PlatformLogger.WARNING)) { logger.warning("Cannot read XdndTypeList from the source window"); } } @@ -1143,7 +1143,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol { overXEmbedClient = true; } - if (logger.isLoggable(Level.FINEST)) { + if (logger.isLoggable(PlatformLogger.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 4186628c40..5188fe7169 100644 --- a/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java +++ b/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java @@ -37,7 +37,8 @@ import java.awt.dnd.InvalidDnDOperationException; import java.util.*; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; + import sun.awt.ComponentAccessor; import sun.awt.dnd.SunDragSourceContextPeer; @@ -52,8 +53,8 @@ import sun.awt.SunToolkit; */ public final class XDragSourceContextPeer extends SunDragSourceContextPeer implements XDragSourceProtocolListener { - private static final Logger logger = - Logger.getLogger("sun.awt.X11.xembed.xdnd.XDragSourceContextPeer"); + private static final PlatformLogger logger = + PlatformLogger.getLogger("sun.awt.X11.xembed.xdnd.XDragSourceContextPeer"); /* The events selected on the root window when the drag begins. */ private static final int ROOT_EVENT_MASK = (int)XConstants.ButtonMotionMask | @@ -542,7 +543,7 @@ public final class XDragSourceContextPeer return false; } - if (logger.isLoggable(Level.FINEST)) { + if (logger.isLoggable(PlatformLogger.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 efce539bc6..4ffa9e45e5 100644 --- a/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java +++ b/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java @@ -31,7 +31,8 @@ import java.awt.peer.ComponentPeer; import java.io.IOException; import java.util.Iterator; -import java.util.logging.*; + +import sun.util.logging.PlatformLogger; import sun.awt.AppContext; import sun.awt.SunToolkit; @@ -48,8 +49,8 @@ import sun.misc.Unsafe; * @since 1.5 */ final class XDropTargetContextPeer extends SunDropTargetContextPeer { - private static final Logger logger = - Logger.getLogger("sun.awt.X11.xembed.xdnd.XDropTargetContextPeer"); + private static final PlatformLogger logger = + PlatformLogger.getLogger("sun.awt.X11.xembed.xdnd.XDropTargetContextPeer"); private static final Unsafe unsafe = XlibWrapper.unsafe; @@ -198,7 +199,7 @@ final class XDropTargetContextPeer extends SunDropTargetContextPeer { structure. */ long ctxt = getNativeDragContext(); - if (logger.isLoggable(Level.FINER)) { + if (logger.isLoggable(PlatformLogger.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 7a7c7c10ee..2b23873006 100644 --- a/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java +++ b/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java @@ -29,7 +29,7 @@ import java.io.IOException; import java.util.HashMap; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; /** * An abstract class for drop protocols on X11 systems. @@ -38,8 +38,8 @@ import java.util.logging.*; * @since 1.5 */ abstract class XDropTargetProtocol { - private static final Logger logger = - Logger.getLogger("sun.awt.X11.xembed.xdnd.XDropTargetProtocol"); + private static final PlatformLogger logger = + PlatformLogger.getLogger("sun.awt.X11.xembed.xdnd.XDropTargetProtocol"); private final XDropTargetProtocolListener listener; @@ -116,16 +116,16 @@ abstract class XDropTargetProtocol { XClientMessageEvent xclient) { EmbedderRegistryEntry entry = getEmbedderRegistryEntry(toplevel); - if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, " entry={0}", new Object[] {entry}); + if (logger.isLoggable(PlatformLogger.FINEST)) { + logger.finest(" entry={0}", entry); } // Window not registered as an embedder for this protocol. if (entry == null) { return false; } - if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, " entry.isOverriden()={0}", new Object[] {entry.isOverriden()}); + if (logger.isLoggable(PlatformLogger.FINEST)) { + logger.finest(" entry.isOverriden()={0}", entry.isOverriden()); } // Window didn't have an associated drop site, so there is no need // to forward the message. @@ -137,8 +137,8 @@ abstract class XDropTargetProtocol { long proxy = entry.getProxy(); - if (logger.isLoggable(Level.FINEST)) { - logger.log(Level.FINEST, " proxy={0} toplevel={1}", new Object[] {proxy, toplevel}); + if (logger.isLoggable(PlatformLogger.FINEST)) { + logger.finest(" proxy={0} toplevel={1}", proxy, toplevel); } if (proxy == 0) { proxy = toplevel; diff --git a/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java b/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java index 1678d92a6b..509a5e3274 100644 --- a/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java +++ b/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; import java.awt.Point; @@ -42,8 +42,8 @@ import java.awt.Point; * @since 1.5 */ final class XDropTargetRegistry { - private static final Logger logger = - Logger.getLogger("sun.awt.X11.xembed.xdnd.XDropTargetRegistry"); + private static final PlatformLogger logger = + PlatformLogger.getLogger("sun.awt.X11.xembed.xdnd.XDropTargetRegistry"); private static final long DELAYED_REGISTRATION_PERIOD = 200; @@ -614,7 +614,7 @@ final class XDropTargetRegistry { if (info != null && info.getProtocolVersion() >= XDnDConstants.XDND_MIN_PROTOCOL_VERSION) { - if (logger.isLoggable(Level.FINE)) { + if (logger.isLoggable(PlatformLogger.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(Level.FINE)) { + if (logger.isLoggable(PlatformLogger.FINE)) { logger.fine(" XEmbed drop site has been registered for " + Long.toHexString(clientWindow)); } } } public void unregisterXEmbedClient(long canvasWindow, long clientWindow) { - if (logger.isLoggable(Level.FINE)) { + if (logger.isLoggable(PlatformLogger.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(Level.FINE)) { + if (logger.isLoggable(PlatformLogger.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 94d130beb2..53dace5aff 100644 --- a/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java +++ b/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java @@ -37,7 +37,7 @@ import java.awt.peer.*; import sun.awt.*; import sun.awt.motif.X11FontMetrics; import java.lang.reflect.*; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; import java.util.*; import static sun.awt.X11.XEmbedHelper.*; @@ -45,7 +45,7 @@ import java.security.AccessController; import sun.security.action.GetBooleanAction; public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener, KeyEventPostProcessor, ModalityListener, WindowIDProvider { - private static final Logger xembedLog = Logger.getLogger("sun.awt.X11.xembed.XEmbedCanvasPeer"); + private static final PlatformLogger xembedLog = PlatformLogger.getLogger("sun.awt.X11.xembed.XEmbedCanvasPeer"); boolean applicationActive; // Whether the application is active(has focus) XEmbedServer xembed = new XEmbedServer(); // Helper object, contains XEmbed intrinsics @@ -129,7 +129,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener } void initDispatching() { - if (xembedLog.isLoggable(Level.FINE)) xembedLog.fine("Init embedding for " + Long.toHexString(xembed.handle)); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine("Init embedding for " + Long.toHexString(xembed.handle)); XToolkit.awtLock(); try { XToolkit.addEventDispatcher(xembed.handle, xembed); @@ -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(Level.FINEST)) { + if (xembedLog.isLoggable(PlatformLogger.FINEST)) { xembedLog.finest("Message on embedder: " + cr); } - if (xembedLog.isLoggable(Level.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.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(Level.FINEST)) { + if (xembedLog.isLoggable(PlatformLogger.FINEST)) { xembedLog.finest("Message on embedder: " + dn); } - if (xembedLog.isLoggable(Level.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.FINER)) { xembedLog.finer("Destroy notify for parent: " + dn); } childDestroyed(); break; case XConstants.ReparentNotify: XReparentEvent rep = ev.get_xreparent(); - if (xembedLog.isLoggable(Level.FINEST)) { + if (xembedLog.isLoggable(PlatformLogger.FINEST)) { xembedLog.finest("Message on embedder: " + rep); } - if (xembedLog.isLoggable(Level.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.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(Level.FINER)) { + if (xembedLog.isLoggable(PlatformLogger.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(Level.FINE)) xembedLog.fine("Detaching child " + Long.toHexString(xembed.handle)); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine("Detaching child " + Long.toHexString(xembed.handle)); /** * XEmbed specification: * "The embedder can unmap the client and reparent the client window to the root window. If the @@ -477,7 +477,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener try { XKeyEvent ke = new XKeyEvent(data); ke.set_window(xembed.handle); - if (xembedLog.isLoggable(Level.FINE)) xembedLog.fine("Forwarding native key event: " + ke); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine("Forwarding native key event: " + ke); XToolkit.awtLock(); try { XlibWrapper.XSendEvent(XToolkit.getDisplay(), xembed.handle, false, XConstants.NoEventMask, data); @@ -508,7 +508,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(Level.FINE)) xembedLog.fine("Grabbing key: " + grab); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine("Grabbing key: " + grab); synchronized(GRAB_LOCK) { grabbed_keys.add(grab); } @@ -520,7 +520,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(Level.FINE)) xembedLog.fine("UnGrabbing key: " + grab); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine("UnGrabbing key: " + grab); synchronized(GRAB_LOCK) { grabbed_keys.remove(grab); } @@ -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(Level.FINE)) xembedLog.fine("Registering accelerator " + accel_id + " for " + stroke); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine("Registering accelerator " + accel_id + " for " + stroke); synchronized(ACCEL_LOCK) { accelerators.put(accel_id, stroke); accel_lookup.put(stroke, accel_id); @@ -551,7 +551,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener synchronized(ACCEL_LOCK) { stroke = accelerators.get(accel_id); if (stroke != null) { - if (xembedLog.isLoggable(Level.FINE)) xembedLog.fine("Unregistering accelerator: " + accel_id); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine("Unregistering accelerator: " + accel_id); accelerators.remove(accel_id); accel_lookup.remove(stroke); // FIXME: How about several accelerators with the same stroke? } @@ -597,7 +597,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener boolean result = false; - if (xembedLog.isLoggable(Level.FINER)) xembedLog.finer("Post-processing event " + e); + if (xembedLog.isLoggable(PlatformLogger.FINER)) xembedLog.finer("Post-processing event " + e); // Process ACCELERATORS AWTKeyStroke stroke = AWTKeyStroke.getAWTKeyStrokeForEvent(e); @@ -610,7 +610,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener } } if (exists) { - if (xembedLog.isLoggable(Level.FINE)) xembedLog.fine("Activating accelerator " + accel_id); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine("Activating accelerator " + accel_id); xembed.sendMessage(xembed.handle, XEMBED_ACTIVATE_ACCELERATOR, accel_id, 0, 0); // FIXME: How about overloaded? result = true; } @@ -622,7 +622,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener exists = grabbed_keys.contains(key); } if (exists) { - if (xembedLog.isLoggable(Level.FINE)) xembedLog.fine("Forwarding grabbed key " + e); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine("Forwarding grabbed key " + e); forwardKeyEvent(e); result = true; } @@ -641,9 +641,9 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener public void handleClientMessage(XEvent xev) { super.handleClientMessage(xev); XClientMessageEvent msg = xev.get_xclient(); - if (xembedLog.isLoggable(Level.FINER)) xembedLog.finer("Client message to embedder: " + msg); + if (xembedLog.isLoggable(PlatformLogger.FINER)) xembedLog.finer("Client message to embedder: " + msg); if (msg.get_message_type() == xembed.XEmbed.getAtom()) { - if (xembedLog.isLoggable(Level.FINE)) xembedLog.fine(xembed.XEmbedMessageToString(msg)); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine(xembed.XEmbedMessageToString(msg)); } if (isXEmbedActive()) { switch ((int)msg.get_data(1)) { @@ -709,7 +709,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener } public boolean processXEmbedDnDEvent(long ctxt, int eventID) { - if (xembedLog.isLoggable(Level.FINEST)) { + if (xembedLog.isLoggable(PlatformLogger.FINEST)) { xembedLog.finest(" Drop target=" + target.getDropTarget()); } if (target.getDropTarget() instanceof XEmbedDropTarget) { @@ -744,7 +744,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(Level.FINER)) + if (xembedLog.isLoggable(PlatformLogger.FINER)) xembedLog.fine("Mapping state of the client has changed, old state: " + currently_mapped + ", new state: " + new_mapped); if (new_mapped) { XToolkit.awtLock(); @@ -773,7 +773,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener public void handlePropertyNotify(XEvent xev) { if (isXEmbedActive()) { XPropertyEvent ev = xev.get_xproperty(); - if (xembedLog.isLoggable(Level.FINER)) xembedLog.finer("Property change on client: " + ev); + if (xembedLog.isLoggable(PlatformLogger.FINER)) xembedLog.finer("Property change on client: " + ev); if (ev.get_atom() == XAtom.XA_WM_NORMAL_HINTS) { childResized(); } else if (ev.get_atom() == XEmbedInfo.getAtom()) { @@ -794,7 +794,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener void handleConfigureNotify(XEvent xev) { if (isXEmbedActive()) { XConfigureEvent ev = xev.get_xconfigure(); - if (xembedLog.isLoggable(Level.FINER)) xembedLog.finer("Bounds change on client: " + ev); + if (xembedLog.isLoggable(PlatformLogger.FINER)) xembedLog.finer("Bounds change on client: " + ev); if (xev.get_xany().get_window() == handle) { childResized(); } @@ -845,7 +845,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(Level.FINEST)) xembedLog.finest("Mapped " + e + " to " + this); + if (xembedLog.isLoggable(PlatformLogger.FINEST)) xembedLog.finest("Mapped " + e + " to " + this); } finally { XlibWrapper.unsafe.freeMemory(data); } diff --git a/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java b/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java index 8be2390754..f79de9cf92 100644 --- a/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java +++ b/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java @@ -26,10 +26,10 @@ package sun.awt.X11; import java.awt.AWTKeyStroke; -import java.util.logging.*; import sun.awt.SunToolkit; import java.awt.Component; import java.awt.Container; +import sun.util.logging.PlatformLogger; import sun.awt.X11GraphicsConfig; import sun.awt.X11GraphicsDevice; @@ -40,7 +40,7 @@ import sun.awt.X11GraphicsDevice; * call install and forward all XClientMessageEvents to it. */ public class XEmbedClientHelper extends XEmbedHelper implements XEventDispatcher { - private static final Logger xembedLog = Logger.getLogger("sun.awt.X11.xembed.XEmbedClientHelper"); + private static final PlatformLogger xembedLog = PlatformLogger.getLogger("sun.awt.X11.xembed.XEmbedClientHelper"); private XEmbeddedFramePeer embedded; // XEmbed client private long server; // XEmbed server @@ -53,7 +53,7 @@ public class XEmbedClientHelper extends XEmbedHelper implements XEventDispatcher } void setClient(XEmbeddedFramePeer client) { - if (xembedLog.isLoggable(Level.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.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(Level.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.FINE)) { xembedLog.fine("Installing xembedder on " + embedded); } long[] info = new long[] { XEMBED_VERSION, XEMBED_MAPPED }; @@ -95,9 +95,9 @@ public class XEmbedClientHelper extends XEmbedHelper implements XEventDispatcher void handleClientMessage(XEvent xev) { XClientMessageEvent msg = xev.get_xclient(); - if (xembedLog.isLoggable(Level.FINE)) xembedLog.fine(msg.toString()); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine(msg.toString()); if (msg.get_message_type() == XEmbed.getAtom()) { - if (xembedLog.isLoggable(Level.FINE)) xembedLog.fine("Embedded message: " + msgidToString((int)msg.get_data(1))); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine("Embedded message: " + msgidToString((int)msg.get_data(1))); switch ((int)msg.get_data(1)) { case XEMBED_EMBEDDED_NOTIFY: // Notification about embedding protocol start active = true; diff --git a/src/solaris/classes/sun/awt/X11/XEmbedHelper.java b/src/solaris/classes/sun/awt/X11/XEmbedHelper.java index 4b3c7d9fd8..57267039bd 100644 --- a/src/solaris/classes/sun/awt/X11/XEmbedHelper.java +++ b/src/solaris/classes/sun/awt/X11/XEmbedHelper.java @@ -27,7 +27,8 @@ package sun.awt.X11; import sun.misc.Unsafe; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; + import java.awt.AWTKeyStroke; import java.awt.event.InputEvent; @@ -36,7 +37,7 @@ import java.awt.event.InputEvent; * Contains constant definitions and helper routines. */ public class XEmbedHelper { - private static final Logger xembedLog = Logger.getLogger("sun.awt.X11.xembed"); + private static final PlatformLogger xembedLog = PlatformLogger.getLogger("sun.awt.X11.xembed"); final static Unsafe unsafe = Unsafe.getUnsafe(); final static int XEMBED_VERSION = 0, @@ -81,11 +82,11 @@ public class XEmbedHelper { XEmbedHelper() { if (XEmbed == null) { XEmbed = XAtom.get("_XEMBED"); - if (xembedLog.isLoggable(Level.FINER)) xembedLog.finer("Created atom " + XEmbed.toString()); + if (xembedLog.isLoggable(PlatformLogger.FINER)) xembedLog.finer("Created atom " + XEmbed.toString()); } if (XEmbedInfo == null) { XEmbedInfo = XAtom.get("_XEMBED_INFO"); - if (xembedLog.isLoggable(Level.FINER)) xembedLog.finer("Created atom " + XEmbedInfo.toString()); + if (xembedLog.isLoggable(PlatformLogger.FINER)) xembedLog.finer("Created atom " + XEmbedInfo.toString()); } } @@ -105,7 +106,7 @@ public class XEmbedHelper { msg.set_data(4, data2); XToolkit.awtLock(); try { - if (xembedLog.isLoggable(Level.FINE)) xembedLog.fine("Sending " + XEmbedMessageToString(msg)); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine("Sending " + XEmbedMessageToString(msg)); XlibWrapper.XSendEvent(XToolkit.getDisplay(), window, false, XConstants.NoEventMask, msg.pData); } finally { diff --git a/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java b/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java index 932f8bd31d..bc4759f225 100644 --- a/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java +++ b/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java @@ -28,7 +28,7 @@ package sun.awt.X11; //import static sun.awt.X11.XEmbed.*; import java.awt.*; import java.awt.event.*; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; import static sun.awt.X11.XConstants.*; import java.util.LinkedList; @@ -37,7 +37,7 @@ import java.util.LinkedList; * specification and references. */ public class XEmbedServerTester implements XEventDispatcher { - private static final Logger xembedLog = Logger.getLogger("sun.awt.X11.xembed.XEmbedServerTester"); + private static final PlatformLogger xembedLog = PlatformLogger.getLogger("sun.awt.X11.xembed.XEmbedServerTester"); private final Object EVENT_LOCK = new Object(); static final int SYSTEM_EVENT_MASK = 0x8000; int my_version, server_version; @@ -544,7 +544,7 @@ public class XEmbedServerTester implements XEventDispatcher { try { EVENT_LOCK.wait(3000); } catch (InterruptedException ie) { - xembedLog.log(Level.WARNING, "Event wait interrupted", ie); + xembedLog.warning("Event wait interrupted", ie); } eventWaited = -1; if (checkEventList(position, event) == -1) { @@ -634,7 +634,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(Level.FINE)) xembedLog.fine("Embedded message: " + XEmbedHelper.msgidToString((int)msg.get_data(1))); + if (xembedLog.isLoggable(PlatformLogger.FINE)) xembedLog.fine("Embedded message: " + XEmbedHelper.msgidToString((int)msg.get_data(1))); switch ((int)msg.get_data(1)) { case XEmbedHelper.XEMBED_EMBEDDED_NOTIFY: // Notification about embedding protocol start xembedActive = true; diff --git a/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java b/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java index 4b9bcc91de..a2d0df1687 100644 --- a/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java +++ b/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java @@ -30,15 +30,14 @@ import java.awt.*; import java.util.LinkedList; import java.util.Iterator; -import java.util.logging.Level; -import java.util.logging.Logger; +import sun.util.logging.PlatformLogger; import sun.awt.EmbeddedFrame; import sun.awt.SunToolkit; public class XEmbeddedFramePeer extends XFramePeer { - private static final Logger xembedLog = Logger.getLogger("sun.awt.X11.xembed.XEmbeddedFramePeer"); + private static final PlatformLogger xembedLog = PlatformLogger.getLogger("sun.awt.X11.xembed.XEmbeddedFramePeer"); LinkedList<AWTKeyStroke> strokes; @@ -138,7 +137,7 @@ public class XEmbeddedFramePeer extends XFramePeer { { assert (SunToolkit.isAWTLockHeldByCurrentThread()); XConfigureEvent xe = xev.get_xconfigure(); - if (xembedLog.isLoggable(Level.FINE)) { + if (xembedLog.isLoggable(PlatformLogger.FINE)) { xembedLog.fine(xe.toString()); } diff --git a/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java b/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java index 0b8085e759..a50437a1ee 100644 --- a/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java +++ b/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java @@ -34,12 +34,12 @@ import java.util.Locale; import java.util.Arrays; import com.sun.java.swing.plaf.motif.*; import javax.swing.plaf.ComponentUI; -import java.util.logging.*; import java.security.AccessController; import java.security.PrivilegedAction; +import sun.util.logging.PlatformLogger; class XFileDialogPeer extends XDialogPeer implements FileDialogPeer, ActionListener, ItemListener, KeyEventDispatcher, XChoicePeerListener { - private static final Logger log = Logger.getLogger("sun.awt.X11.XFileDialogPeer"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XFileDialogPeer"); FileDialog target; diff --git a/src/solaris/classes/sun/awt/X11/XFocusProxyWindow.java b/src/solaris/classes/sun/awt/X11/XFocusProxyWindow.java index 361ef87eeb..d5295ebc86 100644 --- a/src/solaris/classes/sun/awt/X11/XFocusProxyWindow.java +++ b/src/solaris/classes/sun/awt/X11/XFocusProxyWindow.java @@ -26,7 +26,6 @@ package sun.awt.X11; import java.awt.*; -import java.util.logging.*; /** * This class represent focus holder window implementation. When toplevel requests or receives focus @@ -34,7 +33,6 @@ import java.util.logging.*; * and therefore X doesn't control focus after we have set it to proxy. */ public class XFocusProxyWindow extends XBaseWindow { - private static final Logger focusLog = Logger.getLogger("sun.awt.X11.focus.XFocusProxyWindow"); XWindowPeer owner; public XFocusProxyWindow(XWindowPeer owner) { diff --git a/src/solaris/classes/sun/awt/X11/XFramePeer.java b/src/solaris/classes/sun/awt/X11/XFramePeer.java index 22cb163ebb..b2f298dab5 100644 --- a/src/solaris/classes/sun/awt/X11/XFramePeer.java +++ b/src/solaris/classes/sun/awt/X11/XFramePeer.java @@ -34,14 +34,13 @@ import java.awt.Insets; import java.awt.MenuBar; import java.awt.Rectangle; import java.awt.peer.FramePeer; -import java.util.logging.Level; -import java.util.logging.Logger; +import sun.util.logging.PlatformLogger; import sun.awt.AWTAccessor; class XFramePeer extends XDecoratedPeer implements FramePeer { - private static Logger log = Logger.getLogger("sun.awt.X11.XFramePeer"); - private static Logger stateLog = Logger.getLogger("sun.awt.X11.states"); - private static Logger insLog = Logger.getLogger("sun.awt.X11.insets.XFramePeer"); + private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XFramePeer"); + private static PlatformLogger stateLog = PlatformLogger.getLogger("sun.awt.X11.states"); + private static PlatformLogger insLog = PlatformLogger.getLogger("sun.awt.X11.insets.XFramePeer"); XMenuBarPeer menubarPeer; MenuBar menubar; @@ -76,10 +75,10 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { winAttr.isResizable = true; // target.isResizable(); winAttr.title = target.getTitle(); winAttr.initialResizability = target.isResizable(); - if (log.isLoggable(Level.FINE)) { - log.log(Level.FINE, "Frame''s initial attributes: decor {0}, resizable {1}, undecorated {2}, initial state {3}", - new Object[] {Integer.valueOf(winAttr.decorations), Boolean.valueOf(winAttr.initialResizability), - Boolean.valueOf(!winAttr.nativeDecor), Integer.valueOf(winAttr.initialState)}); + if (log.isLoggable(PlatformLogger.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)); } } @@ -208,7 +207,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { } public void setMaximizedBounds(Rectangle b) { - if (insLog.isLoggable(Level.FINE)) insLog.fine("Setting maximized bounds to " + b); + if (insLog.isLoggable(PlatformLogger.FINE)) insLog.fine("Setting maximized bounds to " + b); if (b == null) return; maxBounds = new Rectangle(b); XToolkit.awtLock(); @@ -225,7 +224,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { } else { hints.set_max_height((int)XlibWrapper.DisplayHeight(XToolkit.getDisplay(), XlibWrapper.DefaultScreen(XToolkit.getDisplay()))); } - if (insLog.isLoggable(Level.FINER)) insLog.finer("Setting hints, flags " + XlibWrapper.hintsToString(hints.get_flags())); + if (insLog.isLoggable(PlatformLogger.FINER)) insLog.finer("Setting hints, flags " + XlibWrapper.hintsToString(hints.get_flags())); XlibWrapper.XSetWMNormalHints(XToolkit.getDisplay(), window, hints.pData); } finally { XToolkit.awtUnlock(); @@ -253,14 +252,14 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { int changed = state ^ newState; int changeIconic = changed & Frame.ICONIFIED; boolean iconic = (newState & Frame.ICONIFIED) != 0; - stateLog.log(Level.FINER, "Changing state, old state {0}, new state {1}(iconic {2})", - new Object[] {Integer.valueOf(state), Integer.valueOf(newState), Boolean.valueOf(iconic)}); + 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(Level.FINER)) stateLog.finer("Iconifying shell " + getShell() + ", this " + this + ", screen " + getScreenNumber()); + if (stateLog.isLoggable(PlatformLogger.FINER)) stateLog.finer("Iconifying shell " + getShell() + ", this " + this + ", screen " + getScreenNumber()); XToolkit.awtLock(); try { int res = XlibWrapper.XIconifyWindow(XToolkit.getDisplay(), getShell(), getScreenNumber()); - if (stateLog.isLoggable(Level.FINER)) stateLog.finer("XIconifyWindow returned " + res); + if (stateLog.isLoggable(PlatformLogger.FINER)) stateLog.finer("XIconifyWindow returned " + res); } finally { XToolkit.awtUnlock(); @@ -270,7 +269,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { setExtendedState(newState); } if (changeIconic != 0 && !iconic) { - if (stateLog.isLoggable(Level.FINER)) stateLog.finer("DeIconifying " + this); + if (stateLog.isLoggable(PlatformLogger.FINER)) stateLog.finer("DeIconifying " + this); xSetVisible(true); } } @@ -283,7 +282,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer { super.handlePropertyNotify(xev); XPropertyEvent ev = xev.get_xproperty(); - log.log(Level.FINER, "Property change {0}", new Object[] {ev}); + log.finer("Property change {0}", ev); /* * Let's see if this is a window state protocol message, and * if it is - decode a new state in terms of java constants. @@ -348,7 +347,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(Level.FINE)) stateLog.fine("Setting initial WM state on " + this + " to " + wm_state); + if (stateLog.isLoggable(PlatformLogger.FINE)) stateLog.fine("Setting initial WM state on " + this + " to " + wm_state); XlibWrapper.XSetWMHints(XToolkit.getDisplay(), getWindow(), hints.pData); } finally { diff --git a/src/solaris/classes/sun/awt/X11/XIconWindow.java b/src/solaris/classes/sun/awt/X11/XIconWindow.java index a6211a0e0b..918ecdf062 100644 --- a/src/solaris/classes/sun/awt/X11/XIconWindow.java +++ b/src/solaris/classes/sun/awt/X11/XIconWindow.java @@ -30,10 +30,10 @@ import sun.awt.X11GraphicsConfig; import sun.awt.image.ToolkitImage; import sun.awt.image.ImageRepresentation; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; public class XIconWindow extends XBaseWindow { - private final static Logger log = Logger.getLogger("sun.awt.X11.XIconWindow"); + private final static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XIconWindow"); XDecoratedPeer parent; Dimension size; long iconPixmap = 0; @@ -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(Level.FINEST)) log.finest(adata.toString()); + if (log.isLoggable(PlatformLogger.FINEST)) log.finest(adata.toString()); long status = XlibWrapper.XGetIconSizes(display, XToolkit.getDefaultRootWindow(), @@ -71,11 +71,11 @@ public class XIconWindow extends XBaseWindow { } int count = Native.getInt(XlibWrapper.iarg1); long sizes_ptr = Native.getLong(XlibWrapper.larg1); // XIconSize* - log.log(Level.FINEST, "count = {1}, sizes_ptr = {0}", new Object[] {Long.valueOf(sizes_ptr), Integer.valueOf(count)}); + 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); - log.log(Level.FINEST, "sizes_ptr[{1}] = {0}", new Object[] {res[i], Integer.valueOf(i)}); + log.finest("sizes_ptr[{1}] = {0}", res[i], Integer.valueOf(i)); } return res; } finally { @@ -87,12 +87,12 @@ public class XIconWindow extends XBaseWindow { if (XWM.getWMID() == XWM.ICE_WM) { // ICE_WM has a bug - it only displays icons of the size // 16x16, while reporting 32x32 in its size list - log.log(Level.FINEST, "Returning ICE_WM icon size: 16x16"); + log.finest("Returning ICE_WM icon size: 16x16"); return new Dimension(16, 16); } XIconSize[] sizeList = getIconSizes(); - log.log(Level.FINEST, "Icon sizes: {0}", new Object[] {sizeList}); + log.finest("Icon sizes: {0}", sizeList); if (sizeList == null) { // No icon sizes so we simply fall back to 16x16 return new Dimension(16, 16); @@ -139,11 +139,11 @@ public class XIconWindow extends XBaseWindow { } } } - if (log.isLoggable(Level.FINEST)) { + if (log.isLoggable(PlatformLogger.FINEST)) { log.finest("found=" + found); } if (!found) { - if (log.isLoggable(Level.FINEST)) { + if (log.isLoggable(PlatformLogger.FINEST)) { log.finest("widthHint=" + widthHint + ", heightHint=" + heightHint + ", saveWidth=" + saveWidth + ", saveHeight=" + saveHeight + ", max_width=" + sizeList[0].get_max_width() @@ -159,7 +159,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(Level.FINEST)) { + if (log.isLoggable(PlatformLogger.FINEST)) { log.finest("wdiff=" + wdiff + ", hdiff=" + hdiff); } if (wdiff >= hdiff) { /* need to scale width more */ @@ -191,7 +191,7 @@ public class XIconWindow extends XBaseWindow { XToolkit.awtUnlock(); } - if (log.isLoggable(Level.FINEST)) { + if (log.isLoggable(PlatformLogger.FINEST)) { log.finest("return " + saveWidth + "x" + saveHeight); } return new Dimension(saveWidth, saveHeight); @@ -418,7 +418,7 @@ public class XIconWindow extends XBaseWindow { } } if (min != null) { - log.log(Level.FINER, "Icon: {0}x{1}", new Object[] { min.getWidth(null), min.getHeight(null)}); + log.finer("Icon: {0}x{1}", min.getWidth(null), min.getHeight(null)); setIconImage(min); } } @@ -444,7 +444,7 @@ public class XIconWindow extends XBaseWindow { } Dimension iconSize = getIconSize(width, height); if (iconSize != null) { - log.log(Level.FINEST, "Icon size: {0}", iconSize); + log.finest("Icon size: {0}", iconSize); iconWidth = iconSize.width; iconHeight = iconSize.height; } else { diff --git a/src/solaris/classes/sun/awt/X11/XInputMethod.java b/src/solaris/classes/sun/awt/X11/XInputMethod.java index 86df2073d6..709654b995 100644 --- a/src/solaris/classes/sun/awt/X11/XInputMethod.java +++ b/src/solaris/classes/sun/awt/X11/XInputMethod.java @@ -33,7 +33,7 @@ import java.awt.im.spi.InputMethodContext; import java.awt.peer.ComponentPeer; import sun.awt.X11InputMethod; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; /** * Input Method Adapter for XIM (without Motif) @@ -41,7 +41,7 @@ import java.util.logging.*; * @author JavaSoft International */ public class XInputMethod extends X11InputMethod { - private static final Logger log = Logger.getLogger("sun.awt.X11.XInputMethod"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XInputMethod"); public XInputMethod() throws AWTException { super(); @@ -102,13 +102,13 @@ public class XInputMethod extends X11InputMethod { protected ComponentPeer getPeer(Component client) { XComponentPeer peer; - if (log.isLoggable(Level.FINE)) log.fine("Client is " + client); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Client is " + client); peer = (XComponentPeer)XToolkit.targetToPeer(client); while (client != null && peer == null) { client = getParent(client); peer = (XComponentPeer)XToolkit.targetToPeer(client); } - log.log(Level.FINE, "Peer is {0}, client is {1}", new Object[] {peer, client}); + log.fine("Peer is {0}, client is {1}", peer, client); if (peer != null) return peer; diff --git a/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java b/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java index 19c213441a..6e11c1aac1 100644 --- a/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java +++ b/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java @@ -36,15 +36,14 @@ import java.awt.peer.ComponentPeer; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.logging.Level; -import java.util.logging.Logger; +import sun.util.logging.PlatformLogger; import sun.awt.CausedFocusEvent; import sun.awt.SunToolkit; import sun.awt.KeyboardFocusManagerPeerImpl; public class XKeyboardFocusManagerPeer extends KeyboardFocusManagerPeerImpl { - private static final Logger focusLog = Logger.getLogger("sun.awt.X11.focus.XKeyboardFocusManagerPeer"); + private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.awt.X11.focus.XKeyboardFocusManagerPeer"); private static Object lock = new Object() {}; private static Component currentFocusOwner; @@ -82,7 +81,7 @@ public class XKeyboardFocusManagerPeer extends KeyboardFocusManagerPeerImpl { } public static void setCurrentNativeFocusedWindow(Window win) { - if (focusLog.isLoggable(Level.FINER)) focusLog.finer("Setting current native focused window " + win); + if (focusLog.isLoggable(PlatformLogger.FINER)) focusLog.finer("Setting current native focused window " + win); XWindowPeer from = null, to = null; synchronized(lock) { diff --git a/src/solaris/classes/sun/awt/X11/XKeysym.java b/src/solaris/classes/sun/awt/X11/XKeysym.java index 83c655f11c..abf3c65c54 100644 --- a/src/solaris/classes/sun/awt/X11/XKeysym.java +++ b/src/solaris/classes/sun/awt/X11/XKeysym.java @@ -29,8 +29,7 @@ package sun.awt.X11; import java.util.Hashtable; import sun.misc.Unsafe; -import java.util.logging.Level; -import java.util.logging.Logger; +import sun.util.logging.PlatformLogger; public class XKeysym { @@ -70,7 +69,7 @@ public class XKeysym { static Hashtable<Integer, Long> javaKeycode2KeysymHash = new Hashtable<Integer, Long>(); static long keysym_lowercase = unsafe.allocateMemory(Native.getLongSize()); static long keysym_uppercase = unsafe.allocateMemory(Native.getLongSize()); - private static Logger keyEventLog = Logger.getLogger("sun.awt.X11.kye.XKeysym"); + private static PlatformLogger keyEventLog = PlatformLogger.getLogger("sun.awt.X11.kye.XKeysym"); public static char convertKeysym( long ks, int state ) { /* First check for Latin-1 characters (1:1 mapping) */ diff --git a/src/solaris/classes/sun/awt/X11/XListPeer.java b/src/solaris/classes/sun/awt/X11/XListPeer.java index 56c4ef9d2a..f0b3fc117f 100644 --- a/src/solaris/classes/sun/awt/X11/XListPeer.java +++ b/src/solaris/classes/sun/awt/X11/XListPeer.java @@ -34,13 +34,13 @@ import java.awt.peer.*; import java.util.Vector; import java.awt.geom.*; import java.awt.image.*; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; // TODO: some input actions should do nothing if Shift or Control are down class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { - private static final Logger log = Logger.getLogger("sun.awt.X11.XListPeer"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XListPeer"); public final static int MARGIN = 2; public final static int SPACE = 1; @@ -578,10 +578,10 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { } void mousePressed(MouseEvent mouseEvent) { - if (log.isLoggable(Level.FINER)) log.finer(mouseEvent.toString() + ", hsb " + hsbVis + ", vsb " + vsbVis); + if (log.isLoggable(PlatformLogger.FINER)) log.finer(mouseEvent.toString() + ", hsb " + hsbVis + ", vsb " + vsbVis); if (isEnabled() && mouseEvent.getButton() == MouseEvent.BUTTON1) { if (inWindow(mouseEvent.getX(), mouseEvent.getY())) { - if (log.isLoggable(Level.FINE)) log.fine("Mouse press in items area"); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Mouse press in items area"); active = WINDOW; int i = y2index(mouseEvent.getY()); if (i >= 0) { @@ -618,14 +618,14 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { currentIndex = -1; } } else if (inVerticalScrollbar(mouseEvent.getX(), mouseEvent.getY())) { - if (log.isLoggable(Level.FINE)) log.fine("Mouse press in vertical scrollbar"); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Mouse press in vertical scrollbar"); active = VERSCROLLBAR; vsb.handleMouseEvent(mouseEvent.getID(), mouseEvent.getModifiers(), mouseEvent.getX() - (width - SCROLLBAR_WIDTH), mouseEvent.getY()); } else if (inHorizontalScrollbar(mouseEvent.getX(), mouseEvent.getY())) { - if (log.isLoggable(Level.FINE)) log.fine("Mouse press in horizontal scrollbar"); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Mouse press in horizontal scrollbar"); active = HORSCROLLBAR; hsb.handleMouseEvent(mouseEvent.getID(), mouseEvent.getModifiers(), @@ -808,7 +808,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { void keyPressed(KeyEvent e) { int keyCode = e.getKeyCode(); - if (log.isLoggable(Level.FINE)) log.fine(e.toString()); + if (log.isLoggable(PlatformLogger.FINE)) log.fine(e.toString()); switch(keyCode) { case KeyEvent.VK_UP: case KeyEvent.VK_KP_UP: // TODO: I assume we also want this, too @@ -993,7 +993,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { */ public void notifyValue(XScrollbar obj, int type, int v, boolean isAdjusting) { - if (log.isLoggable(Level.FINE)) log.fine("Notify value changed on " + obj + " to " + v); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Notify value changed on " + obj + " to " + v); int value = obj.getValue(); if (obj == vsb) { scrollVertical(v - value); @@ -1076,7 +1076,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { } } } - if (log.isLoggable(Level.FINER)) log.finer("Adding item '" + item + "' to " + addedIndex); + if (log.isLoggable(PlatformLogger.FINER)) log.finer("Adding item '" + item + "' to " + addedIndex); // Update maxLength boolean repaintItems = !isItemHidden(addedIndex); @@ -1094,7 +1094,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { | ((vsb.needsRepaint())?(PAINT_VSCROLL):0); } - if (log.isLoggable(Level.FINEST)) log.finest("Last visible: " + getLastVisibleItem() + + if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Last visible: " + getLastVisibleItem() + ", hsb changed : " + (hsbWasVis ^ hsbVis) + ", items changed " + repaintItems); repaint(addedIndex, getLastVisibleItem(), options); } @@ -1110,9 +1110,9 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { boolean vsbWasVisible = vsbVis; int oldLastDisplayed = lastItemDisplayed(); - if (log.isLoggable(Level.FINE)) log.fine("Deleting from " + s + " to " + e); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Deleting from " + s + " to " + e); - if (log.isLoggable(Level.FINEST)) log.finest("Last displayed item: " + oldLastDisplayed + ", items in window " + itemsInWindow() + + if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Last displayed item: " + oldLastDisplayed + ", items in window " + itemsInWindow() + ", size " + items.size()); if (items.size() == 0) { @@ -1180,7 +1180,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { options |= PAINT_FOCUS; } - if (log.isLoggable(Level.FINEST)) log.finest("Multiple selections: " + multipleSelections); + if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Multiple selections: " + multipleSelections); // update vsb.val if (vsb.getValue() >= s) { @@ -1433,7 +1433,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { * y is the number of items to scroll */ void scrollVertical(int y) { - if (log.isLoggable(Level.FINE)) log.fine("Scrolling vertically by " + y); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Scrolling vertically by " + y); int itemsInWin = itemsInWindow(); int h = getItemHeight(); int pixelsToScroll = y * h; @@ -1473,7 +1473,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { * x is the number of pixels to scroll */ void scrollHorizontal(int x) { - if (log.isLoggable(Level.FINE)) log.fine("Scrolling horizontally by " + y); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Scrolling horizontally by " + y); int w = getListWidth(); w -= ((2 * SPACE) + (2 * MARGIN)); int h = height - (SCROLLBAR_AREA + (2 * MARGIN)); @@ -1706,7 +1706,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { } if (localBuffer == null) { - if (log.isLoggable(Level.FINE)) log.fine("Creating buffer " + width + "x" + height); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Creating buffer " + width + "x" + height); // use GraphicsConfig.cCVI() instead of Component.cVI(), // because the latter may cause a deadlock with the tree lock localBuffer = @@ -1743,7 +1743,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(Level.FINER)) log.finer("Repaint from " + firstItem + " to " + lastItem + " options " + options); + if (log.isLoggable(PlatformLogger.FINER)) log.finer("Repaint from " + firstItem + " to " + lastItem + " options " + options); if (firstItem > lastItem) { int t = lastItem; lastItem = firstItem; @@ -1832,7 +1832,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { } private void paintItems(Graphics g, int firstItem, int lastItem, int options) { - if (log.isLoggable(Level.FINER)) log.finer("Painting items from " + firstItem + " to " + lastItem + ", focused " + focusIndex + ", first " + getFirstVisibleItem() + ", last " + getLastVisibleItem()); + if (log.isLoggable(PlatformLogger.FINER)) log.finer("Painting items from " + firstItem + " to " + lastItem + ", focused " + focusIndex + ", first " + getFirstVisibleItem() + ", last " + getLastVisibleItem()); firstItem = Math.max(getFirstVisibleItem(), firstItem); if (firstItem > lastItem) { @@ -1843,7 +1843,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { firstItem = Math.max(getFirstVisibleItem(), firstItem); lastItem = Math.min(lastItem, items.size()-1); - if (log.isLoggable(Level.FINER)) log.finer("Actually painting items from " + firstItem + " to " + lastItem + + if (log.isLoggable(PlatformLogger.FINER)) log.finer("Actually painting items from " + firstItem + " to " + lastItem + ", items in window " + itemsInWindow()); for (int i = firstItem; i <= lastItem; i++) { paintItem(g, i); @@ -1851,7 +1851,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { } private void paintItem(Graphics g, int index) { - if (log.isLoggable(Level.FINEST)) log.finest("Painting item " + index); + if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Painting item " + index); // 4895367 - only paint items which are visible if (!isItemHidden(index)) { Shape clip = g.getClip(); @@ -1859,18 +1859,18 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { int h = getItemHeight(); int y = getItemY(index); int x = getItemX(); - if (log.isLoggable(Level.FINEST)) log.finest("Setting clip " + new Rectangle(x, y, w - (SPACE*2), h-(SPACE*2))); + if (log.isLoggable(PlatformLogger.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)); // Always paint the background so that focus is unpainted in // multiselect mode if (isSelected(index)) { - if (log.isLoggable(Level.FINEST)) log.finest("Painted item is selected"); + if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Painted item is selected"); g.setColor(getListForeground()); } else { g.setColor(getListBackground()); } - if (log.isLoggable(Level.FINEST)) log.finest("Filling " + new Rectangle(x, y, w, h)); + if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Filling " + new Rectangle(x, y, w, h)); g.fillRect(x, y, w, h); if (index <= getLastVisibleItem() && index < items.size()) { @@ -1894,7 +1894,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(Level.FINEST)) log.finest("Painting scrollbar " + scr + " width " + + if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Painting scrollbar " + scr + " width " + width + " height " + height + ", paintAll " + paintAll); g.translate(x, y); scr.paint(g, getSystemColors(), paintAll); @@ -1932,22 +1932,22 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient { if (paintFocus && !hasFocus()) { paintFocus = false; } - if (log.isLoggable(Level.FINE)) log.fine("Painting focus, focus index " + getFocusIndex() + ", focus is " + + if (log.isLoggable(PlatformLogger.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(Level.FINEST)) log.finest("Setting focus clip " + new Rectangle(0, 0, listWidth, listHeight)); + if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Setting focus clip " + new Rectangle(0, 0, listWidth, listHeight)); Rectangle rect = getFocusRect(); if (prevFocusRect != null) { // Erase focus rect - if (log.isLoggable(Level.FINEST)) log.finest("Erasing previous focus rect " + prevFocusRect); + if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Erasing previous focus rect " + prevFocusRect); g.setColor(getListBackground()); g.drawRect(prevFocusRect.x, prevFocusRect.y, prevFocusRect.width, prevFocusRect.height); prevFocusRect = null; } if (paintFocus) { // Paint new - if (log.isLoggable(Level.FINEST)) log.finest("Painting focus rect " + rect); + if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Painting focus rect " + rect); g.setColor(getListForeground()); // Focus color is always black on Linux g.drawRect(rect.x, rect.y, rect.width, rect.height); prevFocusRect = rect; diff --git a/src/solaris/classes/sun/awt/X11/XMSelection.java b/src/solaris/classes/sun/awt/X11/XMSelection.java index 8fb4f4bf3c..16de13fe9e 100644 --- a/src/solaris/classes/sun/awt/X11/XMSelection.java +++ b/src/solaris/classes/sun/awt/X11/XMSelection.java @@ -32,8 +32,7 @@ package sun.awt.X11; import java.util.*; -import java.util.logging.*; - +import sun.util.logging.PlatformLogger; public class XMSelection { @@ -56,7 +55,7 @@ public class XMSelection { */ - private static Logger log = Logger.getLogger("sun.awt.X11.XMSelection"); + private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XMSelection"); /* Name of the selection */ String selectionName; @@ -129,7 +128,7 @@ public class XMSelection { long display = XToolkit.getDisplay(); synchronized(this) { setOwner(owner, screen); - if (log.isLoggable(Level.FINE)) log.fine("New Selection Owner for screen " + screen + " = " + owner ); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("New Selection Owner for screen " + screen + " = " + owner ); XlibWrapper.XSelectInput(display, owner, XConstants.StructureNotifyMask | eventMask); XToolkit.addEventDispatcher(owner, new XEventDispatcher() { @@ -149,19 +148,19 @@ public class XMSelection { try { try { long display = XToolkit.getDisplay(); - if (log.isLoggable(Level.FINE)) log.fine("Grabbing XServer"); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Grabbing XServer"); XlibWrapper.XGrabServer(display); synchronized(this) { String selection_name = getName()+"_S"+screen; - if (log.isLoggable(Level.FINE)) log.fine("Screen = " + screen + " selection name = " + selection_name); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Screen = " + screen + " selection name = " + selection_name); XAtom atom = XAtom.get(selection_name); selectionMap.put(Long.valueOf(atom.getAtom()),this); // add mapping from atom to the instance of XMSelection setAtom(atom,screen); long owner = XlibWrapper.XGetSelectionOwner(display, atom.getAtom()); if (owner != 0) { setOwner(owner, screen); - if (log.isLoggable(Level.FINE)) log.fine("Selection Owner for screen " + screen + " = " + owner ); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Selection Owner for screen " + screen + " = " + owner ); XlibWrapper.XSelectInput(display, owner, XConstants.StructureNotifyMask | extra_mask); XToolkit.addEventDispatcher(owner, new XEventDispatcher() { @@ -176,7 +175,7 @@ public class XMSelection { e.printStackTrace(); } finally { - if (log.isLoggable(Level.FINE)) log.fine("UnGrabbing XServer"); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("UnGrabbing XServer"); XlibWrapper.XUngrabServer(XToolkit.getDisplay()); } } finally { @@ -188,7 +187,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(Level.FINE)) log.fine("client messags = " + xce); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("client messags = " + xce); long timestamp = xce.get_data(0); long atom = xce.get_data(1); long owner = xce.get_data(2); @@ -295,7 +294,7 @@ public class XMSelection { synchronized void dispatchSelectionChanged( XPropertyEvent ev, int screen) { - if (log.isLoggable(Level.FINE)) log.fine("Selection Changed : Screen = " + screen + "Event =" + ev); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Selection Changed : Screen = " + screen + "Event =" + ev); if (listeners != null) { Iterator iter = listeners.iterator(); while (iter.hasNext()) { @@ -306,7 +305,7 @@ public class XMSelection { } synchronized void dispatchOwnerDeath(XDestroyWindowEvent de, int screen) { - if (log.isLoggable(Level.FINE)) log.fine("Owner dead : Screen = " + screen + "Event =" + de); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Owner dead : Screen = " + screen + "Event =" + de); if (listeners != null) { Iterator iter = listeners.iterator(); while (iter.hasNext()) { @@ -318,7 +317,7 @@ public class XMSelection { } void dispatchSelectionEvent(XEvent xev, int screen) { - if (log.isLoggable(Level.FINE)) log.fine("Event =" + xev); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Event =" + xev); if (xev.get_type() == XConstants.DestroyNotify) { XDestroyWindowEvent de = xev.get_xdestroywindow(); dispatchOwnerDeath( de, screen); diff --git a/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java b/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java index 1d4b8be3c6..30fa706184 100644 --- a/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java +++ b/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java @@ -30,7 +30,7 @@ import java.awt.event.*; import java.lang.reflect.Field; import java.util.Vector; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; import sun.awt.SunToolkit; public class XMenuBarPeer extends XBaseMenuWindow implements MenuBarPeer { @@ -41,7 +41,7 @@ public class XMenuBarPeer extends XBaseMenuWindow implements MenuBarPeer { * ************************************************/ - private static Logger log = Logger.getLogger("sun.awt.X11.XMenuBarPeer"); + private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XMenuBarPeer"); /* * Primary members @@ -533,7 +533,7 @@ public class XMenuBarPeer extends XBaseMenuWindow implements MenuBarPeer { */ public void handleKeyPress(XEvent xev) { XKeyEvent xkey = xev.get_xkey(); - if (log.isLoggable(Level.FINE)) log.fine(xkey.toString()); + if (log.isLoggable(PlatformLogger.FINE)) log.fine(xkey.toString()); if (isEventDisabled(xev)) { return; } diff --git a/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java b/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java index ec80cebcec..032426a616 100644 --- a/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java +++ b/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java @@ -28,8 +28,6 @@ import java.awt.*; import java.awt.peer.*; import java.awt.event.*; -import java.util.logging.*; - import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; @@ -43,8 +41,6 @@ public class XMenuItemPeer implements MenuItemPeer { * ************************************************/ - private static Logger log = Logger.getLogger("sun.awt.X11.XMenuItemPeer"); - /* * Primary members */ diff --git a/src/solaris/classes/sun/awt/X11/XMenuPeer.java b/src/solaris/classes/sun/awt/X11/XMenuPeer.java index d5e217fe86..9aed53ec84 100644 --- a/src/solaris/classes/sun/awt/X11/XMenuPeer.java +++ b/src/solaris/classes/sun/awt/X11/XMenuPeer.java @@ -29,7 +29,7 @@ import java.awt.peer.*; import java.lang.reflect.Field; import java.util.Vector; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; import sun.awt.SunToolkit; public class XMenuPeer extends XMenuItemPeer implements MenuPeer { @@ -39,7 +39,7 @@ public class XMenuPeer extends XMenuItemPeer implements MenuPeer { * Data members * ************************************************/ - private static Logger log = Logger.getLogger("sun.awt.X11.XMenuPeer"); + private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XMenuPeer"); /** * Window that correspond to this menu @@ -122,7 +122,7 @@ public class XMenuPeer extends XMenuItemPeer implements MenuPeer { * for adding separators */ public void addSeparator() { - if (log.isLoggable(Level.FINER)) log.finer("addSeparator is not implemented"); + if (log.isLoggable(PlatformLogger.FINER)) log.finer("addSeparator is not implemented"); } public void addItem(MenuItem item) { @@ -130,7 +130,7 @@ public class XMenuPeer extends XMenuItemPeer implements MenuPeer { if (menuWindow != null) { menuWindow.addItem(item); } else { - if (log.isLoggable(Level.FINE)) { + if (log.isLoggable(PlatformLogger.FINE)) { log.fine("Attempt to use XMenuWindowPeer without window"); } } @@ -141,7 +141,7 @@ public class XMenuPeer extends XMenuItemPeer implements MenuPeer { if (menuWindow != null) { menuWindow.delItem(index); } else { - if (log.isLoggable(Level.FINE)) { + if (log.isLoggable(PlatformLogger.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 8a722b1335..1fdb71104d 100644 --- a/src/solaris/classes/sun/awt/X11/XMenuWindow.java +++ b/src/solaris/classes/sun/awt/X11/XMenuWindow.java @@ -32,7 +32,7 @@ import java.awt.image.BufferedImage; import java.awt.geom.Point2D; import java.util.Vector; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; public class XMenuWindow extends XBaseMenuWindow { @@ -42,7 +42,7 @@ public class XMenuWindow extends XBaseMenuWindow { * ************************************************/ - private static Logger log = Logger.getLogger("sun.awt.X11.XMenuWindow"); + private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XMenuWindow"); /* * Primary members @@ -399,7 +399,7 @@ public class XMenuWindow extends XBaseMenuWindow { if (!isCreated()) { return; } - if (log.isLoggable(Level.FINER)) { + if (log.isLoggable(PlatformLogger.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 1bc8829d9b..86252721be 100644 --- a/src/solaris/classes/sun/awt/X11/XNETProtocol.java +++ b/src/solaris/classes/sun/awt/X11/XNETProtocol.java @@ -27,14 +27,13 @@ package sun.awt.X11; import java.awt.Frame; -import java.util.logging.Level; -import java.util.logging.Logger; +import sun.util.logging.PlatformLogger; final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProtocol { - private final static Logger log = Logger.getLogger("sun.awt.X11.XNETProtocol"); - private final static Logger iconLog = Logger.getLogger("sun.awt.X11.icon.XNETProtocol"); - private static Logger stateLog = Logger.getLogger("sun.awt.X11.states.XNETProtocol"); + private final static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XNETProtocol"); + private final static PlatformLogger iconLog = PlatformLogger.getLogger("sun.awt.X11.icon.XNETProtocol"); + private static PlatformLogger stateLog = PlatformLogger.getLogger("sun.awt.X11.states.XNETProtocol"); /** * XStateProtocol @@ -44,7 +43,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt } public void setState(XWindowPeer window, int state) { - if (log.isLoggable(Level.FINE)) log.fine("Setting state of " + window + " to " + state); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Setting state of " + window + " to " + state); if (window.isShowing()) { requestState(window, state); } else { @@ -54,7 +53,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt private void setInitialState(XWindowPeer window, int state) { XAtomList old_state = window.getNETWMState(); - log.log(Level.FINE, "Current state of the window {0} is {1}", new Object[] {window, old_state}); + log.fine("Current state of the window {0} is {1}", window, old_state); if ((state & Frame.MAXIMIZED_VERT) != 0) { old_state.add(XA_NET_WM_STATE_MAXIMIZED_VERT); } else { @@ -65,7 +64,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt } else { old_state.remove(XA_NET_WM_STATE_MAXIMIZED_HORZ); } - log.log(Level.FINE, "Setting initial state of the window {0} to {1}", new Object[] {window, old_state}); + log.fine("Setting initial state of the window {0} to {1}", window, old_state); window.setNETWMState(old_state); } @@ -98,7 +97,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt default: return; } - if (log.isLoggable(Level.FINE)) log.fine("Requesting state on " + window + " for " + state); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Requesting state on " + window + " for " + state); req.set_type((int)XConstants.ClientMessage); req.set_window(window.getWindow()); req.set_message_type(XA_NET_WM_STATE.getAtom()); @@ -180,7 +179,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); - log.log(Level.FINE, "Setting _NET_STATE atom {0} on {1} for {2}", new Object[] {state, window, Boolean.valueOf(isAdd)}); + log.fine("Setting _NET_STATE atom {0} on {1} for {2}", state, window, Boolean.valueOf(isAdd)); XToolkit.awtLock(); try { XlibWrapper.XSendEvent(XToolkit.getDisplay(), @@ -205,20 +204,20 @@ 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) { - log.log(Level.FINER, "Window visibility is: withdrawn={0}, visible={1}, mapped={2} showing={3}", - new Object[] {Boolean.valueOf(window.isWithdrawn()), Boolean.valueOf(window.isVisible()), - Boolean.valueOf(window.isMapped()), Boolean.valueOf(window.isShowing())}); + 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())); if (window.isShowing()) { requestState(window, state, set); } else { XAtomList net_wm_state = window.getNETWMState(); - log.log(Level.FINE, "Current state on {0} is {1}", new Object[] {window, net_wm_state}); + log.finer("Current state on {0} is {1}", window, net_wm_state); if (!set) { net_wm_state.remove(state); } else { net_wm_state.add(state); } - log.log(Level.FINE, "Setting states on {0} to {1}", new Object[] {window, net_wm_state}); + log.fine("Setting states on {0} to {1}", window, net_wm_state); window.setNETWMState(net_wm_state); } XToolkit.XSync(); @@ -272,7 +271,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt } NetWindow = checkAnchor(XA_NET_SUPPORTING_WM_CHECK, XAtom.XA_WINDOW); supportChecked = true; - if (log.isLoggable(Level.FINE)) log.fine("### " + this + " is active: " + (NetWindow != 0)); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("### " + this + " is active: " + (NetWindow != 0)); } boolean active() { @@ -309,7 +308,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt if (net_wm_name_string == null) { return false; } - if (log.isLoggable(Level.FINE)) log.fine("### WM_NAME = " + net_wm_name_string); + if (log.isLoggable(PlatformLogger.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 55fcfb5743..7eba1b8ef6 100644 --- a/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java +++ b/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java @@ -33,7 +33,7 @@ import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; import java.util.Vector; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; import sun.awt.SunToolkit; @@ -44,7 +44,7 @@ public class XPopupMenuPeer extends XMenuWindow implements PopupMenuPeer { * Data members * ************************************************/ - private static Logger log = Logger.getLogger("sun.awt.X11.XBaseMenuWindow"); + private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XBaseMenuWindow"); /* * Primary members @@ -146,7 +146,7 @@ public class XPopupMenuPeer extends XMenuWindow implements PopupMenuPeer { * for adding separators */ public void addSeparator() { - if (log.isLoggable(Level.FINER)) log.finer("addSeparator is not implemented"); + if (log.isLoggable(PlatformLogger.FINER)) log.finer("addSeparator is not implemented"); } /* @@ -382,7 +382,7 @@ public class XPopupMenuPeer extends XMenuWindow implements PopupMenuPeer { */ public void handleKeyPress(XEvent xev) { XKeyEvent xkey = xev.get_xkey(); - if (log.isLoggable(Level.FINE)) { + if (log.isLoggable(PlatformLogger.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 328f1a8877..44e10f84a2 100644 --- a/src/solaris/classes/sun/awt/X11/XProtocol.java +++ b/src/solaris/classes/sun/awt/X11/XProtocol.java @@ -25,12 +25,12 @@ package sun.awt.X11; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; import java.util.*; class XProtocol { - private final static Logger log = Logger.getLogger("sun.awt.X11.XProtocol"); + private final static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XProtocol"); private Map<XAtom, XAtomList> atomToList = new HashMap<XAtom, XAtomList>(); private Map<XAtom, Long> atomToAnchor = new HashMap<XAtom, Long>(); @@ -54,7 +54,7 @@ class XProtocol { } finally { if (firstCheck) { firstCheck = false; - log.log(Level.FINE, "{0}:{1} supports {2}", new Object[] {this, listName, protocols}); + log.fine("{0}:{1} supports {2}", this, listName, protocols); } } } diff --git a/src/solaris/classes/sun/awt/X11/XQueryTree.java b/src/solaris/classes/sun/awt/X11/XQueryTree.java index eaace18e9f..c352cbb5ea 100644 --- a/src/solaris/classes/sun/awt/X11/XQueryTree.java +++ b/src/solaris/classes/sun/awt/X11/XQueryTree.java @@ -28,11 +28,9 @@ package sun.awt.X11; import sun.misc.Unsafe; -import java.util.logging.*; public class XQueryTree { private static Unsafe unsafe = XlibWrapper.unsafe; - private static final Logger log = Logger.getLogger("sun.awt.X11.XQueryTree"); private boolean __executed = false; long _w; long root_ptr = unsafe.allocateMemory(Native.getLongSize()); diff --git a/src/solaris/classes/sun/awt/X11/XScrollbar.java b/src/solaris/classes/sun/awt/X11/XScrollbar.java index 6e4bd8cd2f..6c26c47785 100644 --- a/src/solaris/classes/sun/awt/X11/XScrollbar.java +++ b/src/solaris/classes/sun/awt/X11/XScrollbar.java @@ -30,14 +30,14 @@ import java.awt.event.*; import java.awt.image.BufferedImage; import sun.awt.SunToolkit; import sun.awt.X11GraphicsConfig; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; /** * A simple vertical scroll bar. */ abstract class XScrollbar { - private static Logger log = Logger.getLogger("sun.awt.X11.XScrollbar"); + private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XScrollbar"); /** * The thread that asynchronously tells the scrollbar to scroll. * @see #startScrolling @@ -118,7 +118,7 @@ abstract class XScrollbar { abstract protected void rebuildArrows(); public void setSize(int width, int height) { - if (log.isLoggable(Level.FINER)) log.finer("Setting scroll bar " + this + " size to " + width + "x" + height); + if (log.isLoggable(PlatformLogger.FINER)) log.finer("Setting scroll bar " + this + " size to " + width + "x" + height); this.width = width; this.height = height; } @@ -164,7 +164,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(Level.FINER)) log.finer("Painting scrollbar " + this); + if (log.isLoggable(PlatformLogger.FINER)) log.finer("Painting scrollbar " + this); boolean useBufferedImage = false; Graphics2D g2 = null; @@ -454,7 +454,7 @@ abstract class XScrollbar { return; } - if (log.isLoggable(Level.FINER)) { + if (log.isLoggable(PlatformLogger.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 f90bde0cd2..a5e6d3e5f8 100644 --- a/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java +++ b/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java @@ -28,10 +28,10 @@ package sun.awt.X11; import java.awt.*; import java.awt.event.*; import java.awt.peer.*; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; class XScrollbarPeer extends XComponentPeer implements ScrollbarPeer, XScrollbarClient { - private final static Logger log = Logger.getLogger("sun.awt.X11.XScrollbarPeer"); + private final static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XScrollbarPeer"); private static final int DEFAULT_LENGTH = 50; private static final int DEFAULT_WIDTH_SOLARIS = 19; @@ -162,7 +162,7 @@ class XScrollbarPeer extends XComponentPeer implements ScrollbarPeer, XScrollbar public void handleJavaKeyEvent(KeyEvent event) { super.handleJavaKeyEvent(event); - if (log.isLoggable(Level.FINEST)) log.finer("KeyEvent on scrollbar: " + event); + if (log.isLoggable(PlatformLogger.FINEST)) log.finer("KeyEvent on scrollbar: " + event); if (!(event.isConsumed()) && event.getID() == KeyEvent.KEY_RELEASED) { switch(event.getKeyCode()) { case KeyEvent.VK_UP: diff --git a/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java b/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java index 83ba45ccbe..1fa4e43619 100644 --- a/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java +++ b/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java @@ -27,14 +27,14 @@ package sun.awt.X11; import java.awt.*; import java.awt.peer.SystemTrayPeer; -import java.util.logging.Logger; import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; import sun.awt.SunToolkit; import sun.awt.AppContext; +import sun.util.logging.PlatformLogger; public class XSystemTrayPeer implements SystemTrayPeer, XMSelectionListener { - private static final Logger log = Logger.getLogger("sun.awt.X11.XSystemTrayPeer"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XSystemTrayPeer"); SystemTray target; static XSystemTrayPeer peerInstance; // there is only one SystemTray peer per application diff --git a/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java b/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java index 8d0d79e8a2..981478fd78 100644 --- a/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java +++ b/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java @@ -52,12 +52,13 @@ import javax.swing.border.Border; import com.sun.java.swing.plaf.motif.*; import java.awt.im.InputMethodRequests; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; + import sun.awt.CausedFocusEvent; import sun.awt.ComponentAccessor; public class XTextFieldPeer extends XComponentPeer implements TextFieldPeer { - private static final Logger log = Logger.getLogger("sun.awt.X11.XTextField"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XTextField"); String text; XAWTTextField xtext; @@ -256,7 +257,7 @@ public class XTextFieldPeer extends XComponentPeer implements TextFieldPeer { } public void setBackground(Color c) { - if (log.isLoggable(Level.FINE)) log.fine("target="+ target + ", old=" + background + ", new=" + c); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("target="+ target + ", old=" + background + ", new=" + c); background = c; if (xtext != null) { xtext.setBackground(c); diff --git a/src/solaris/classes/sun/awt/X11/XToolkit.java b/src/solaris/classes/sun/awt/X11/XToolkit.java index 9cb6da03c7..9aa13b9307 100644 --- a/src/solaris/classes/sun/awt/X11/XToolkit.java +++ b/src/solaris/classes/sun/awt/X11/XToolkit.java @@ -46,8 +46,6 @@ import java.lang.reflect.Method; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.LookAndFeel; import javax.swing.UIDefaults; import sun.awt.*; @@ -56,13 +54,14 @@ import sun.font.FontManager; import sun.misc.PerformanceLogger; import sun.print.PrintJob2D; import sun.security.action.GetBooleanAction; +import sun.util.logging.PlatformLogger; public final class XToolkit extends UNIXToolkit implements Runnable { - private static Logger log = Logger.getLogger("sun.awt.X11.XToolkit"); - private static Logger eventLog = Logger.getLogger("sun.awt.X11.event.XToolkit"); - private static final Logger timeoutTaskLog = Logger.getLogger("sun.awt.X11.timeoutTask.XToolkit"); - private static Logger keyEventLog = Logger.getLogger("sun.awt.X11.kye.XToolkit"); - private static final Logger backingStoreLog = Logger.getLogger("sun.awt.X11.backingStore.XToolkit"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XToolkit"); + private static final PlatformLogger eventLog = PlatformLogger.getLogger("sun.awt.X11.event.XToolkit"); + private static final PlatformLogger timeoutTaskLog = PlatformLogger.getLogger("sun.awt.X11.timeoutTask.XToolkit"); + private static final PlatformLogger keyEventLog = PlatformLogger.getLogger("sun.awt.X11.kye.XToolkit"); + private static final PlatformLogger backingStoreLog = PlatformLogger.getLogger("sun.awt.X11.backingStore.XToolkit"); //There is 400 ms is set by default on Windows and 500 by default on KDE and GNOME. //We use the same hardcoded constant. @@ -181,13 +180,13 @@ public final class XToolkit extends UNIXToolkit implements Runnable { // Default XErrorHandler may just terminate the process. Don't call it. // return XlibWrapper.CallErrorHandler(saved_error_handler, display, error.pData); } - if (log.isLoggable(Level.FINE)) { - log.log(Level.FINE, "Unhandled XErrorEvent: " + - "id=" + error.get_resourceid() + ", " + - "serial=" + error.get_serial() + ", " + - "ec=" + error.get_error_code() + ", " + - "rc=" + error.get_request_code() + ", " + - "mc=" + error.get_minor_code()); + if (log.isLoggable(PlatformLogger.FINE)) { + log.fine("Unhandled XErrorEvent: " + + "id=" + error.get_resourceid() + ", " + + "serial=" + error.get_serial() + ", " + + "ec=" + error.get_error_code() + ", " + + "rc=" + error.get_request_code() + ", " + + "mc=" + error.get_minor_code()); } return 0; } @@ -206,7 +205,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { return SAVED_ERROR_HANDLER(display, event); } } catch (Throwable z) { - log.log(Level.FINE, "Error in GlobalErrorHandler", z); + log.fine("Error in GlobalErrorHandler", z); } return 0; } @@ -324,7 +323,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { ((XAWTXSettings)xs).dispose(); } freeXKB(); - if (log.isLoggable(Level.FINE)) { + if (log.isLoggable(PlatformLogger.FINE)) { dumpPeers(); } @@ -567,8 +566,8 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } static void processException(Throwable thr) { - if (log.isLoggable(Level.WARNING)) { - log.log(Level.WARNING, "Exception on Toolkit thread", thr); + if (log.isLoggable(PlatformLogger.WARNING)) { + log.warning("Exception on Toolkit thread", thr); } } @@ -629,8 +628,8 @@ public final class XToolkit extends UNIXToolkit implements Runnable { continue; } - if (eventLog.isLoggable(Level.FINER)) { - eventLog.log(Level.FINER, "{0}", ev); + if (eventLog.isLoggable(PlatformLogger.FINER)) { + eventLog.finer("{0}", ev); } // Check if input method consumes the event @@ -645,13 +644,13 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } } } - if( keyEventLog.isLoggable(Level.FINE) && (ev.get_type() == XConstants.KeyPress || ev.get_type() == XConstants.KeyRelease) ) { + if( keyEventLog.isLoggable(PlatformLogger.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(Level.FINE) && (ev.get_type() == XConstants.KeyPress || ev.get_type() == XConstants.KeyRelease) ) { + if( keyEventLog.isLoggable(PlatformLogger.FINE) && (ev.get_type() == XConstants.KeyPress || ev.get_type() == XConstants.KeyRelease) ) { keyEventLog.fine("after XFilterEvent:"+ev); // IS THIS CORRECT? } @@ -1338,7 +1337,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } static void dumpPeers() { - if (log.isLoggable(Level.FINE)) { + if (log.isLoggable(PlatformLogger.FINE)) { log.fine("Mapped windows:"); Iterator iter = winMap.entrySet().iterator(); while (iter.hasNext()) { @@ -1434,7 +1433,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(Level.FINE)) log.fine("Catched exception, timeStamp may not be correct (ie = " + ie + ")"); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Catched exception, timeStamp may not be correct (ie = " + ie + ")"); } } finally { awtUnlock(); @@ -1767,7 +1766,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } finally { awtUnlock(); } - if (log.isLoggable(Level.FINE)) { + if (log.isLoggable(PlatformLogger.FINE)) { log.fine("metaMask = " + metaMask); log.fine("altMask = " + altMask); log.fine("numLockMask = " + numLockMask); @@ -1789,11 +1788,11 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } awtLock(); try { - if (timeoutTaskLog.isLoggable(Level.FINER)) { + if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) { timeoutTaskLog.finer("Removing task " + task); } if (timeoutTasks == null) { - if (timeoutTaskLog.isLoggable(Level.FINER)) { + if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) { timeoutTaskLog.finer("Task is not scheduled"); } return; @@ -1840,11 +1839,11 @@ public final class XToolkit extends UNIXToolkit implements Runnable { awtLock(); try { - if (timeoutTaskLog.isLoggable(Level.FINER)) { - timeoutTaskLog.log(Level.FINER, "XToolkit.schedule(): current time={0}" + - "; interval={1}" + - "; task being added={2}" + "; tasks before addition={3}", new Object[] { - Long.valueOf(System.currentTimeMillis()), Long.valueOf(interval), task, timeoutTasks}); + if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) { + timeoutTaskLog.finer("XToolkit.schedule(): current time={0}" + + "; interval={1}" + + "; task being added={2}" + "; tasks before addition={3}", + Long.valueOf(System.currentTimeMillis()), Long.valueOf(interval), task, timeoutTasks); } if (timeoutTasks == null) { @@ -1887,9 +1886,9 @@ public final class XToolkit extends UNIXToolkit implements Runnable { * Called from run() under awtLock. */ private static void callTimeoutTasks() { - if (timeoutTaskLog.isLoggable(Level.FINER)) { - timeoutTaskLog.log(Level.FINER, "XToolkit.callTimeoutTasks(): current time={0}" + - "; tasks={1}", new Object[] {Long.valueOf(System.currentTimeMillis()), timeoutTasks}); + if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) { + timeoutTaskLog.finer("XToolkit.callTimeoutTasks(): current time={0}" + + "; tasks={1}", Long.valueOf(System.currentTimeMillis()), timeoutTasks); } if (timeoutTasks == null || timeoutTasks.isEmpty()) { @@ -1905,9 +1904,9 @@ public final class XToolkit extends UNIXToolkit implements Runnable { for (Iterator iter = tasks.iterator(); iter.hasNext();) { Runnable task = (Runnable)iter.next(); - if (timeoutTaskLog.isLoggable(Level.FINER)) { - timeoutTaskLog.log(Level.FINER, "XToolkit.callTimeoutTasks(): current time={0}" + - "; about to run task={1}", new Object[] {Long.valueOf(currentTime), task}); + if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) { + timeoutTaskLog.finer("XToolkit.callTimeoutTasks(): current time={0}" + + "; about to run task={1}", Long.valueOf(currentTime), task); } try { @@ -1980,7 +1979,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { */ long current_time_utc = System.currentTimeMillis(); - if (log.isLoggable(Level.FINER)) { + if (log.isLoggable(PlatformLogger.FINER)) { log.finer("reset_time=" + reset_time_utc + ", current_time=" + current_time_utc + ", server_offset=" + server_offset + ", wrap_time=" + WRAP_TIME_MILLIS); } @@ -1989,7 +1988,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { reset_time_utc = System.currentTimeMillis() - getCurrentServerTime(); } - if (log.isLoggable(Level.FINER)) { + if (log.isLoggable(PlatformLogger.FINER)) { log.finer("result = " + (reset_time_utc + server_offset)); } return reset_time_utc + server_offset; @@ -2074,14 +2073,14 @@ public final class XToolkit extends UNIXToolkit implements Runnable { if (prop == null) { backingStoreType = XConstants.NotUseful; - if (backingStoreLog.isLoggable(Level.CONFIG)) { + if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) { backingStoreLog.config("The system property sun.awt.backingStore is not set" + ", by default backingStore=NotUseful"); } return; } - if (backingStoreLog.isLoggable(Level.CONFIG)) { + if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) { backingStoreLog.config("The system property sun.awt.backingStore is " + prop); } prop = prop.toLowerCase(); @@ -2093,7 +2092,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { backingStoreType = XConstants.NotUseful; } - if (backingStoreLog.isLoggable(Level.CONFIG)) { + if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) { backingStoreLog.config("backingStore(as provided by the system property)=" + ( backingStoreType == XConstants.NotUseful ? "NotUseful" : backingStoreType == XConstants.WhenMapped ? @@ -2103,7 +2102,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { if (sun.java2d.x11.X11SurfaceData.isDgaAvailable()) { backingStoreType = XConstants.NotUseful; - if (backingStoreLog.isLoggable(Level.CONFIG)) { + if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) { backingStoreLog.config("DGA is available, backingStore=NotUseful"); } @@ -2118,7 +2117,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { == XConstants.NotUseful) { backingStoreType = XConstants.NotUseful; - if (backingStoreLog.isLoggable(Level.CONFIG)) { + if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) { backingStoreLog.config("Backing store is not available on the screen " + i + ", backingStore=NotUseful"); } @@ -2364,7 +2363,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"); - eventLog.log(Level.FINER, "WM_S0 selection owner {0}", new Object[] {XlibWrapper.XGetSelectionOwner(getDisplay(), atom.getAtom())}); + eventLog.finer("WM_S0 selection owner {0}", XlibWrapper.XGetSelectionOwner(getDisplay(), atom.getAtom())); XlibWrapper.XConvertSelection(getDisplay(), atom.getAtom(), XAtom.get("VERSION").getAtom(), oops.getAtom(), win.getWindow(), XConstants.CurrentTime); @@ -2390,7 +2389,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { // If selection update failed we can simply wait some time // hoping some events will arrive awtUnlock(); - eventLog.log(Level.FINEST, "Emergency sleep"); + eventLog.finest("Emergency sleep"); try { Thread.sleep(WORKAROUND_SLEEP); } catch (InterruptedException ie) { @@ -2402,7 +2401,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable { return getEventNumber() - event_number > 2; } finally { removeEventDispatcher(win.getWindow(), oops_waiter); - eventLog.log(Level.FINER, "Exiting syncNativeQueue"); + eventLog.finer("Exiting syncNativeQueue"); awtUnlock(); } } diff --git a/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java b/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java index b1243abacf..da4a6b0d43 100644 --- a/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java +++ b/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java @@ -31,18 +31,17 @@ import java.awt.peer.TrayIconPeer; import sun.awt.*; import java.awt.image.*; import java.text.BreakIterator; -import java.util.logging.Logger; -import java.util.logging.Level; import java.util.concurrent.ArrayBlockingQueue; import java.security.AccessController; import java.security.PrivilegedAction; import java.lang.reflect.InvocationTargetException; +import sun.util.logging.PlatformLogger; public class XTrayIconPeer implements TrayIconPeer, InfoWindow.Balloon.LiveArguments, InfoWindow.Tooltip.LiveArguments { - private static final Logger ctrLog = Logger.getLogger("sun.awt.X11.XTrayIconPeer.centering"); + private static final PlatformLogger ctrLog = PlatformLogger.getLogger("sun.awt.X11.XTrayIconPeer.centering"); TrayIcon target; TrayIconEventProxy eventProxy; @@ -107,9 +106,9 @@ public class XTrayIconPeer implements TrayIconPeer, XConfigureEvent ce = ev.get_xconfigure(); - ctrLog.log(Level.FINE, "ConfigureNotify on parent of {0}: {1}x{2}+{3}+{4} (old: {5}+{6})", - new Object[] { XTrayIconPeer.this, ce.get_width(), ce.get_height(), - ce.get_x(), ce.get_y(), old_x, old_y }); + 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); // A workaround for Gnome/Metacity (it doesn't affect the behaviour on KDE). // On Metacity the EmbeddedFrame's parent window bounds are larger @@ -129,14 +128,14 @@ 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. - ctrLog.log(Level.FINE, "ConfigureNotify on parent of {0}. Skipping as intermediate resizing.", - XTrayIconPeer.this); + ctrLog.fine("ConfigureNotify on parent of {0}. Skipping as intermediate resizing.", + XTrayIconPeer.this); return; } else if (ce.get_height() > TRAY_ICON_HEIGHT) { - ctrLog.log(Level.FINE, "ConfigureNotify on parent of {0}. Centering by \"Y\".", - XTrayIconPeer.this); + ctrLog.fine("ConfigureNotify on parent of {0}. Centering by \"Y\".", + XTrayIconPeer.this); XlibWrapper.XMoveResizeWindow(XToolkit.getDisplay(), eframeParentID, ce.get_x(), @@ -148,8 +147,8 @@ public class XTrayIconPeer implements TrayIconPeer, } else if (ce.get_width() > TRAY_ICON_WIDTH) { - ctrLog.log(Level.FINE, "ConfigureNotify on parent of {0}. Centering by \"X\".", - XTrayIconPeer.this); + ctrLog.fine("ConfigureNotify on parent of {0}. Centering by \"X\".", + XTrayIconPeer.this); XlibWrapper.XMoveResizeWindow(XToolkit.getDisplay(), eframeParentID, ce.get_x()+ce.get_width()/2 - TRAY_ICON_WIDTH/2, @@ -166,8 +165,8 @@ public class XTrayIconPeer implements TrayIconPeer, if (ex_height != 0) { - ctrLog.log(Level.FINE, "ConfigureNotify on parent of {0}. Move detected. Centering by \"Y\".", - XTrayIconPeer.this); + ctrLog.fine("ConfigureNotify on parent of {0}. Move detected. Centering by \"Y\".", + XTrayIconPeer.this); XlibWrapper.XMoveWindow(XToolkit.getDisplay(), eframeParentID, ce.get_x(), @@ -175,15 +174,15 @@ public class XTrayIconPeer implements TrayIconPeer, } else if (ex_width != 0) { - ctrLog.log(Level.FINE, "ConfigureNotify on parent of {0}. Move detected. Centering by \"X\".", - XTrayIconPeer.this); + ctrLog.fine("ConfigureNotify on parent of {0}. Move detected. Centering by \"X\".", + XTrayIconPeer.this); XlibWrapper.XMoveWindow(XToolkit.getDisplay(), eframeParentID, ce.get_x() + ex_width/2 - TRAY_ICON_WIDTH/2, ce.get_y()); } else { - ctrLog.log(Level.FINE, "ConfigureNotify on parent of {0}. Move detected. Skipping.", - XTrayIconPeer.this); + ctrLog.fine("ConfigureNotify on parent of {0}. Move detected. Skipping.", + XTrayIconPeer.this); } } old_x = ce.get_x(); diff --git a/src/solaris/classes/sun/awt/X11/XWINProtocol.java b/src/solaris/classes/sun/awt/X11/XWINProtocol.java index 83b676a1a6..fae0ec11ac 100644 --- a/src/solaris/classes/sun/awt/X11/XWINProtocol.java +++ b/src/solaris/classes/sun/awt/X11/XWINProtocol.java @@ -27,11 +27,10 @@ package sun.awt.X11; import java.awt.*; -import java.util.logging.Level; -import java.util.logging.Logger; +import sun.util.logging.PlatformLogger; class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol { - final static Logger log = Logger.getLogger("sun.awt.X11.XWINProtocol"); + final static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XWINProtocol"); /* Gnome WM spec */ XAtom XA_WIN_SUPPORTING_WM_CHECK = XAtom.get("_WIN_SUPPORTING_WM_CHECK"); @@ -64,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(Level.FINE)) log.fine("Sending WIN_STATE to root to change the state to " + win_state); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Sending WIN_STATE to root to change the state to " + win_state); try { XToolkit.awtLock(); XlibWrapper.XSendEvent(XToolkit.getDisplay(), @@ -112,7 +111,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol { win_state &= ~WIN_STATE_MAXIMIZED_HORIZ; } if ((old_win_state ^ win_state) != 0) { - if (log.isLoggable(Level.FINE)) log.fine("Setting WIN_STATE on " + window + " to change the state to " + win_state); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Setting WIN_STATE on " + window + " to change the state to " + win_state); XA_WIN_STATE.setCard32Property(window, win_state); } } @@ -157,7 +156,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(Level.FINE)) log.fine("Setting layer " + layer + " by root message : " + req); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Setting layer " + layer + " by root message : " + req); XToolkit.awtLock(); try { XlibWrapper.XSendEvent(XToolkit.getDisplay(), @@ -172,7 +171,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol { } req.dispose(); } else { - if (log.isLoggable(Level.FINE)) log.fine("Setting layer property to " + layer); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Setting layer property to " + layer); XA_WIN_LAYER.setCard32Property(window, layer == LAYER_NORMAL ? WIN_LAYER_NORMAL : WIN_LAYER_ONTOP); } } @@ -198,7 +197,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol { } WinWindow = checkAnchor(XA_WIN_SUPPORTING_WM_CHECK, XAtom.XA_CARDINAL); supportChecked = true; - if (log.isLoggable(Level.FINE)) log.fine("### " + this + " is active: " + (WinWindow != 0)); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("### " + this + " is active: " + (WinWindow != 0)); } boolean active() { @@ -207,13 +206,13 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol { } boolean doStateProtocol() { boolean res = active() && checkProtocol(XA_WIN_PROTOCOLS, XA_WIN_STATE); - if (log.isLoggable(Level.FINE)) log.fine("### " + this + " supports state: " + res); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("### " + this + " supports state: " + res); return res; } boolean doLayerProtocol() { boolean res = active() && checkProtocol(XA_WIN_PROTOCOLS, XA_WIN_LAYER); - if (log.isLoggable(Level.FINE)) log.fine("### " + this + " supports layer: " + res); + if (log.isLoggable(PlatformLogger.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 4d49dee60e..d37d24a7f9 100644 --- a/src/solaris/classes/sun/awt/X11/XWM.java +++ b/src/solaris/classes/sun/awt/X11/XWM.java @@ -37,10 +37,10 @@ import java.awt.Rectangle; import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; -import java.util.logging.Level; -import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; +import sun.util.logging.PlatformLogger; + /** * Class incapsulating knowledge about window managers in general @@ -49,9 +49,9 @@ import java.util.regex.Pattern; final class XWM { - private final static Logger log = Logger.getLogger("sun.awt.X11.XWM"); - private final static Logger insLog = Logger.getLogger("sun.awt.X11.insets.XWM"); - private final static Logger stateLog = Logger.getLogger("sun.awt.X11.states.XWM"); + private final static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XWM"); + private final static PlatformLogger insLog = PlatformLogger.getLogger("sun.awt.X11.insets.XWM"); + private final static PlatformLogger stateLog = PlatformLogger.getLogger("sun.awt.X11.states.XWM"); static final XAtom XA_MWM_HINTS = new XAtom(); @@ -142,7 +142,7 @@ final class XWM XWM(int WMID) { this.WMID = WMID; initializeProtocols(); - if (log.isLoggable(Level.FINE)) log.fine("Window manager: " + toString()); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Window manager: " + toString()); } int getID() { return WMID; @@ -246,7 +246,7 @@ final class XWM * having a window manager running. I.e. it does not reparent * top level shells. */ - if (insLog.isLoggable(Level.FINE)) { + if (insLog.isLoggable(PlatformLogger.FINE)) { insLog.finer("eXcursion means NO_WM"); } return true; @@ -264,7 +264,7 @@ final class XWM long selection_owner = XlibWrapper.XGetSelectionOwner(XToolkit.getDisplay(), XAtom.get(selection_name).getAtom()); - if (insLog.isLoggable(Level.FINE)) { + if (insLog.isLoggable(PlatformLogger.FINE)) { insLog.finer("selection owner of " + selection_name + " is " + selection_owner); } @@ -293,7 +293,7 @@ final class XWM XToolkit.getDefaultRootWindow(), XConstants.CWEventMask, substruct.pData); - if (insLog.isLoggable(Level.FINE)) { + if (insLog.isLoggable(PlatformLogger.FINE)) { insLog.finer("It looks like there is no WM thus NO_WM"); } } @@ -355,7 +355,7 @@ final class XWM return 0; } } catch (Exception e) { - if (log.isLoggable(Level.FINER)) { + if (log.isLoggable(PlatformLogger.FINER)) { e.printStackTrace(); } return 0; @@ -401,7 +401,7 @@ final class XWM static boolean isCDE() { if (!XA_DT_SM_WINDOW_INFO.isInterned()) { - log.log(Level.FINER, "{0} is not interned", new Object[] {XA_DT_SM_WINDOW_INFO}); + log.finer("{0} is not interned", XA_DT_SM_WINDOW_INFO); return false; } @@ -432,7 +432,7 @@ final class XWM /* Now check that this window has _DT_SM_STATE_INFO (ignore contents) */ if (!XA_DT_SM_STATE_INFO.isInterned()) { - log.log(Level.FINER, "{0} is not interned", new Object[] {XA_DT_SM_STATE_INFO}); + log.finer("{0} is not interned", XA_DT_SM_STATE_INFO); return false; } WindowPropertyGetter getter2 = @@ -596,7 +596,7 @@ final class XWM */ if (!XA_ICEWM_WINOPTHINT.isInterned()) { - log.log(Level.FINER, "{0} is not interned", new Object[] {XA_ICEWM_WINOPTHINT}); + log.finer("{0} is not interned", XA_ICEWM_WINOPTHINT); return false; } @@ -629,7 +629,7 @@ final class XWM */ static boolean isIceWM() { if (!XA_ICEWM_WINOPTHINT.isInterned()) { - log.log(Level.FINER, "{0} is not interned", new Object[] {XA_ICEWM_WINOPTHINT}); + log.finer("{0} is not interned", XA_ICEWM_WINOPTHINT); return false; } @@ -694,7 +694,7 @@ final class XWM return wm; } static int getWMID() { - if (insLog.isLoggable(Level.FINEST)) { + if (insLog.isLoggable(PlatformLogger.FINEST)) { insLog.finest("awt_wmgr = " + awt_wmgr); } /* @@ -718,7 +718,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(Level.FINE) && l_net_protocol.active()) { + if (log.isLoggable(PlatformLogger.FINE) && l_net_protocol.active()) { log.fine("_NET_WM_NAME is " + l_net_protocol.getWMName()); } XWINProtocol win = g_win_protocol = new XWINProtocol(); @@ -798,7 +798,7 @@ final class XWM } hints.set_flags(hints.get_flags() & ~mask); - if (insLog.isLoggable(Level.FINER)) insLog.finer("Setting hints, flags " + XlibWrapper.hintsToString(hints.get_flags())); + if (insLog.isLoggable(PlatformLogger.FINER)) insLog.finer("Setting hints, flags " + XlibWrapper.hintsToString(hints.get_flags())); XlibWrapper.XSetWMNormalHints(XToolkit.getDisplay(), window.getWindow(), hints.pData); @@ -855,7 +855,7 @@ final class XWM XAtomList decorDel = new XAtomList(); decorations = normalizeMotifDecor(decorations); - if (insLog.isLoggable(Level.FINER)) insLog.finer("Setting OL_DECOR to " + Integer.toBinaryString(decorations)); + if (insLog.isLoggable(PlatformLogger.FINER)) insLog.finer("Setting OL_DECOR to " + Integer.toBinaryString(decorations)); if ((decorations & MWMConstants.MWM_DECOR_TITLE) == 0) { decorDel.add(XA_OL_DECOR_HEADER); } @@ -872,7 +872,7 @@ final class XWM insLog.finer("Deleting OL_DECOR"); XA_OL_DECOR_DEL.DeleteProperty(window); } else { - if (insLog.isLoggable(Level.FINER)) insLog.finer("Setting OL_DECOR to " + decorDel); + if (insLog.isLoggable(PlatformLogger.FINER)) insLog.finer("Setting OL_DECOR to " + decorDel); XA_OL_DECOR_DEL.setAtomListProperty(window, decorDel); } } @@ -900,7 +900,7 @@ final class XWM hints.set_functions(functions); hints.set_decorations(decorations); - if (stateLog.isLoggable(Level.FINER)) stateLog.finer("Setting MWM_HINTS to " + hints); + if (stateLog.isLoggable(PlatformLogger.FINER)) stateLog.finer("Setting MWM_HINTS to " + hints); window.setMWMHints(hints); } @@ -962,7 +962,7 @@ final class XWM * Make specified shell resizable. */ static void setShellResizable(XDecoratedPeer window) { - if (insLog.isLoggable(Level.FINE)) insLog.fine("Setting shell resizable " + window); + if (insLog.isLoggable(PlatformLogger.FINE)) insLog.fine("Setting shell resizable " + window); XToolkit.awtLock(); try { Rectangle shellBounds = window.getShellBounds(); @@ -992,7 +992,7 @@ final class XWM static void setShellNotResizable(XDecoratedPeer window, WindowDimensions newDimensions, Rectangle shellBounds, boolean justChangeSize) { - if (insLog.isLoggable(Level.FINE)) insLog.fine("Setting non-resizable shell " + window + ", dimensions " + newDimensions + + if (insLog.isLoggable(PlatformLogger.FINE)) insLog.fine("Setting non-resizable shell " + window + ", dimensions " + newDimensions + ", shellBounds " + shellBounds +", just change size: " + justChangeSize); XToolkit.awtLock(); try { @@ -1285,7 +1285,7 @@ final class XWM res = defaultInsets; } } - if (insLog.isLoggable(Level.FINEST)) insLog.finest("WM guessed insets: " + res); + if (insLog.isLoggable(PlatformLogger.FINEST)) insLog.finest("WM guessed insets: " + res); return res; } /* @@ -1354,7 +1354,7 @@ final class XWM XNETProtocol net_protocol = getWM().getNETProtocol(); if (net_protocol != null && net_protocol.active()) { Insets insets = getInsetsFromProp(window, XA_NET_FRAME_EXTENTS); - insLog.log(Level.FINE, "_NET_FRAME_EXTENTS: {0}", insets); + insLog.fine("_NET_FRAME_EXTENTS: {0}", insets); if (insets != null) { return insets; @@ -1495,7 +1495,7 @@ final class XWM * [mwm, e!, kwin, fvwm2 ... ] */ Insets correctWM = XWM.getInsetsFromExtents(window); - insLog.log(Level.FINER, "Got insets from property: {0}", correctWM); + insLog.finer("Got insets from property: {0}", correctWM); if (correctWM == null) { correctWM = new Insets(0,0,0,0); @@ -1556,7 +1556,7 @@ final class XWM } case XWM.OTHER_WM: default: { /* this is very similar to the E! case above */ - insLog.log(Level.FINEST, "Getting correct insets for OTHER_WM/default, parent: {0}", parent); + insLog.finest("Getting correct insets for OTHER_WM/default, parent: {0}", parent); syncTopLevelPos(parent, lwinAttr); int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(), window, lwinAttr.pData); @@ -1583,8 +1583,8 @@ 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()) { - insLog.log(Level.FINEST, "Double reparenting detected, pattr({2})={0}, lwinAttr({3})={1}", - new Object[] {lwinAttr, pattr, parent, window}); + insLog.finest("Double reparenting detected, pattr({2})={0}, lwinAttr({3})={1}", + lwinAttr, pattr, parent, window); lwinAttr.set_x(pattr.get_x()); lwinAttr.set_y(pattr.get_y()); lwinAttr.set_border_width(lwinAttr.get_border_width()+pattr.get_border_width()); @@ -1611,8 +1611,8 @@ final class XWM * widths and inner/outer distinction, so for the time * being, just ignore it. */ - insLog.log(Level.FINEST, "Attrs before calculation: pattr({2})={0}, lwinAttr({3})={1}", - new Object[] {lwinAttr, pattr, parent, window}); + insLog.finest("Attrs before calculation: pattr({2})={0}, lwinAttr({3})={1}", + lwinAttr, pattr, parent, window); correctWM = new Insets(lwinAttr.get_y() + lwinAttr.get_border_width(), lwinAttr.get_x() + lwinAttr.get_border_width(), pattr.get_height() - (lwinAttr.get_y() + lwinAttr.get_height() + 2*lwinAttr.get_border_width()), diff --git a/src/solaris/classes/sun/awt/X11/XWindow.java b/src/solaris/classes/sun/awt/X11/XWindow.java index f1c3c675b6..8c44c32808 100644 --- a/src/solaris/classes/sun/awt/X11/XWindow.java +++ b/src/solaris/classes/sun/awt/X11/XWindow.java @@ -35,8 +35,7 @@ import java.lang.ref.WeakReference; import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.util.logging.Level; -import java.util.logging.Logger; +import sun.util.logging.PlatformLogger; import sun.awt.*; @@ -46,11 +45,11 @@ import sun.java2d.SunGraphics2D; import sun.java2d.SurfaceData; public class XWindow extends XBaseWindow implements X11ComponentPeer { - private static Logger log = Logger.getLogger("sun.awt.X11.XWindow"); - private static Logger insLog = Logger.getLogger("sun.awt.X11.insets.XWindow"); - private static Logger eventLog = Logger.getLogger("sun.awt.X11.event.XWindow"); - private static final Logger focusLog = Logger.getLogger("sun.awt.X11.focus.XWindow"); - private static Logger keyEventLog = Logger.getLogger("sun.awt.X11.kye.XWindow"); + private static PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XWindow"); + private static PlatformLogger insLog = PlatformLogger.getLogger("sun.awt.X11.insets.XWindow"); + private static PlatformLogger eventLog = PlatformLogger.getLogger("sun.awt.X11.event.XWindow"); + private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.awt.X11.focus.XWindow"); + private static PlatformLogger keyEventLog = PlatformLogger.getLogger("sun.awt.X11.kye.XWindow"); /* If a motion comes in while a multi-click is pending, * allow a smudge factor so that moving the mouse by a small * amount does not wipe out the multi-click state variables. @@ -414,7 +413,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { ((Component)e.getSource()).dispatchEvent(e); } }, PeerEvent.ULTIMATE_PRIORITY_EVENT); - if (focusLog.isLoggable(Level.FINER) && (e instanceof FocusEvent)) focusLog.finer("Sending " + e); + if (focusLog.isLoggable(PlatformLogger.FINER) && (e instanceof FocusEvent)) focusLog.finer("Sending " + e); XToolkit.postEvent(XToolkit.targetToAppContext(e.getSource()), pe); } @@ -670,7 +669,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { if (isEventDisabled(xev)) { return; } - if (eventLog.isLoggable(Level.FINE)) eventLog.fine(xbe.toString()); + if (eventLog.isLoggable(PlatformLogger.FINE)) eventLog.fine(xbe.toString()); long when; int modifiers; boolean popupTrigger = false; @@ -704,7 +703,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { /* multiclick checking */ - if (eventLog.isLoggable(Level.FINEST)) eventLog.finest("lastWindow = " + lastWindow + ", lastButton " + if (eventLog.isLoggable(PlatformLogger.FINEST)) eventLog.finest("lastWindow = " + lastWindow + ", lastButton " + lastButton + ", lastTime " + lastTime + ", multiClickTime " + XToolkit.getMultiClickTime()); if (lastWindow == this && lastButton == lbutton && (when - lastTime) < XToolkit.getMultiClickTime()) { @@ -895,7 +894,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { super.handleXCrossingEvent(xev); XCrossingEvent xce = xev.get_xcrossing(); - if (eventLog.isLoggable(Level.FINEST)) eventLog.finest(xce.toString()); + if (eventLog.isLoggable(PlatformLogger.FINEST)) eventLog.finest(xce.toString()); if (xce.get_type() == XConstants.EnterNotify) { enterNotify(xce.get_window()); @@ -997,8 +996,8 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { Rectangle oldBounds = getBounds(); super.handleConfigureNotifyEvent(xev); - insLog.log(Level.FINER, "Configure, {0}, event disabled: {1}", - new Object[] {xev.get_xconfigure(), isEventDisabled(xev)}); + insLog.finer("Configure, {0}, event disabled: {1}", + xev.get_xconfigure(), isEventDisabled(xev)); if (isEventDisabled(xev)) { return; } @@ -1017,7 +1016,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { public void handleMapNotifyEvent(XEvent xev) { super.handleMapNotifyEvent(xev); - log.log(Level.FINE, "Mapped {0}", new Object[] {this}); + log.fine("Mapped {0}", this); if (isEventDisabled(xev)) { return; } @@ -1074,7 +1073,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { public void handleKeyPress(XEvent xev) { super.handleKeyPress(xev); XKeyEvent ev = xev.get_xkey(); - if (eventLog.isLoggable(Level.FINE)) eventLog.fine(ev.toString()); + if (eventLog.isLoggable(PlatformLogger.FINE)) eventLog.fine(ev.toString()); if (isEventDisabled(xev)) { return; } @@ -1087,14 +1086,14 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { int unicodeKey = 0; keysym[0] = XConstants.NoSymbol; - if (keyEventLog.isLoggable(Level.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.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(Level.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.FINE)) { keyEventLog.fine("--XWindow.java XIM did process event; return; dec keysym processed:"+(keysym[0])+ "; hex keysym processed:"+Long.toHexString(keysym[0]) ); @@ -1102,7 +1101,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { return; }else { unicodeKey = keysymToUnicode( keysym[0], ev.get_state() ); - if (keyEventLog.isLoggable(Level.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.FINE)) { keyEventLog.fine("--XWindow.java XIM did NOT process event, hex keysym:"+Long.toHexString(keysym[0])+"\n"+ " unicode key:"+Integer.toHexString((int)unicodeKey)); } @@ -1112,7 +1111,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(Level.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.FINE)) { keyEventLog.fine("--XWindow.java XIM is absent; hex keysym:"+Long.toHexString(keysym[0])+"\n"+ " unicode key:"+Integer.toHexString((int)unicodeKey)); } @@ -1135,7 +1134,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(Level.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.FINE)) { keyEventLog.fine(">>>Fire Event:"+ (ev.get_type() == XConstants.KeyPress ? "KEY_PRESSED; " : "KEY_RELEASED; ")+ "jkeycode:decimal="+jkc.getJavaKeycode()+ @@ -1178,7 +1177,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { public void handleKeyRelease(XEvent xev) { super.handleKeyRelease(xev); XKeyEvent ev = xev.get_xkey(); - if (eventLog.isLoggable(Level.FINE)) eventLog.fine(ev.toString()); + if (eventLog.isLoggable(PlatformLogger.FINE)) eventLog.fine(ev.toString()); if (isEventDisabled(xev)) { return; } @@ -1190,7 +1189,7 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { int unicodeKey = 0; keysym[0] = XConstants.NoSymbol; - if (keyEventLog.isLoggable(Level.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.FINE)) { logIncomingKeyEvent( ev ); } // Keysym should be converted to Unicode, if possible and necessary, @@ -1201,7 +1200,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(Level.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.FINE)) { keyEventLog.fine(">>>Fire Event:"+ (ev.get_type() == XConstants.KeyPress ? "KEY_PRESSED; " : "KEY_RELEASED; ")+ "jkeycode:decimal="+jkc.getJavaKeycode()+ @@ -1333,10 +1332,10 @@ 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()) { - log.log(Level.FINER, "Window {0} is not resizable", new Object[] {this}); + log.finer("Window {0} is not resizable", this); flags |= XUtilConstants.PMinSize | XUtilConstants.PMaxSize; } else { - log.log(Level.FINER, "Window {0} is resizable", new Object[] {this}); + log.finer("Window {0} is resizable", this); } setSizeHints(flags, x, y, width, height); } @@ -1344,10 +1343,10 @@ public class XWindow extends XBaseWindow implements X11ComponentPeer { void updateSizeHints(int x, int y) { long flags = isLocationByPlatform() ? 0 : (XUtilConstants.PPosition | XUtilConstants.USPosition); if (!isResizable()) { - log.log(Level.FINER, "Window {0} is not resizable", new Object[] {this}); + log.finer("Window {0} is not resizable", this); flags |= XUtilConstants.PMinSize | XUtilConstants.PMaxSize | XUtilConstants.PSize; } else { - log.log(Level.FINER, "Window {0} is resizable", new Object[] {this}); + log.finer("Window {0} is resizable", this); } setSizeHints(flags, x, y, width, height); } diff --git a/src/solaris/classes/sun/awt/X11/XWindowPeer.java b/src/solaris/classes/sun/awt/X11/XWindowPeer.java index b1646413b7..f87ec27c56 100644 --- a/src/solaris/classes/sun/awt/X11/XWindowPeer.java +++ b/src/solaris/classes/sun/awt/X11/XWindowPeer.java @@ -41,8 +41,7 @@ import java.util.Iterator; import java.util.Set; import java.util.Vector; -import java.util.logging.Level; -import java.util.logging.Logger; +import sun.util.logging.PlatformLogger; import sun.awt.AWTAccessor; import sun.awt.ComponentAccessor; @@ -58,11 +57,11 @@ import sun.java2d.pipe.Region; class XWindowPeer extends XPanelPeer implements WindowPeer, DisplayChangedListener { - private static final Logger log = Logger.getLogger("sun.awt.X11.XWindowPeer"); - private static final Logger focusLog = Logger.getLogger("sun.awt.X11.focus.XWindowPeer"); - private static final Logger insLog = Logger.getLogger("sun.awt.X11.insets.XWindowPeer"); - private static final Logger grabLog = Logger.getLogger("sun.awt.X11.grab.XWindowPeer"); - private static final Logger iconLog = Logger.getLogger("sun.awt.X11.icon.XWindowPeer"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XWindowPeer"); + private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.awt.X11.focus.XWindowPeer"); + private static final PlatformLogger insLog = PlatformLogger.getLogger("sun.awt.X11.insets.XWindowPeer"); + private static final PlatformLogger grabLog = PlatformLogger.getLogger("sun.awt.X11.grab.XWindowPeer"); + private static final PlatformLogger iconLog = PlatformLogger.getLogger("sun.awt.X11.icon.XWindowPeer"); // should be synchronized on awtLock private static Set<XWindowPeer> windows = new HashSet<XWindowPeer>(); @@ -201,7 +200,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, Window owner = t_window.getOwner(); if (owner != null) { ownerPeer = (XWindowPeer)owner.getPeer(); - if (focusLog.isLoggable(Level.FINER)) { + if (focusLog.isLoggable(PlatformLogger.FINER)) { focusLog.fine("Owner is " + owner); focusLog.fine("Owner peer is " + ownerPeer); focusLog.fine("Owner X window " + Long.toHexString(ownerPeer.getWindow())); @@ -214,7 +213,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, XToolkit.awtLock(); try { // Set WM_TRANSIENT_FOR - if (focusLog.isLoggable(Level.FINE)) focusLog.fine("Setting transient on " + Long.toHexString(getWindow()) + if (focusLog.isLoggable(PlatformLogger.FINE)) focusLog.fine("Setting transient on " + Long.toHexString(getWindow()) + " for " + Long.toHexString(ownerWindow)); setToplevelTransientFor(this, ownerPeer, false, true); @@ -259,7 +258,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(Level.FINEST)) { + if (log.isLoggable(PlatformLogger.FINEST)) { log.finest("XWindowPeer.updateIconImages: Skipping the image passed into Java because it's null."); } continue; @@ -268,7 +267,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, try { iconInfo = new XIconInfo(image); } catch (Exception e){ - if (log.isLoggable(Level.FINEST)) { + if (log.isLoggable(PlatformLogger.FINEST)) { log.finest("XWindowPeer.updateIconImages: Perhaps the image passed into Java is broken. Skipping this icon."); } continue; @@ -339,9 +338,9 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, } } - if (iconLog.isLoggable(Level.FINEST)) { - iconLog.log(Level.FINEST, ">>> Length_ of buffer of icons data: " + totalLength + - ", maximum length: " + MAXIMUM_BUFFER_LENGTH_NET_WM_ICON); + if (iconLog.isLoggable(PlatformLogger.FINEST)) { + iconLog.finest(">>> Length_ of buffer of icons data: " + totalLength + + ", maximum length: " + MAXIMUM_BUFFER_LENGTH_NET_WM_ICON); } return result; @@ -351,10 +350,10 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, * Dumps each icon from the list */ static void dumpIcons(java.util.List<XIconInfo> icons) { - if (iconLog.isLoggable(Level.FINEST)) { - iconLog.log(Level.FINEST, ">>> Sizes of icon images:"); + if (iconLog.isLoggable(PlatformLogger.FINEST)) { + iconLog.finest(">>> Sizes of icon images:"); for (Iterator<XIconInfo> i = icons.iterator(); i.hasNext(); ) { - iconLog.log(Level.FINEST, " {0}", i.next()); + iconLog.finest(" {0}", i.next()); } } } @@ -631,7 +630,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, return; } - if (log.isLoggable(Level.FINEST)) { + if (log.isLoggable(PlatformLogger.FINEST)) { log.finest("XWindowPeer: Check if we've been moved to a new screen since we're running in Xinerama mode"); } @@ -668,7 +667,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, } } if (newScreenNum != curScreenNum) { - if (log.isLoggable(Level.FINEST)) { + if (log.isLoggable(PlatformLogger.FINEST)) { log.finest("XWindowPeer: Moved to a new screen"); } executeDisplayChangedOnEDT(newGC); @@ -743,7 +742,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(Level.FINE)) focusLog.fine("Requesting window focus"); + if (focusLog.isLoggable(PlatformLogger.FINE)) focusLog.fine("Requesting window focus"); requestWindowFocus(time, timeProvided); } @@ -769,7 +768,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, public void handleFocusEvent(XEvent xev) { XFocusChangeEvent xfe = xev.get_xfocus(); FocusEvent fe; - focusLog.log(Level.FINE, "{0}", new Object[] {xfe}); + focusLog.fine("{0}", xfe); if (isEventDisabled(xev)) { return; } @@ -952,7 +951,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, } private void updateAlwaysOnTop() { - log.log(Level.FINE, "Promoting always-on-top state {0}", Boolean.valueOf(alwaysOnTop)); + log.fine("Promoting always-on-top state {0}", Boolean.valueOf(alwaysOnTop)); XWM.getWM().setLayer(this, alwaysOnTop ? XLayerProtocol.LAYER_ALWAYS_ON_TOP : @@ -1388,7 +1387,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, synchronized(getStateLock()) { XDialogPeer blockerPeer = (XDialogPeer) ComponentAccessor.getPeer(d); if (blocked) { - log.log(Level.FINE, "{0} is blocked by {1}", new Object[] { this, blockerPeer}); + log.fine("{0} is blocked by {1}", this, blockerPeer); modalBlocker = d; if (isReparented() || XWM.isNonReparentingWM()) { @@ -1741,7 +1740,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, } public void xSetVisible(boolean visible) { - if (log.isLoggable(Level.FINE)) log.fine("Setting visible on " + this + " to " + visible); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("Setting visible on " + this + " to " + visible); XToolkit.awtLock(); try { this.visible = visible; @@ -1864,9 +1863,9 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, public void handleXCrossingEvent(XEvent xev) { XCrossingEvent xce = xev.get_xcrossing(); - if (grabLog.isLoggable(Level.FINE)) { - grabLog.log(Level.FINE, "{0}, when grabbed {1}, contains {2}", - new Object[] {xce, isGrabbed(), containsGlobal(xce.get_x_root(), xce.get_y_root())}); + if (grabLog.isLoggable(PlatformLogger.FINE)) { + grabLog.fine("{0}, when grabbed {1}, contains {2}", + xce, isGrabbed(), containsGlobal(xce.get_x_root(), xce.get_y_root())); } if (isGrabbed()) { // When window is grabbed, all events are dispatched to @@ -1877,7 +1876,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()); - grabLog.log(Level.FINER, " - Grab event target {0}", new Object[] {target}); + grabLog.finer(" - Grab event target {0}", target); if (target != null && target != this) { target.dispatchEvent(xev); return; @@ -1888,9 +1887,9 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, public void handleMotionNotify(XEvent xev) { XMotionEvent xme = xev.get_xmotion(); - if (grabLog.isLoggable(Level.FINE)) { - grabLog.log(Level.FINER, "{0}, when grabbed {1}, contains {2}", - new Object[] {xme, isGrabbed(), containsGlobal(xme.get_x_root(), xme.get_y_root())}); + if (grabLog.isLoggable(PlatformLogger.FINE)) { + grabLog.finer("{0}, when grabbed {1}, contains {2}", + xme, isGrabbed(), containsGlobal(xme.get_x_root(), xme.get_y_root())); } if (isGrabbed()) { boolean dragging = false; @@ -1919,7 +1918,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, xme.set_x(localCoord.x); xme.set_y(localCoord.y); } - grabLog.log(Level.FINER, " - Grab event target {0}", new Object[] {target}); + grabLog.finer(" - Grab event target {0}", target); if (target != null) { if (target != getContentXWindow() && target != this) { target.dispatchEvent(xev); @@ -1951,9 +1950,9 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, if (xbe.get_button() > SunToolkit.MAX_BUTTONS_SUPPORTED) { return; } - if (grabLog.isLoggable(Level.FINE)) { - grabLog.log(Level.FINE, "{0}, when grabbed {1}, contains {2} ({3}, {4}, {5}x{6})", - new Object[] {xbe, isGrabbed(), containsGlobal(xbe.get_x_root(), xbe.get_y_root()), getAbsoluteX(), getAbsoluteY(), getWidth(), getHeight()}); + if (grabLog.isLoggable(PlatformLogger.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()); } if (isGrabbed()) { // When window is grabbed, all events are dispatched to @@ -1962,7 +1961,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, // translation) XBaseWindow target = XToolkit.windowToXWindow(xbe.get_window()); try { - grabLog.log(Level.FINER, " - Grab event target {0} (press target {1})", new Object[] {target, pressTarget}); + grabLog.finer(" - Grab event target {0} (press target {1})", target, pressTarget); if (xbe.get_type() == XConstants.ButtonPress && xbe.get_button() == XConstants.buttons[0]) { @@ -1995,7 +1994,7 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, // Outside this toplevel hierarchy // According to the specification of UngrabEvent, post it // when press occurs outside of the window and not on its owned windows - grabLog.log(Level.FINE, "Generating UngrabEvent on {0} because not inside of shell", this); + grabLog.fine("Generating UngrabEvent on {0} because not inside of shell", this); postEventToEventQueue(new sun.awt.UngrabEvent(getEventSource())); return; } @@ -2013,18 +2012,18 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, // toplevel == null - outside of // hierarchy, toplevel is Dialog - should // send ungrab (but shouldn't for Window) - grabLog.log(Level.FINE, "Generating UngrabEvent on {0} because hierarchy ended", this); + grabLog.fine("Generating UngrabEvent on {0} because hierarchy ended", this); postEventToEventQueue(new sun.awt.UngrabEvent(getEventSource())); } } else { // toplevel is null - outside of hierarchy - grabLog.log(Level.FINE, "Generating UngrabEvent on {0} because toplevel is null", this); + grabLog.fine("Generating UngrabEvent on {0} because toplevel is null", this); postEventToEventQueue(new sun.awt.UngrabEvent(getEventSource())); return; } } else { // target doesn't map to XAWT window - outside of hierarchy - grabLog.log(Level.FINE, "Generating UngrabEvent on because target is null {0}", this); + grabLog.fine("Generating UngrabEvent on because target is null {0}", this); postEventToEventQueue(new sun.awt.UngrabEvent(getEventSource())); return; } diff --git a/src/solaris/classes/sun/awt/X11/XWrapperBase.java b/src/solaris/classes/sun/awt/X11/XWrapperBase.java index 4a5e852915..50efd11c70 100644 --- a/src/solaris/classes/sun/awt/X11/XWrapperBase.java +++ b/src/solaris/classes/sun/awt/X11/XWrapperBase.java @@ -26,10 +26,10 @@ package sun.awt.X11; // This class serves as the base class for all the wrappers. -import java.util.logging.*; +import sun.util.logging.PlatformLogger; abstract class XWrapperBase { - static final Logger log = Logger.getLogger("sun.awt.X11.wrappers"); + static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.wrappers"); public String toString() { String ret = ""; diff --git a/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java b/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java index 3ad8662bf7..ac369326cc 100644 --- a/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java +++ b/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java @@ -27,7 +27,8 @@ import java.util.*; import java.io.*; import java.nio.charset.*; import java.text.MessageFormat; -import java.util.logging.*; +import java.util.logging.Level; +import java.util.logging.Logger; public class WrapperGenerator { /* XLibParser converts Xlib.h to a Java Object that encapsulates the @@ -835,7 +836,7 @@ public class WrapperGenerator { pw.println("package "+package_name+";\n"); pw.println("import sun.misc.*;\n"); - pw.println("import java.util.logging.*;"); + pw.println("import sun.util.logging.PlatformLogger;"); String baseClass = stp.getBaseClass(); if (baseClass == null) { baseClass = defaultBaseClass; diff --git a/src/solaris/classes/sun/awt/X11/keysym2ucs.h b/src/solaris/classes/sun/awt/X11/keysym2ucs.h index e2372ac3c2..32ecd66c98 100644 --- a/src/solaris/classes/sun/awt/X11/keysym2ucs.h +++ b/src/solaris/classes/sun/awt/X11/keysym2ucs.h @@ -67,8 +67,7 @@ tojava package sun.awt.X11; tojava import java.util.Hashtable; tojava import sun.misc.Unsafe; tojava -tojava import java.util.logging.Level; -tojava import java.util.logging.Logger; +tojava import sun.util.logging.PlatformLogger; tojava tojava public class XKeysym { tojava @@ -108,7 +107,7 @@ tojava // Another use for reverse lookup: query keyboard state, for some key tojava static Hashtable<Integer, Long> javaKeycode2KeysymHash = new Hashtable<Integer, Long>(); tojava static long keysym_lowercase = unsafe.allocateMemory(Native.getLongSize()); tojava static long keysym_uppercase = unsafe.allocateMemory(Native.getLongSize()); -tojava private static Logger keyEventLog = Logger.getLogger("sun.awt.X11.kye.XKeysym"); +tojava private static PlatformLogger keyEventLog = PlatformLogger.getLogger("sun.awt.X11.kye.XKeysym"); tojava public static char convertKeysym( long ks, int state ) { tojava tojava /* First check for Latin-1 characters (1:1 mapping) */ diff --git a/src/solaris/classes/sun/awt/X11FontManager.java b/src/solaris/classes/sun/awt/X11FontManager.java index 00bec1a4ae..fea46ff56c 100644 --- a/src/solaris/classes/sun/awt/X11FontManager.java +++ b/src/solaris/classes/sun/awt/X11FontManager.java @@ -13,7 +13,6 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.Vector; -import java.util.logging.Logger; import javax.swing.plaf.FontUIResource; import sun.awt.motif.MFontConfiguration; @@ -25,6 +24,7 @@ import sun.font.FcFontConfiguration; import sun.font.FontAccess; import sun.font.FontUtilities; import sun.font.NativeFont; +import sun.util.logging.PlatformLogger; /** * The X11 implementation of {@link FontManager}. @@ -369,7 +369,7 @@ public class X11FontManager extends SunFontManager { String sVal = (String) fontNameMap.get(fontID); if (FontUtilities.debugFonts()) { - Logger logger = FontUtilities.getLogger(); + PlatformLogger logger = FontUtilities.getLogger(); logger.info("file=" + fileName + " xlfd=" + fontPart); logger.info("fontID=" + fontID + diff --git a/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java b/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java index 466f4cadc4..6ea0756dd5 100644 --- a/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java +++ b/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java @@ -41,7 +41,6 @@ import java.net.SocketException; import java.net.UnknownHostException; import java.util.*; -import java.util.logging.*; import sun.awt.motif.MFontConfiguration; import sun.font.FcFontConfiguration; @@ -51,6 +50,7 @@ import sun.font.NativeFont; import sun.java2d.SunGraphicsEnvironment; import sun.java2d.SurfaceManagerFactory; import sun.java2d.UnixSurfaceManagerFactory; +import sun.util.logging.PlatformLogger; /** * This is an implementation of a GraphicsEnvironment object for the @@ -63,8 +63,8 @@ import sun.java2d.UnixSurfaceManagerFactory; public class X11GraphicsEnvironment extends SunGraphicsEnvironment { - private static final Logger log = Logger.getLogger("sun.awt.X11GraphicsEnvironment"); - private static final Logger screenLog = Logger.getLogger("sun.awt.screen.X11GraphicsEnvironment"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11GraphicsEnvironment"); + private static final PlatformLogger screenLog = PlatformLogger.getLogger("sun.awt.screen.X11GraphicsEnvironment"); private static Boolean xinerState; @@ -284,8 +284,8 @@ 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(Level.FINER)) { - screenLog.log(Level.FINER, "Running Xinerama: " + xinerState); + if (screenLog.isLoggable(PlatformLogger.FINER)) { + screenLog.finer("Running Xinerama: " + xinerState); } } return xinerState.booleanValue(); @@ -368,24 +368,24 @@ public class X11GraphicsEnvironment (unionRect.width / 2) + unionRect.x < center.x + 1 && (unionRect.height / 2) + unionRect.y < center.y + 1) { - if (screenLog.isLoggable(Level.FINER)) { - screenLog.log(Level.FINER, "Video Wall: center point is at center of all displays."); + if (screenLog.isLoggable(PlatformLogger.FINER)) { + screenLog.finer("Video Wall: center point is at center of all displays."); } return unionRect; } // next, check if at center of one monitor if (centerMonitorRect != null) { - if (screenLog.isLoggable(Level.FINER)) { - screenLog.log(Level.FINER, "Center point at center of a particular " + - "monitor, but not of the entire virtual display."); + if (screenLog.isLoggable(PlatformLogger.FINER)) { + screenLog.finer("Center point at center of a particular " + + "monitor, but not of the entire virtual display."); } return centerMonitorRect; } // otherwise, the center is at some weird spot: return unionRect - if (screenLog.isLoggable(Level.FINER)) { - screenLog.log(Level.FINER, "Center point is somewhere strange - return union of all bounds."); + if (screenLog.isLoggable(PlatformLogger.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 2ff014095e..ca7a324e72 100644 --- a/src/solaris/classes/sun/awt/X11InputMethod.java +++ b/src/solaris/classes/sun/awt/X11InputMethod.java @@ -57,7 +57,7 @@ import java.io.File; import java.io.FileReader; import java.io.BufferedReader; import java.io.IOException; -import java.util.logging.*; +import sun.util.logging.PlatformLogger; import java.util.StringTokenizer; import java.util.regex.Pattern; @@ -68,7 +68,7 @@ import java.util.regex.Pattern; * @author JavaSoft International */ public abstract class X11InputMethod extends InputMethodAdapter { - private static final Logger log = Logger.getLogger("sun.awt.X11InputMethod"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11InputMethod"); /* * The following XIM* values must be the same as those defined in * Xlib.h @@ -324,8 +324,8 @@ public abstract class X11InputMethod extends InputMethodAdapter { return; if (lastXICFocussedComponent != null){ - if (log.isLoggable(Level.FINE)) log.log(Level.FINE, "XICFocused {0}, AWTFocused {1}", new Object[] { - lastXICFocussedComponent, awtFocussedComponent}); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("XICFocused {0}, AWTFocused {1}", + lastXICFocussedComponent, awtFocussedComponent); } if (pData == 0) { diff --git a/src/solaris/classes/sun/awt/motif/MFontConfiguration.java b/src/solaris/classes/sun/awt/motif/MFontConfiguration.java index efb83a9f97..ab532d454e 100644 --- a/src/solaris/classes/sun/awt/motif/MFontConfiguration.java +++ b/src/solaris/classes/sun/awt/motif/MFontConfiguration.java @@ -30,10 +30,10 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; +import java.nio.charset.Charset; import java.util.HashMap; import java.util.HashSet; import java.util.Locale; -import java.util.logging.Logger; import java.util.Properties; import java.util.Scanner; import sun.awt.FontConfiguration; @@ -44,17 +44,17 @@ import sun.font.SunFontManager; import sun.font.FontManagerFactory; import sun.font.FontUtilities; import sun.java2d.SunGraphicsEnvironment; -import java.nio.charset.Charset; +import sun.util.logging.PlatformLogger; public class MFontConfiguration extends FontConfiguration { private static FontConfiguration fontConfig = null; - private static Logger logger; + private static PlatformLogger logger; public MFontConfiguration(SunFontManager fm) { super(fm); if (FontUtilities.debugFonts()) { - logger = Logger.getLogger("sun.awt.FontConfiguration"); + logger = PlatformLogger.getLogger("sun.awt.FontConfiguration"); } initTables(); } @@ -65,7 +65,7 @@ public class MFontConfiguration extends FontConfiguration { boolean preferPropFonts) { super(fm, preferLocaleFonts, preferPropFonts); if (FontUtilities.debugFonts()) { - logger = Logger.getLogger("sun.awt.FontConfiguration"); + logger = PlatformLogger.getLogger("sun.awt.FontConfiguration"); } initTables(); } diff --git a/src/solaris/classes/sun/awt/motif/MToolkit.java b/src/solaris/classes/sun/awt/motif/MToolkit.java index 52077e1938..318897a446 100644 --- a/src/solaris/classes/sun/awt/motif/MToolkit.java +++ b/src/solaris/classes/sun/awt/motif/MToolkit.java @@ -43,7 +43,6 @@ import java.security.PrivilegedExceptionAction; import java.util.Properties; import java.util.Map; import java.util.Iterator; -import java.util.logging.*; import sun.awt.AppContext; import sun.awt.AWTAutoShutdown; @@ -74,10 +73,11 @@ import sun.misc.PerformanceLogger; import sun.misc.Unsafe; import sun.security.action.GetBooleanAction; +import sun.util.logging.PlatformLogger; public class MToolkit extends UNIXToolkit implements Runnable { - private static final Logger log = Logger.getLogger("sun.awt.motif.MToolkit"); + private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.motif.MToolkit"); // the system clipboard - CLIPBOARD selection //X11Clipboard clipboard; @@ -617,8 +617,8 @@ public class MToolkit extends UNIXToolkit implements Runnable { protected Boolean lazilyLoadDynamicLayoutSupportedProperty(String name) { boolean nativeDynamic = isDynamicLayoutSupportedNative(); - if (log.isLoggable(Level.FINER)) { - log.log(Level.FINER, "nativeDynamic == " + nativeDynamic); + if (log.isLoggable(PlatformLogger.FINER)) { + log.finer("nativeDynamic == " + nativeDynamic); } return Boolean.valueOf(nativeDynamic); diff --git a/src/solaris/classes/sun/font/FcFontConfiguration.java b/src/solaris/classes/sun/font/FcFontConfiguration.java index 9d1f49d2a1..7699a943e5 100644 --- a/src/solaris/classes/sun/font/FcFontConfiguration.java +++ b/src/solaris/classes/sun/font/FcFontConfiguration.java @@ -35,7 +35,6 @@ import java.net.UnknownHostException; import java.nio.charset.Charset; import java.util.HashMap; import java.util.HashSet; -import java.util.logging.Logger; import java.util.Properties; import java.util.Scanner; import sun.awt.FontConfiguration; @@ -48,6 +47,7 @@ import sun.font.FontConfigManager.FontConfigInfo; import sun.font.FontConfigManager.FcCompFont; import sun.font.FontConfigManager.FontConfigFont; import sun.java2d.SunGraphicsEnvironment; +import sun.util.logging.PlatformLogger; public class FcFontConfiguration extends FontConfiguration { @@ -99,14 +99,11 @@ public class FcFontConfiguration extends FontConfiguration { writeFcInfo(); } catch (Exception e) { if (FontUtilities.debugFonts()) { - Logger logger = - Logger.getLogger("sun.awt.FontConfiguration"); - logger.warning("Exception writing fcInfo " + e); + warning("Exception writing fcInfo " + e); } } } else if (FontUtilities.debugFonts()) { - Logger logger = Logger.getLogger("sun.awt.FontConfiguration"); - logger.warning("Failed to get info from libfontconfig"); + warning("Failed to get info from libfontconfig"); } } else { fcm.populateFontConfig(fcCompFonts); @@ -329,8 +326,7 @@ public class FcFontConfiguration extends FontConfiguration { } } catch (Exception e) { if (FontUtilities.debugFonts()) { - Logger logger = Logger.getLogger("sun.awt.FontConfiguration"); - logger.warning("Exception identifying Linux distro."); + warning("Exception identifying Linux distro."); } } } @@ -402,13 +398,11 @@ public class FcFontConfiguration extends FontConfiguration { boolean renamed = tempFile.renameTo(fcInfoFile); if (!renamed && FontUtilities.debugFonts()) { System.out.println("rename failed"); - Logger logger = Logger.getLogger("sun.awt.FontConfiguration"); - logger.warning("Failed renaming file to "+ getFcInfoFile()); + warning("Failed renaming file to "+ getFcInfoFile()); } } catch (Exception e) { if (FontUtilities.debugFonts()) { - Logger logger = Logger.getLogger("sun.awt.FontConfiguration"); - logger.warning("IOException writing to "+ getFcInfoFile()); + warning("IOException writing to "+ getFcInfoFile()); } } } @@ -432,8 +426,7 @@ public class FcFontConfiguration extends FontConfiguration { fis.close(); } catch (IOException e) { if (FontUtilities.debugFonts()) { - Logger logger = Logger.getLogger("sun.awt.FontConfiguration"); - logger.warning("IOException reading from "+fcFile.toString()); + warning("IOException reading from "+fcFile.toString()); } return; } @@ -455,10 +448,7 @@ public class FcFontConfiguration extends FontConfiguration { } } catch (Exception e) { if (FontUtilities.debugFonts()) { - Logger logger = - Logger.getLogger("sun.awt.FontConfiguration"); - logger.warning("Exception parsing version " + - fcVersionStr); + warning("Exception parsing version " + fcVersionStr); } return; } @@ -521,9 +511,13 @@ public class FcFontConfiguration extends FontConfiguration { fcCompFonts = fci; } catch (Throwable t) { if (FontUtilities.debugFonts()) { - Logger logger = Logger.getLogger("sun.awt.FontConfiguration"); - logger.warning(t.toString()); + warning(t.toString()); } } } + + private static void warning(String msg) { + PlatformLogger logger = PlatformLogger.getLogger("sun.awt.FontConfiguration"); + logger.warning(msg); + } } diff --git a/src/solaris/classes/sun/font/FontConfigManager.java b/src/solaris/classes/sun/font/FontConfigManager.java index c9a865fe17..af9b08671c 100644 --- a/src/solaris/classes/sun/font/FontConfigManager.java +++ b/src/solaris/classes/sun/font/FontConfigManager.java @@ -26,10 +26,10 @@ package sun.font; import java.util.Locale; -import java.util.logging.Logger; import sun.awt.SunHints; import sun.awt.SunToolkit; +import sun.util.logging.PlatformLogger; /** * Small utility class to manage FontConfig. @@ -200,7 +200,7 @@ public class FontConfigManager { FcCompFont fci = fontArr[i]; if (fci.firstFont == null) { if (FontUtilities.isLogging()) { - Logger logger = FontUtilities.getLogger(); + PlatformLogger logger = FontUtilities.getLogger(); logger.info("Fontconfig returned no font for " + fontArr[i].fcName); } @@ -212,7 +212,7 @@ public class FontConfigManager { if (anyFont == null) { if (FontUtilities.isLogging()) { - Logger logger = FontUtilities.getLogger(); + PlatformLogger logger = FontUtilities.getLogger(); logger.info("Fontconfig returned no fonts at all."); return; } @@ -228,7 +228,7 @@ public class FontConfigManager { if (FontUtilities.isLogging()) { - Logger logger = FontUtilities.getLogger(); + PlatformLogger logger = FontUtilities.getLogger(); long t1 = System.nanoTime(); logger.info("Time spent accessing fontconfig=" |