--- a/jdk/src/solaris/classes/sun/awt/X11/XWM.java Sun Jun 16 22:36:41 2013 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11/XWM.java Mon Jun 17 14:09:25 2013 +0100
@@ -148,7 +148,7 @@
XWM(int WMID) {
this.WMID = WMID;
initializeProtocols();
- if (log.isLoggable(PlatformLogger.FINE)) {
+ if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Window manager: " + toString());
}
}
@@ -254,7 +254,7 @@
* having a window manager running. I.e. it does not reparent
* top level shells.
*/
- if (insLog.isLoggable(PlatformLogger.FINER)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("eXcursion means NO_WM");
}
return true;
@@ -272,7 +272,7 @@
long selection_owner =
XlibWrapper.XGetSelectionOwner(XToolkit.getDisplay(),
XAtom.get(selection_name).getAtom());
- if (insLog.isLoggable(PlatformLogger.FINER)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("selection owner of " + selection_name
+ " is " + selection_owner);
}
@@ -301,7 +301,7 @@
XToolkit.getDefaultRootWindow(),
XConstants.CWEventMask,
substruct.pData);
- if (insLog.isLoggable(PlatformLogger.FINER)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("It looks like there is no WM thus NO_WM");
}
}
@@ -345,7 +345,7 @@
byte[] bytes = XlibWrapper.getStringBytes(getter.getData());
String id = new String(bytes);
- if (log.isLoggable(PlatformLogger.FINER)) {
+ if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("ENLIGHTENMENT_COMMS is " + id);
}
@@ -354,15 +354,15 @@
try {
Matcher match = winIdPat.matcher(id);
if (match.matches()) {
- if (log.isLoggable(PlatformLogger.FINEST)) {
+ if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Match group count: " + match.groupCount());
}
String longId = match.group(1);
- if (log.isLoggable(PlatformLogger.FINEST)) {
+ if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Match group 1 " + longId);
}
long winid = Long.parseLong(longId, 16);
- if (log.isLoggable(PlatformLogger.FINER)) {
+ if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Enlightenment communication window " + winid);
}
return winid;
@@ -371,7 +371,7 @@
return 0;
}
} catch (Exception e) {
- if (log.isLoggable(PlatformLogger.FINER)) {
+ if (log.isLoggable(PlatformLogger.Level.FINER)) {
e.printStackTrace();
}
return 0;
@@ -417,7 +417,7 @@
static boolean isCDE() {
if (!XA_DT_SM_WINDOW_INFO.isInterned()) {
- if (log.isLoggable(PlatformLogger.FINER)) {
+ if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("{0} is not interned", XA_DT_SM_WINDOW_INFO);
}
return false;
@@ -450,7 +450,7 @@
/* Now check that this window has _DT_SM_STATE_INFO (ignore contents) */
if (!XA_DT_SM_STATE_INFO.isInterned()) {
- if (log.isLoggable(PlatformLogger.FINER)) {
+ if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("{0} is not interned", XA_DT_SM_STATE_INFO);
}
return false;
@@ -624,7 +624,7 @@
*/
if (!XA_ICEWM_WINOPTHINT.isInterned()) {
- if (log.isLoggable(PlatformLogger.FINER)) {
+ if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("{0} is not interned", XA_ICEWM_WINOPTHINT);
}
return false;
@@ -660,7 +660,7 @@
*/
static boolean isIceWM() {
if (!XA_ICEWM_WINOPTHINT.isInterned()) {
- if (log.isLoggable(PlatformLogger.FINER)) {
+ if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("{0} is not interned", XA_ICEWM_WINOPTHINT);
}
return false;
@@ -673,7 +673,7 @@
try {
int status = getter.execute();
boolean res = (status == XConstants.Success && getter.getActualType() != 0);
- if (log.isLoggable(PlatformLogger.FINER)) {
+ if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Status getting XA_ICEWM_WINOPTHINT: " + !res);
}
return !res || isNetWMName("IceWM");
@@ -729,7 +729,7 @@
return wm;
}
static int getWMID() {
- if (insLog.isLoggable(PlatformLogger.FINEST)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
insLog.finest("awt_wmgr = " + awt_wmgr);
}
/*
@@ -753,7 +753,7 @@
// Later, WM will initialize its own version of protocol
XNETProtocol l_net_protocol = g_net_protocol = new XNETProtocol();
l_net_protocol.detect();
- if (log.isLoggable(PlatformLogger.FINE) && l_net_protocol.active()) {
+ if (log.isLoggable(PlatformLogger.Level.FINE) && l_net_protocol.active()) {
log.fine("_NET_WM_NAME is " + l_net_protocol.getWMName());
}
XWINProtocol win = g_win_protocol = new XWINProtocol();
@@ -837,7 +837,7 @@
}
hints.set_flags(hints.get_flags() & ~mask);
- if (insLog.isLoggable(PlatformLogger.FINER)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Setting hints, flags " + XlibWrapper.hintsToString(hints.get_flags()));
}
XlibWrapper.XSetWMNormalHints(XToolkit.getDisplay(),
@@ -896,7 +896,7 @@
XAtomList decorDel = new XAtomList();
decorations = normalizeMotifDecor(decorations);
- if (insLog.isLoggable(PlatformLogger.FINER)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Setting OL_DECOR to " + Integer.toBinaryString(decorations));
}
if ((decorations & MWMConstants.MWM_DECOR_TITLE) == 0) {
@@ -915,7 +915,7 @@
insLog.finer("Deleting OL_DECOR");
XA_OL_DECOR_DEL.DeleteProperty(window);
} else {
- if (insLog.isLoggable(PlatformLogger.FINER)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Setting OL_DECOR to " + decorDel);
}
XA_OL_DECOR_DEL.setAtomListProperty(window, decorDel);
@@ -945,7 +945,7 @@
hints.set_functions(functions);
hints.set_decorations(decorations);
- if (stateLog.isLoggable(PlatformLogger.FINER)) {
+ if (stateLog.isLoggable(PlatformLogger.Level.FINER)) {
stateLog.finer("Setting MWM_HINTS to " + hints);
}
window.setMWMHints(hints);
@@ -1009,7 +1009,7 @@
* Make specified shell resizable.
*/
static void setShellResizable(XDecoratedPeer window) {
- if (insLog.isLoggable(PlatformLogger.FINE)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Setting shell resizable " + window);
}
XToolkit.awtLock();
@@ -1041,7 +1041,7 @@
static void setShellNotResizable(XDecoratedPeer window, WindowDimensions newDimensions, Rectangle shellBounds,
boolean justChangeSize)
{
- if (insLog.isLoggable(PlatformLogger.FINE)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Setting non-resizable shell " + window + ", dimensions " + newDimensions +
", shellBounds " + shellBounds +", just change size: " + justChangeSize);
}
@@ -1175,7 +1175,7 @@
stateLog.finer("WithdrawnState");
return false;
} else {
- if (stateLog.isLoggable(PlatformLogger.FINER)) {
+ if (stateLog.isLoggable(PlatformLogger.Level.FINER)) {
stateLog.finer("Window WM_STATE is " + wm_state);
}
}
@@ -1186,7 +1186,7 @@
for (XStateProtocol proto : getProtocols(XStateProtocol.class)) {
is_state_change |= proto.isStateChange(e);
- if (stateLog.isLoggable(PlatformLogger.FINEST)) {
+ if (stateLog.isLoggable(PlatformLogger.Level.FINEST)) {
stateLog.finest(proto + ": is state changed = " + is_state_change);
}
}
@@ -1340,7 +1340,7 @@
res = defaultInsets;
}
}
- if (insLog.isLoggable(PlatformLogger.FINEST)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
insLog.finest("WM guessed insets: " + res);
}
return res;
@@ -1411,7 +1411,7 @@
XNETProtocol net_protocol = getWM().getNETProtocol();
if (net_protocol != null && net_protocol.active()) {
Insets insets = getInsetsFromProp(window, XA_NET_FRAME_EXTENTS);
- if (insLog.isLoggable(PlatformLogger.FINE)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("_NET_FRAME_EXTENTS: {0}", insets);
}
@@ -1554,7 +1554,7 @@
* [mwm, e!, kwin, fvwm2 ... ]
*/
Insets correctWM = XWM.getInsetsFromExtents(window);
- if (insLog.isLoggable(PlatformLogger.FINER)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Got insets from property: {0}", correctWM);
}
@@ -1617,7 +1617,7 @@
}
case XWM.OTHER_WM:
default: { /* this is very similar to the E! case above */
- if (insLog.isLoggable(PlatformLogger.FINEST)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
insLog.finest("Getting correct insets for OTHER_WM/default, parent: {0}", parent);
}
syncTopLevelPos(parent, lwinAttr);
@@ -1646,7 +1646,7 @@
&& lwinAttr.get_width()+2*lwinAttr.get_border_width() == pattr.get_width()
&& lwinAttr.get_height()+2*lwinAttr.get_border_width() == pattr.get_height())
{
- if (insLog.isLoggable(PlatformLogger.FINEST)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
insLog.finest("Double reparenting detected, pattr({2})={0}, lwinAttr({3})={1}",
lwinAttr, pattr, parent, window);
}
@@ -1676,7 +1676,7 @@
* widths and inner/outer distinction, so for the time
* being, just ignore it.
*/
- if (insLog.isLoggable(PlatformLogger.FINEST)) {
+ if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
insLog.finest("Attrs before calculation: pattr({2})={0}, lwinAttr({3})={1}",
lwinAttr, pattr, parent, window);
}