--- old/src/solaris/classes/sun/awt/X11/XWindow.java Fri Jun 14 15:16:37 2013 +++ new/src/solaris/classes/sun/awt/X11/XWindow.java Fri Jun 14 15:16:36 2013 @@ -402,7 +402,7 @@ ((Component)e.getSource()).dispatchEvent(e); } }, PeerEvent.ULTIMATE_PRIORITY_EVENT); - if (focusLog.isLoggable(PlatformLogger.FINER) && (e instanceof FocusEvent)) { + if (focusLog.isLoggable(PlatformLogger.Level.FINER) && (e instanceof FocusEvent)) { focusLog.finer("Sending " + e); } XToolkit.postEvent(XToolkit.targetToAppContext(e.getSource()), pe); @@ -662,7 +662,7 @@ if (isEventDisabled(xev)) { return; } - if (eventLog.isLoggable(PlatformLogger.FINE)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINE)) { eventLog.fine(xbe.toString()); } long when; @@ -698,7 +698,7 @@ /* multiclick checking */ - if (eventLog.isLoggable(PlatformLogger.FINEST)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) { eventLog.finest("lastWindow = " + lastWindow + ", lastButton " + lastButton + ", lastTime " + lastTime + ", multiClickTime " + XToolkit.getMultiClickTime()); @@ -891,7 +891,7 @@ super.handleXCrossingEvent(xev); XCrossingEvent xce = xev.get_xcrossing(); - if (eventLog.isLoggable(PlatformLogger.FINEST)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) { eventLog.finest(xce.toString()); } @@ -995,7 +995,7 @@ Rectangle oldBounds = getBounds(); super.handleConfigureNotifyEvent(xev); - if (insLog.isLoggable(PlatformLogger.FINER)) { + if (insLog.isLoggable(PlatformLogger.Level.FINER)) { insLog.finer("Configure, {0}, event disabled: {1}", xev.get_xconfigure(), isEventDisabled(xev)); } @@ -1017,7 +1017,7 @@ public void handleMapNotifyEvent(XEvent xev) { super.handleMapNotifyEvent(xev); - if (log.isLoggable(PlatformLogger.FINE)) { + if (log.isLoggable(PlatformLogger.Level.FINE)) { log.fine("Mapped {0}", this); } if (isEventDisabled(xev)) { @@ -1041,7 +1041,7 @@ } private void dumpKeysymArray(XKeyEvent ev) { - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine(" "+Long.toHexString(XlibWrapper.XKeycodeToKeysym(XToolkit.getDisplay(), ev.get_keycode(), 0))+ "\n "+Long.toHexString(XlibWrapper.XKeycodeToKeysym(XToolkit.getDisplay(), ev.get_keycode(), 1))+ "\n "+Long.toHexString(XlibWrapper.XKeycodeToKeysym(XToolkit.getDisplay(), ev.get_keycode(), 2))+ @@ -1071,11 +1071,11 @@ //return (uni > 0? uni + 0x01000000 : 0); } void logIncomingKeyEvent(XKeyEvent ev) { - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine("--XWindow.java:handleKeyEvent:"+ev); } dumpKeysymArray(ev); - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine("XXXXXXXXXXXXXX javakeycode will be most probably:0x"+ Integer.toHexString(XKeysym.getJavaKeycodeOnly(ev))); } } @@ -1082,7 +1082,7 @@ public void handleKeyPress(XEvent xev) { super.handleKeyPress(xev); XKeyEvent ev = xev.get_xkey(); - if (eventLog.isLoggable(PlatformLogger.FINE)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINE)) { eventLog.fine(ev.toString()); } if (isEventDisabled(xev)) { @@ -1097,7 +1097,7 @@ int unicodeKey = 0; keysym[0] = XConstants.NoSymbol; - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { logIncomingKeyEvent( ev ); } if ( //TODO check if there's an active input method instance @@ -1104,7 +1104,7 @@ // without calling a native method. Is it necessary though? haveCurrentX11InputMethodInstance()) { if (x11inputMethodLookupString(ev.pData, keysym)) { - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine("--XWindow.java XIM did process event; return; dec keysym processed:"+(keysym[0])+ "; hex keysym processed:"+Long.toHexString(keysym[0]) ); @@ -1112,7 +1112,7 @@ return; }else { unicodeKey = keysymToUnicode( keysym[0], ev.get_state() ); - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine("--XWindow.java XIM did NOT process event, hex keysym:"+Long.toHexString(keysym[0])+"\n"+ " unicode key:"+Integer.toHexString((int)unicodeKey)); } @@ -1122,7 +1122,7 @@ // Produce do-it-yourself keysym and perhaps unicode character. keysym[0] = xkeycodeToKeysym(ev); unicodeKey = keysymToUnicode( keysym[0], ev.get_state() ); - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine("--XWindow.java XIM is absent; hex keysym:"+Long.toHexString(keysym[0])+"\n"+ " unicode key:"+Integer.toHexString((int)unicodeKey)); } @@ -1148,7 +1148,7 @@ // is undefined, we still have a guess of what has been engraved on a keytop. int unicodeFromPrimaryKeysym = keysymToUnicode( xkeycodeToPrimaryKeysym(ev) ,0); - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine(">>>Fire Event:"+ (ev.get_type() == XConstants.KeyPress ? "KEY_PRESSED; " : "KEY_RELEASED; ")+ "jkeycode:decimal="+jkc.getJavaKeycode()+ @@ -1173,7 +1173,7 @@ if (unicodeKey > 0 && !isDeadKey) { - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine("fire _TYPED on "+unicodeKey); } postKeyEvent( java.awt.event.KeyEvent.KEY_TYPED, @@ -1193,7 +1193,7 @@ public void handleKeyRelease(XEvent xev) { super.handleKeyRelease(xev); XKeyEvent ev = xev.get_xkey(); - if (eventLog.isLoggable(PlatformLogger.FINE)) { + if (eventLog.isLoggable(PlatformLogger.Level.FINE)) { eventLog.fine(ev.toString()); } if (isEventDisabled(xev)) { @@ -1205,7 +1205,7 @@ private void handleKeyRelease(XKeyEvent ev) { int unicodeKey = 0; - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { logIncomingKeyEvent( ev ); } // Keysym should be converted to Unicode, if possible and necessary, @@ -1220,7 +1220,7 @@ if( jkc == null ) { jkc = new XKeysym.Keysym2JavaKeycode(java.awt.event.KeyEvent.VK_UNDEFINED, java.awt.event.KeyEvent.KEY_LOCATION_UNKNOWN); } - if (keyEventLog.isLoggable(PlatformLogger.FINE)) { + if (keyEventLog.isLoggable(PlatformLogger.Level.FINE)) { keyEventLog.fine(">>>Fire Event:"+ (ev.get_type() == XConstants.KeyPress ? "KEY_PRESSED; " : "KEY_RELEASED; ")+ "jkeycode:decimal="+jkc.getJavaKeycode()+ @@ -1357,12 +1357,12 @@ void updateSizeHints(int x, int y, int width, int height) { long flags = XUtilConstants.PSize | (isLocationByPlatform() ? 0 : (XUtilConstants.PPosition | XUtilConstants.USPosition)); if (!isResizable()) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Window {0} is not resizable", this); } flags |= XUtilConstants.PMinSize | XUtilConstants.PMaxSize; } else { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Window {0} is resizable", this); } } @@ -1372,12 +1372,12 @@ void updateSizeHints(int x, int y) { long flags = isLocationByPlatform() ? 0 : (XUtilConstants.PPosition | XUtilConstants.USPosition); if (!isResizable()) { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Window {0} is not resizable", this); } flags |= XUtilConstants.PMinSize | XUtilConstants.PMaxSize | XUtilConstants.PSize; } else { - if (log.isLoggable(PlatformLogger.FINER)) { + if (log.isLoggable(PlatformLogger.Level.FINER)) { log.finer("Window {0} is resizable", this); } }