stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Chris Hegarty 2013-06-17 14:23:01 +01:00
commit 4f4fdb4ff1
90 changed files with 617 additions and 617 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java
View File

@ -899,7 +899,7 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
boolean focusedWindowChangeAllowed, long time,
CausedFocusEvent.Cause cause)
{
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("lightweightChild=" + lightweightChild + ", temporary=" + temporary +
", focusedWindowChangeAllowed=" + focusedWindowChangeAllowed +
", time= " + time + ", cause=" + cause);
@ -940,7 +940,7 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
LWWindowPeer.getOwnerFrameDialog(parentPeer) : parentPeer;
if (decoratedPeer == null || !decoratedPeer.getPlatformWindow().isActive()) {
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("request rejected, focusedWindowChangeAllowed==false, " +
"decoratedPeer is inactive: " + decoratedPeer);
}
@ -953,7 +953,7 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
// 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()) {
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("request rejected, res= " + res + ", parentWindow.isFocused()=" +
parentWindow.isFocused());
}

12
jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java
View File

@ -1123,7 +1123,7 @@ public class LWWindowPeer
* In case of a simple window, triggers appropriate java focus change.
*/
public boolean requestWindowFocus(CausedFocusEvent.Cause cause) {
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("requesting native focus to " + this);
}
@ -1149,7 +1149,7 @@ public class LWWindowPeer
// If owner is not natively active, request native
// activation on it w/o sending events up to java.
if (owner != null && !owner.platformWindow.isActive()) {
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("requesting native focus to the owner " + owner);
}
LWWindowPeer currentActivePeer = (currentActive != null ?
@ -1157,7 +1157,7 @@ public class LWWindowPeer
// Ensure the opposite is natively active and suppress sending events.
if (currentActivePeer != null && currentActivePeer.platformWindow.isActive()) {
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("the opposite is " + currentActivePeer);
}
currentActivePeer.skipNextFocusChange = true;
@ -1214,7 +1214,7 @@ public class LWWindowPeer
* Changes focused window on java level.
*/
protected void changeFocusedWindow(boolean becomesFocused, Window opposite) {
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine((becomesFocused?"gaining":"loosing") + " focus window: " + this);
}
if (skipNextFocusChange) {
@ -1229,7 +1229,7 @@ public class LWWindowPeer
if (becomesFocused) {
synchronized (getPeerTreeLock()) {
if (blocker != null) {
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("the window is blocked by " + blocker);
}
return;
@ -1243,7 +1243,7 @@ public class LWWindowPeer
if (!becomesFocused &&
(isGrabbing() || getOwnerFrameDialog(grabbingWindow) == this))
{
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("ungrabbing on " + grabbingWindow);
}
// ungrab a simple window if its owner looses activation.

2
jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
View File

@ -635,7 +635,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
public long getNSWindowPtr() {
final long nsWindowPtr = ptr;
if (nsWindowPtr == 0L) {
if(logger.isLoggable(PlatformLogger.FINE)) {
if(logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine("NSWindow already disposed?", new Exception("Pointer to native NSWindow is invalid."));
}
}

8
jdk/src/share/classes/java/awt/AWTEvent.java
View File

@ -297,11 +297,11 @@ public abstract class AWTEvent extends EventObject {
field.setAccessible(true);
return field;
} catch (SecurityException e) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("AWTEvent.get_InputEvent_CanAccessSystemClipboard() got SecurityException ", e);
}
} catch (NoSuchFieldException e) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("AWTEvent.get_InputEvent_CanAccessSystemClipboard() got NoSuchFieldException ", e);
}
}
@ -594,7 +594,7 @@ public abstract class AWTEvent extends EventObject {
boolean b = field.getBoolean(this);
field.setBoolean(that, b);
} catch(IllegalAccessException e) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("AWTEvent.copyPrivateDataInto() got IllegalAccessException ", e);
}
}
@ -610,7 +610,7 @@ public abstract class AWTEvent extends EventObject {
try {
field.setBoolean(this, false);
} catch(IllegalAccessException e) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("AWTEvent.dispatched() got IllegalAccessException ", e);
}
}

4
jdk/src/share/classes/java/awt/AttributeValue.java
View File

@ -33,11 +33,11 @@ abstract class AttributeValue {
private final String[] names;
protected AttributeValue(int value, String[] names) {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("value = " + value + ", names = " + names);
}
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
if ((value < 0) || (names == null) || (value >= names.length)) {
log.finer("Assertion failed");
}

92
jdk/src/share/classes/java/awt/Component.java
View File

@ -4707,12 +4707,12 @@ public abstract class Component implements ImageObserver, MenuContainer,
// Check that this component belongs to this app-context
AppContext compContext = appContext;
if (compContext != null && !compContext.equals(AppContext.getAppContext())) {
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
eventLog.fine("Event " + e + " is being dispatched on the wrong AppContext");
}
}
if (eventLog.isLoggable(PlatformLogger.FINEST)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) {
eventLog.finest("{0}", e);
}
@ -4751,7 +4751,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
return;
}
}
if ((e instanceof FocusEvent) && focusLog.isLoggable(PlatformLogger.FINEST)) {
if ((e instanceof FocusEvent) && focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("" + e);
}
// MouseWheel may need to be retargeted here so that
@ -4809,7 +4809,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
if (inputContext != null) {
inputContext.dispatchEvent(e);
if (e.isConsumed()) {
if ((e instanceof FocusEvent) && focusLog.isLoggable(PlatformLogger.FINEST)) {
if ((e instanceof FocusEvent) && focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("3579: Skipping " + e);
}
return;
@ -4844,7 +4844,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
if (p != null) {
p.preProcessKeyEvent((KeyEvent)e);
if (e.isConsumed()) {
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("Pre-process consumed event");
}
return;
@ -4977,7 +4977,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
// position relative to its parent.
MouseWheelEvent newMWE;
if (eventLog.isLoggable(PlatformLogger.FINEST)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) {
eventLog.finest("dispatchMouseWheelToAncestor");
eventLog.finest("orig event src is of " + e.getSource().getClass());
}
@ -5000,7 +5000,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
}
}
if (eventLog.isLoggable(PlatformLogger.FINEST)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) {
eventLog.finest("new event src is " + anc.getClass());
}
@ -5500,7 +5500,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
// Should only be called while holding the tree lock
int numListening(long mask) {
// One mask or the other, but not neither or both.
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
if ((mask != AWTEvent.HIERARCHY_EVENT_MASK) &&
(mask != AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK))
{
@ -5541,7 +5541,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
break;
case HierarchyEvent.ANCESTOR_MOVED:
case HierarchyEvent.ANCESTOR_RESIZED:
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
if (changeFlags != 0) {
eventLog.fine("Assertion (changeFlags == 0) failed");
}
@ -5557,7 +5557,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
break;
default:
// assert false
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
eventLog.fine("This code must never be reached");
}
break;
@ -7643,7 +7643,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
}
}
if (!isRequestFocusAccepted(temporary, focusedWindowChangeAllowed, cause)) {
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("requestFocus is not accepted");
}
return false;
@ -7654,7 +7654,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
Component window = this;
while ( (window != null) && !(window instanceof Window)) {
if (!window.isVisible()) {
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("component is recurively invisible");
}
return false;
@ -7666,14 +7666,14 @@ public abstract class Component implements ImageObserver, MenuContainer,
Component heavyweight = (peer instanceof LightweightPeer)
? getNativeContainer() : this;
if (heavyweight == null || !heavyweight.isVisible()) {
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("Component is not a part of visible hierarchy");
}
return false;
}
peer = heavyweight.peer;
if (peer == null) {
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("Peer is null");
}
return false;
@ -7694,11 +7694,11 @@ public abstract class Component implements ImageObserver, MenuContainer,
if (!success) {
KeyboardFocusManager.getCurrentKeyboardFocusManager
(appContext).dequeueKeyEvents(time, this);
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("Peer request failed");
}
} else {
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("Pass for " + this);
}
}
@ -7710,7 +7710,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
CausedFocusEvent.Cause cause)
{
if (!isFocusable() || !isVisible()) {
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("Not focusable or not visible");
}
return false;
@ -7718,7 +7718,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
ComponentPeer peer = this.peer;
if (peer == null) {
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("peer is null");
}
return false;
@ -7726,7 +7726,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
Window window = getContainingWindow();
if (window == null || !window.isFocusableWindow()) {
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("Component doesn't have toplevel");
}
return false;
@ -7748,7 +7748,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
// Controller is supposed to verify focus transfers and for this it
// should know both from and to components. And it shouldn't verify
// transfers from when these components are equal.
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("focus owner is null or this");
}
return true;
@ -7761,7 +7761,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
// most recent focus owner. But most recent focus owner can be
// changed by requestFocsuXXX() call only, so this transfer has
// been already approved.
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("cause is activation");
}
return true;
@ -7772,7 +7772,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
temporary,
focusedWindowChangeAllowed,
cause);
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("RequestFocusController returns {0}", ret);
}
@ -7864,7 +7864,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
}
boolean transferFocus(boolean clearOnFailure) {
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("clearOnFailure = " + clearOnFailure);
}
Component toFocus = getNextFocusCandidate();
@ -7873,12 +7873,12 @@ public abstract class Component implements ImageObserver, MenuContainer,
res = toFocus.requestFocusInWindow(CausedFocusEvent.Cause.TRAVERSAL_FORWARD);
}
if (clearOnFailure && !res) {
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("clear global focus owner");
}
KeyboardFocusManager.getCurrentKeyboardFocusManager().clearGlobalFocusOwnerPriv();
}
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("returning result: " + res);
}
return res;
@ -7893,19 +7893,19 @@ public abstract class Component implements ImageObserver, MenuContainer,
comp = rootAncestor;
rootAncestor = comp.getFocusCycleRootAncestor();
}
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("comp = " + comp + ", root = " + rootAncestor);
}
Component candidate = null;
if (rootAncestor != null) {
FocusTraversalPolicy policy = rootAncestor.getFocusTraversalPolicy();
Component toFocus = policy.getComponentAfter(rootAncestor, comp);
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("component after is " + toFocus);
}
if (toFocus == null) {
toFocus = policy.getDefaultComponent(rootAncestor);
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("default component is " + toFocus);
}
}
@ -7917,7 +7917,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
}
candidate = toFocus;
}
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Focus transfer candidate: " + candidate);
}
return candidate;
@ -7954,12 +7954,12 @@ public abstract class Component implements ImageObserver, MenuContainer,
}
}
if (clearOnFailure && !res) {
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("clear global focus owner");
}
KeyboardFocusManager.getCurrentKeyboardFocusManager().clearGlobalFocusOwnerPriv();
}
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("returning result: " + res);
}
return res;
@ -9740,7 +9740,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
checkTreeLock();
if (!areBoundsValid()) {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this + "; areBoundsValid = " + areBoundsValid());
}
return;
@ -9776,7 +9776,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
}
this.compoundShape = shape;
Point compAbsolute = getLocationOnWindow();
if (mixingLog.isLoggable(PlatformLogger.FINER)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINER)) {
mixingLog.fine("this = " + this +
"; compAbsolute=" + compAbsolute + "; shape=" + shape);
}
@ -9910,7 +9910,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
checkTreeLock();
Region s = getNormalShape();
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this + "; normalShape=" + s);
}
@ -9944,7 +9944,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
}
}
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("currentShape=" + s);
}
@ -9954,12 +9954,12 @@ public abstract class Component implements ImageObserver, MenuContainer,
void applyCurrentShape() {
checkTreeLock();
if (!areBoundsValid()) {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this + "; areBoundsValid = " + areBoundsValid());
}
return; // Because applyCompoundShape() ignores such components anyway
}
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this);
}
applyCompoundShape(calculateCurrentShape());
@ -9968,7 +9968,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
final void subtractAndApplyShape(Region s) {
checkTreeLock();
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this + "; s=" + s);
}
@ -10015,7 +10015,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
void mixOnShowing() {
synchronized (getTreeLock()) {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this);
}
if (!isMixingNeeded()) {
@ -10033,7 +10033,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
// We cannot be sure that the peer exists at this point, so we need the argument
// to find out whether the hiding component is (well, actually was) a LW or a HW.
synchronized (getTreeLock()) {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this + "; isLightweight = " + isLightweight);
}
if (!isMixingNeeded()) {
@ -10047,7 +10047,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
void mixOnReshaping() {
synchronized (getTreeLock()) {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this);
}
if (!isMixingNeeded()) {
@ -10066,7 +10066,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
boolean becameHigher = newZorder < oldZorder;
Container parent = getContainer();
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this +
"; oldZorder=" + oldZorder + "; newZorder=" + newZorder + "; parent=" + parent);
}
@ -10110,13 +10110,13 @@ public abstract class Component implements ImageObserver, MenuContainer,
final boolean isMixingNeeded() {
if (SunToolkit.getSunAwtDisableMixing()) {
if (mixingLog.isLoggable(PlatformLogger.FINEST)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINEST)) {
mixingLog.finest("this = " + this + "; Mixing disabled via sun.awt.disableMixing");
}
return false;
}
if (!areBoundsValid()) {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this + "; areBoundsValid = " + areBoundsValid());
}
return false;
@ -10124,7 +10124,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
Window window = getContainingWindow();
if (window != null) {
if (!window.hasHeavyweightDescendants() || !window.hasLightweightDescendants() || window.isDisposing()) {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("containing window = " + window +
"; has h/w descendants = " + window.hasHeavyweightDescendants() +
"; has l/w descendants = " + window.hasLightweightDescendants() +
@ -10133,7 +10133,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
return false;
}
} else {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this + "; containing window is null");
}
return false;

26
jdk/src/share/classes/java/awt/Container.java
View File

@ -1320,7 +1320,7 @@ public class Container extends Component {
int superListening = super.numListening(mask);
if (mask == AWTEvent.HIERARCHY_EVENT_MASK) {
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
// Verify listeningChildren is correct
int sum = 0;
for (Component comp : component) {
@ -1332,7 +1332,7 @@ public class Container extends Component {
}
return listeningChildren + superListening;
} else if (mask == AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK) {
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
// Verify listeningBoundsChildren is correct
int sum = 0;
for (Component comp : component) {
@ -1345,7 +1345,7 @@ public class Container extends Component {
return listeningBoundsChildren + superListening;
} else {
// assert false;
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
eventLog.fine("This code must never be reached");
}
return superListening;
@ -1354,7 +1354,7 @@ public class Container extends Component {
// Should only be called while holding tree lock
void adjustListeningChildren(long mask, int num) {
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
boolean toAssert = (mask == AWTEvent.HIERARCHY_EVENT_MASK ||
mask == AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK ||
mask == (AWTEvent.HIERARCHY_EVENT_MASK |
@ -1395,7 +1395,7 @@ public class Container extends Component {
// Should only be called while holding tree lock
int countHierarchyMembers() {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
// Verify descendantsCount is correct
int sum = 0;
for (Component comp : component) {
@ -4110,7 +4110,7 @@ public class Container extends Component {
final void recursiveSubtractAndApplyShape(Region shape, int fromZorder, int toZorder) {
checkTreeLock();
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this +
"; shape=" + shape + "; fromZ=" + fromZorder + "; toZ=" + toZorder);
}
@ -4147,7 +4147,7 @@ public class Container extends Component {
final void recursiveApplyCurrentShape(int fromZorder, int toZorder) {
checkTreeLock();
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this +
"; fromZ=" + fromZorder + "; toZ=" + toZorder);
}
@ -4264,7 +4264,7 @@ public class Container extends Component {
@Override
void mixOnShowing() {
synchronized (getTreeLock()) {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this);
}
@ -4289,7 +4289,7 @@ public class Container extends Component {
@Override
void mixOnHiding(boolean isLightweight) {
synchronized (getTreeLock()) {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this +
"; isLightweight=" + isLightweight);
}
@ -4303,7 +4303,7 @@ public class Container extends Component {
@Override
void mixOnReshaping() {
synchronized (getTreeLock()) {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this);
}
@ -4338,7 +4338,7 @@ public class Container extends Component {
@Override
void mixOnZOrderChanging(int oldZorder, int newZorder) {
synchronized (getTreeLock()) {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this +
"; oldZ=" + oldZorder + "; newZ=" + newZorder);
}
@ -4359,7 +4359,7 @@ public class Container extends Component {
@Override
void mixOnValidating() {
synchronized (getTreeLock()) {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
if (mixingLog.isLoggable(PlatformLogger.Level.FINE)) {
mixingLog.fine("this = " + this);
}
@ -4549,7 +4549,7 @@ class LightweightDispatcher implements java.io.Serializable, AWTEventListener {
// This may send it somewhere that doesn't have MouseWheelEvents
// enabled. In this case, Component.dispatchEventImpl() will
// retarget the event to a parent that DOES have the events enabled.
if (eventLog.isLoggable(PlatformLogger.FINEST) && (mouseOver != null)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINEST) && (mouseOver != null)) {
eventLog.finest("retargeting mouse wheel to " +
mouseOver.getName() + ", " +
mouseOver.getClass());

34
jdk/src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java
View File

@ -165,7 +165,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
if (getImplicitDownCycleTraversal()) {
retComp = cont.getFocusTraversalPolicy().getDefaultComponent(cont);
if (retComp != null && log.isLoggable(PlatformLogger.FINE)) {
if (retComp != null && log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Transfered focus down-cycle to " + retComp +
" in the focus cycle root " + cont);
}
@ -177,7 +177,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
cont.getFocusTraversalPolicy().getDefaultComponent(cont) :
cont.getFocusTraversalPolicy().getLastComponent(cont));
if (retComp != null && log.isLoggable(PlatformLogger.FINE)) {
if (retComp != null && log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Transfered focus to " + retComp + " in the FTP provider " + cont);
}
}
@ -208,7 +208,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
* aComponent is null
*/
public Component getComponentAfter(Container aContainer, Component aComponent) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Searching in " + aContainer + " for component after " + aComponent);
}
@ -238,7 +238,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
// See if the component is inside of policy provider.
Container provider = getTopmostProvider(aContainer, aComponent);
if (provider != null) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Asking FTP " + provider + " for component after " + aComponent);
}
@ -249,7 +249,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
// Null result means that we overstepped the limit of the FTP's cycle.
// In that case we must quit the cycle, otherwise return the component found.
if (afterComp != null) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### FTP returned " + afterComp);
}
return afterComp;
@ -259,14 +259,14 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
List<Component> cycle = getFocusTraversalCycle(aContainer);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Cycle is " + cycle + ", component is " + aComponent);
}
int index = getComponentIndex(cycle, aComponent);
if (index < 0) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Didn't find component " + aComponent + " in a cycle " + aContainer);
}
return getFirstComponent(aContainer);
@ -331,7 +331,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
// See if the component is inside of policy provider.
Container provider = getTopmostProvider(aContainer, aComponent);
if (provider != null) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Asking FTP " + provider + " for component after " + aComponent);
}
@ -342,7 +342,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
// Null result means that we overstepped the limit of the FTP's cycle.
// In that case we must quit the cycle, otherwise return the component found.
if (beforeComp != null) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### FTP returned " + beforeComp);
}
return beforeComp;
@ -357,14 +357,14 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
List<Component> cycle = getFocusTraversalCycle(aContainer);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Cycle is " + cycle + ", component is " + aComponent);
}
int index = getComponentIndex(cycle, aComponent);
if (index < 0) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Didn't find component " + aComponent + " in a cycle " + aContainer);
}
return getLastComponent(aContainer);
@ -411,7 +411,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
public Component getFirstComponent(Container aContainer) {
List<Component> cycle;
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Getting first component in " + aContainer);
}
if (aContainer == null) {
@ -432,12 +432,12 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
}
if (cycle.size() == 0) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Cycle is empty");
}
return null;
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Cycle is " + cycle);
}
@ -467,7 +467,7 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
*/
public Component getLastComponent(Container aContainer) {
List<Component> cycle;
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Getting last component in " + aContainer);
}
@ -488,12 +488,12 @@ public class ContainerOrderFocusTraversalPolicy extends FocusTraversalPolicy
}
if (cycle.size() == 0) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Cycle is empty");
}
return null;
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Cycle is " + cycle);
}

4
jdk/src/share/classes/java/awt/Cursor.java
View File

@ -310,7 +310,7 @@ public class Cursor implements java.io.Serializable {
String key = prefix + DotFileSuffix;
if (!systemCustomCursorProperties.containsKey(key)) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Cursor.getSystemCustomCursor(" + name + ") returned null");
}
return null;
@ -365,7 +365,7 @@ public class Cursor implements java.io.Serializable {
}
if (cursor == null) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Cursor.getSystemCustomCursor(" + name + ") returned null");
}
} else {

26
jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java
View File

@ -310,7 +310,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
* <code>false</code> otherwise
*/
public boolean dispatchEvent(AWTEvent e) {
if (focusLog.isLoggable(PlatformLogger.FINE) && (e instanceof WindowEvent || e instanceof FocusEvent)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE) && (e instanceof WindowEvent || e instanceof FocusEvent)) {
focusLog.fine("" + e);
}
switch (e.getID()) {
@ -419,7 +419,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
// The component which last has the focus when this window was focused
// should receive focus first
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("tempLost {0}, toFocus {1}",
tempLost, toFocus);
}
@ -488,7 +488,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
Component oldFocusOwner = getGlobalFocusOwner();
Component newFocusOwner = fe.getComponent();
if (oldFocusOwner == newFocusOwner) {
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("Skipping {0} because focus owner is the same", e);
}
// We can't just drop the event - there could be
@ -607,7 +607,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
FocusEvent fe = (FocusEvent)e;
Component currentFocusOwner = getGlobalFocusOwner();
if (currentFocusOwner == null) {
if (focusLog.isLoggable(PlatformLogger.FINE))
if (focusLog.isLoggable(PlatformLogger.Level.FINE))
focusLog.fine("Skipping {0} because focus owner is null", e);
break;
}
@ -615,7 +615,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
// If we make a mistake because of retargeting, then the
// FOCUS_GAINED handler will correct it.
if (currentFocusOwner == fe.getOppositeComponent()) {
if (focusLog.isLoggable(PlatformLogger.FINE))
if (focusLog.isLoggable(PlatformLogger.Level.FINE))
focusLog.fine("Skipping {0} because current focus owner is equal to opposite", e);
break;
}
@ -688,7 +688,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
Window losingFocusWindow = we.getWindow();
Window activeWindow = getGlobalActiveWindow();
Window oppositeWindow = we.getOppositeWindow();
if (focusLog.isLoggable(PlatformLogger.FINE))
if (focusLog.isLoggable(PlatformLogger.Level.FINE))
focusLog.fine("Active {0}, Current focused {1}, losing focus {2} opposite {3}",
activeWindow, currentFocusedWindow,
losingFocusWindow, oppositeWindow);
@ -874,7 +874,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
}
}
if (ke != null) {
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Pumping approved event {0}", ke);
}
enqueuedKeyEvents.removeFirst();
@ -891,7 +891,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
* Dumps the list of type-ahead queue markers to stderr
*/
void dumpMarkers() {
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest(">>> Markers dump, time: {0}", System.currentTimeMillis());
synchronized (this) {
if (typeAheadMarkers.size() != 0) {
@ -925,7 +925,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
// The fix is rolled out.
if (ke.getWhen() > marker.after) {
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Storing event {0} because of marker {1}", ke, marker);
}
enqueuedKeyEvents.addLast(ke);
@ -939,7 +939,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
}
case FocusEvent.FOCUS_GAINED:
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("Markers before FOCUS_GAINED on {0}", target);
}
dumpMarkers();
@ -968,7 +968,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
}
} else {
// Exception condition - event without marker
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Event without marker {0}", e);
}
}
@ -1209,7 +1209,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
return;
}
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Enqueue at {0} for {1}",
after, untilFocused);
}
@ -1251,7 +1251,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
return;
}
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Dequeue at {0} for {1}",
after, untilFocused);
}

8
jdk/src/share/classes/java/awt/EventDispatchThread.java
View File

@ -138,7 +138,7 @@ class EventDispatchThread extends Thread {
}
void addEventFilter(EventFilter filter) {
if (eventLog.isLoggable(PlatformLogger.FINEST)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) {
eventLog.finest("adding the event filter: " + filter);
}
synchronized (eventFilters) {
@ -164,7 +164,7 @@ class EventDispatchThread extends Thread {
}
void removeEventFilter(EventFilter filter) {
if (eventLog.isLoggable(PlatformLogger.FINEST)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) {
eventLog.finest("removing the event filter: " + filter);
}
synchronized (eventFilters) {
@ -209,7 +209,7 @@ class EventDispatchThread extends Thread {
}
while (eventOK == false);
if (eventLog.isLoggable(PlatformLogger.FINEST)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) {
eventLog.finest("Dispatching: " + event);
}
@ -236,7 +236,7 @@ class EventDispatchThread extends Thread {
}
private void processException(Throwable e) {
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
eventLog.fine("Processing exception: " + e);
}
getUncaughtExceptionHandler().uncaughtException(this, e);

10
jdk/src/share/classes/java/awt/EventQueue.java
View File

@ -751,7 +751,7 @@ public class EventQueue {
dispatchThread.stopDispatching();
}
} else {
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
eventLog.fine("Unable to dispatch event: " + event);
}
}
@ -849,7 +849,7 @@ public class EventQueue {
* @since 1.2
*/
public void push(EventQueue newEventQueue) {
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
eventLog.fine("EventQueue.push(" + newEventQueue + ")");
}
@ -875,7 +875,7 @@ public class EventQueue {
// Use getNextEventPrivate() as it doesn't call flushPendingEvents()
newEventQueue.postEventPrivate(topQueue.getNextEventPrivate());
} catch (InterruptedException ie) {
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
eventLog.fine("Interrupted push", ie);
}
}
@ -914,7 +914,7 @@ public class EventQueue {
* @since 1.2
*/
protected void pop() throws EmptyStackException {
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
eventLog.fine("EventQueue.pop(" + this + ")");
}
@ -937,7 +937,7 @@ public class EventQueue {
try {
prevQueue.postEventPrivate(topQueue.getNextEventPrivate());
} catch (InterruptedException ie) {
if (eventLog.isLoggable(PlatformLogger.FINE)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINE)) {
eventLog.fine("Interrupted pop", ie);
}
}

32
jdk/src/share/classes/java/awt/KeyboardFocusManager.java
View File

@ -652,7 +652,7 @@ public abstract class KeyboardFocusManager
}
void setNativeFocusOwner(Component comp) {
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("Calling peer {0} setCurrentFocusOwner for {1}",
String.valueOf(peer), String.valueOf(comp));
}
@ -961,7 +961,7 @@ public abstract class KeyboardFocusManager
checkKFMSecurity();
oldActiveWindow = getActiveWindow();
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Setting global active window to " + activeWindow + ", old active " + oldActiveWindow);
}
@ -2196,7 +2196,7 @@ public abstract class KeyboardFocusManager
HeavyweightFocusRequest(Component heavyweight, Component descendant,
boolean temporary, CausedFocusEvent.Cause cause) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
if (heavyweight == null) {
log.fine("Assertion (heavyweight != null) failed");
}
@ -2208,7 +2208,7 @@ public abstract class KeyboardFocusManager
}
boolean addLightweightRequest(Component descendant,
boolean temporary, CausedFocusEvent.Cause cause) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
if (this == HeavyweightFocusRequest.CLEAR_GLOBAL_FOCUS_OWNER) {
log.fine("Assertion (this != HeavyweightFocusRequest.CLEAR_GLOBAL_FOCUS_OWNER) failed");
}
@ -2386,7 +2386,7 @@ public abstract class KeyboardFocusManager
(Component heavyweight, Component descendant, boolean temporary,
boolean focusedWindowChangeAllowed, long time, CausedFocusEvent.Cause cause)
{
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
if (heavyweight == null) {
log.fine("Assertion (heavyweight != null) failed");
}
@ -2408,11 +2408,11 @@ public abstract class KeyboardFocusManager
Component currentFocusOwner = thisManager.getGlobalFocusOwner();
Component nativeFocusOwner = thisManager.getNativeFocusOwner();
Window nativeFocusedWindow = thisManager.getNativeFocusedWindow();
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("SNFH for {0} in {1}",
String.valueOf(descendant), String.valueOf(heavyweight));
}
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("0. Current focus owner {0}",
String.valueOf(currentFocusOwner));
focusLog.finest("0. Native focus owner {0}",
@ -2422,7 +2422,7 @@ public abstract class KeyboardFocusManager
}
synchronized (heavyweightRequests) {
HeavyweightFocusRequest hwFocusRequest = getLastHWRequest();
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("Request {0}", String.valueOf(hwFocusRequest));
}
if (hwFocusRequest == null &&
@ -2430,7 +2430,7 @@ public abstract class KeyboardFocusManager
{
if (descendant == currentFocusOwner) {
// Redundant request.
if (focusLog.isLoggable(PlatformLogger.FINEST))
if (focusLog.isLoggable(PlatformLogger.Level.FINEST))
focusLog.finest("1. SNFH_FAILURE for {0}",
String.valueOf(descendant));
return SNFH_FAILURE;
@ -2464,7 +2464,7 @@ public abstract class KeyboardFocusManager
// SunToolkit.postPriorityEvent(newFocusOwnerEvent);
SunToolkit.postEvent(descendant.appContext, newFocusOwnerEvent);
if (focusLog.isLoggable(PlatformLogger.FINEST))
if (focusLog.isLoggable(PlatformLogger.Level.FINEST))
focusLog.finest("2. SNFH_HANDLED for {0}", String.valueOf(descendant));
return SNFH_SUCCESS_HANDLED;
} else if (hwFocusRequest != null &&
@ -2478,7 +2478,7 @@ public abstract class KeyboardFocusManager
manager.enqueueKeyEvents(time, descendant);
}
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("3. SNFH_HANDLED for lightweight" +
descendant + " in " + heavyweight);
}
@ -2502,7 +2502,7 @@ public abstract class KeyboardFocusManager
(hwFocusRequest != null)
? hwFocusRequest.heavyweight
: nativeFocusedWindow)) {
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("4. SNFH_FAILURE for " + descendant);
}
return SNFH_FAILURE;
@ -2513,7 +2513,7 @@ public abstract class KeyboardFocusManager
heavyweightRequests.add
(new HeavyweightFocusRequest(heavyweight, descendant,
temporary, cause));
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("5. SNFH_PROCEED for " + descendant);
}
return SNFH_SUCCESS_PROCEED;
@ -2905,11 +2905,11 @@ public abstract class KeyboardFocusManager
}
KeyboardFocusManager manager = getCurrentKeyboardFocusManager();
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
if (event instanceof FocusEvent || event instanceof WindowEvent) {
focusLog.finer(">>> {0}", String.valueOf(event));
}
if (focusLog.isLoggable(PlatformLogger.FINER) && event instanceof KeyEvent) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER) && event instanceof KeyEvent) {
focusLog.finer(" focus owner is {0}",
String.valueOf(manager.getGlobalFocusOwner()));
focusLog.finer(">>> {0}", String.valueOf(event));
@ -2996,7 +2996,7 @@ public abstract class KeyboardFocusManager
}
}
static void removeLastFocusRequest(Component heavyweight) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
if (heavyweight == null) {
log.fine("Assertion (heavyweight != null) failed");
}

2
jdk/src/share/classes/java/awt/SplashScreen.java
View File

@ -219,7 +219,7 @@ public final class SplashScreen {
}
}
catch(java.net.MalformedURLException e) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("MalformedURLException caught in the getImageURL() method", e);
}
}

20
jdk/src/share/classes/java/awt/WaitDispatchSupport.java
View File

@ -108,7 +108,7 @@ class WaitDispatchSupport implements SecondaryLoop {
this.condition = new Conditional() {
@Override
public boolean evaluate() {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("evaluate(): blockingEDT=" + keepBlockingEDT.get() +
", blockingCT=" + keepBlockingCT.get());
}
@ -165,7 +165,7 @@ class WaitDispatchSupport implements SecondaryLoop {
*/
@Override
public boolean enter() {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("enter(): blockingEDT=" + keepBlockingEDT.get() +
", blockingCT=" + keepBlockingCT.get());
}
@ -192,11 +192,11 @@ class WaitDispatchSupport implements SecondaryLoop {
Thread currentThread = Thread.currentThread();
if (currentThread == dispatchThread) {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("On dispatch thread: " + dispatchThread);
}
if (interval != 0) {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("scheduling the timer for " + interval + " ms");
}
timer.schedule(timerTask = new TimerTask() {
@ -213,7 +213,7 @@ class WaitDispatchSupport implements SecondaryLoop {
SequencedEvent currentSE = KeyboardFocusManager.
getCurrentKeyboardFocusManager().getCurrentSequencedEvent();
if (currentSE != null) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Dispose current SequencedEvent: " + currentSE);
}
currentSE.dispose();
@ -231,7 +231,7 @@ class WaitDispatchSupport implements SecondaryLoop {
}
});
} else {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("On non-dispatch thread: " + currentThread);
}
synchronized (getTreeLock()) {
@ -257,11 +257,11 @@ class WaitDispatchSupport implements SecondaryLoop {
getTreeLock().wait();
}
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("waitDone " + keepBlockingEDT.get() + " " + keepBlockingCT.get());
}
} catch (InterruptedException e) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Exception caught while waiting: " + e);
}
} finally {
@ -284,7 +284,7 @@ class WaitDispatchSupport implements SecondaryLoop {
* @inheritDoc
*/
public boolean exit() {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("exit(): blockingEDT=" + keepBlockingEDT.get() +
", blockingCT=" + keepBlockingCT.get());
}
@ -311,7 +311,7 @@ class WaitDispatchSupport implements SecondaryLoop {
};
private void wakeupEDT() {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("wakeupEDT(): EDT == " + dispatchThread);
}
EventQueue eq = dispatchThread.getEventQueue();

2
jdk/src/share/classes/java/awt/Window.java
View File

@ -3149,7 +3149,7 @@ public class Window extends Container implements Accessible {
}
synchronized (getTreeLock()) {
super.setGraphicsConfiguration(gc);
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("+ Window.setGraphicsConfiguration(): new GC is \n+ " + getGraphicsConfiguration_NoClientCode() + "\n+ this is " + this);
}
}

2
jdk/src/share/classes/java/awt/event/InputEvent.java
View File

@ -353,7 +353,7 @@ public abstract class InputEvent extends ComponentEvent {
sm.checkSystemClipboardAccess();
b = true;
} catch (SecurityException se) {
if (logger.isLoggable(PlatformLogger.FINE)) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine("InputEvent.canAccessSystemClipboard() got SecurityException ", se);
}
}

2
jdk/src/share/classes/java/net/CookieManager.java
View File

@ -284,7 +284,7 @@ public class CookieManager extends CookieHandler
} catch (IllegalArgumentException e) {
// Bogus header, make an empty list and log the error
cookies = java.util.Collections.emptyList();
if (logger.isLoggable(PlatformLogger.SEVERE)) {
if (logger.isLoggable(PlatformLogger.Level.SEVERE)) {
logger.severe("Invalid cookie for " + uri + ": " + headerValue);
}
}

2
jdk/src/share/classes/java/util/Currency.java
View File

@ -764,7 +764,7 @@ public final class Currency implements Serializable {
private static void info(String message, Throwable t) {
PlatformLogger logger = PlatformLogger.getLogger("java.util.Currency");
if (logger.isLoggable(PlatformLogger.INFO)) {
if (logger.isLoggable(PlatformLogger.Level.INFO)) {
if (t != null) {
logger.info(message, t);
} else {

30
jdk/src/share/classes/javax/swing/BufferStrategyPaintManager.java
View File

@ -215,7 +215,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
}
private void dispose(java.util.List<BufferInfo> bufferInfos) {
if (LOGGER.isLoggable(PlatformLogger.FINER)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
LOGGER.finer("BufferStrategyPaintManager disposed",
new RuntimeException());
}
@ -300,7 +300,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
}
}
// Invalid root, do what Swing has always done.
if (LOGGER.isLoggable(PlatformLogger.FINER)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
LOGGER.finer("prepare failed");
}
return super.paint(paintingComponent, bufferComponent, g, x, y, w, h);
@ -332,7 +332,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
}
accumulate(x + xOffset + deltaX, y + yOffset + deltaY, w, h);
} else {
if (LOGGER.isLoggable(PlatformLogger.FINER)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
LOGGER.finer("copyArea: prepare failed or not in sync");
}
// Prepare failed, or not in sync. By calling super.copyArea
@ -360,7 +360,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
}
}
}
if (LOGGER.isLoggable(PlatformLogger.FINEST)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINEST)) {
LOGGER.finest("beginPaint");
}
// Reset the area that needs to be painted.
@ -368,7 +368,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
}
public void endPaint() {
if (LOGGER.isLoggable(PlatformLogger.FINEST)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINEST)) {
LOGGER.finest("endPaint: region " + accumulatedX + " " +
accumulatedY + " " + accumulatedMaxX + " " +
accumulatedMaxY);
@ -417,7 +417,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
contentsLost = bufferStrategy.contentsLost();
}
if (contentsLost) {
if (LOGGER.isLoggable(PlatformLogger.FINER)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
LOGGER.finer("endPaint: contents lost");
}
// Shown region was bogus, mark buffer as out of sync.
@ -511,7 +511,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
contentsLost = true;
bufferInfo = new BufferInfo(root);
bufferInfos.add(bufferInfo);
if (LOGGER.isLoggable(PlatformLogger.FINER)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
LOGGER.finer("prepare: new BufferInfo: " + root);
}
}
@ -522,7 +522,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
bsg = bufferStrategy.getDrawGraphics();
if (bufferStrategy.contentsRestored()) {
contentsLost = true;
if (LOGGER.isLoggable(PlatformLogger.FINER)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
LOGGER.finer("prepare: contents restored in prepare");
}
}
@ -535,7 +535,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
if (bufferInfo.getContentsLostDuringExpose()) {
contentsLost = true;
bufferInfo.setContentsLostDuringExpose(false);
if (LOGGER.isLoggable(PlatformLogger.FINER)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
LOGGER.finer("prepare: contents lost on expose");
}
}
@ -638,7 +638,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
if (biRoot == null) {
// Window gc'ed
bufferInfos.remove(counter);
if (LOGGER.isLoggable(PlatformLogger.FINER)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
LOGGER.finer("BufferInfo pruned, root null");
}
}
@ -744,7 +744,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
if (bs != null) {
weakBS = new WeakReference<BufferStrategy>(bs);
}
if (LOGGER.isLoggable(PlatformLogger.FINER)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
LOGGER.finer("getBufferStrategy: created bs: " + bs);
}
}
@ -802,7 +802,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
BufferStrategy bs = null;
if (SwingUtilities3.isVsyncRequested(root)) {
bs = createBufferStrategy(root, true);
if (LOGGER.isLoggable(PlatformLogger.FINER)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
LOGGER.finer("createBufferStrategy: using vsynced strategy");
}
}
@ -844,7 +844,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
invoke(root);
} catch (InvocationTargetException ite) {
// Type is not supported
if (LOGGER.isLoggable(PlatformLogger.FINER)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
LOGGER.finer("createBufferStratety failed",
ite);
}
@ -860,7 +860,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
bs = ((Window)root).getBufferStrategy();
} catch (AWTException e) {
// Type not supported
if (LOGGER.isLoggable(PlatformLogger.FINER)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
LOGGER.finer("createBufferStratety failed",
e);
}
@ -874,7 +874,7 @@ class BufferStrategyPaintManager extends RepaintManager.PaintManager {
*/
public void dispose() {
Container root = getRoot();
if (LOGGER.isLoggable(PlatformLogger.FINER)) {
if (LOGGER.isLoggable(PlatformLogger.Level.FINER)) {
LOGGER.finer("disposed BufferInfo for: " + root);
}
if (root != null) {

36
jdk/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java
View File

@ -115,7 +115,7 @@ public class SortingFocusTraversalPolicy
try {
index = Collections.binarySearch(cycle, aComponent, comparator);
} catch (ClassCastException e) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### During the binary search for " + aComponent + " the exception occured: ", e);
}
return -1;
@ -193,7 +193,7 @@ public class SortingFocusTraversalPolicy
if (getImplicitDownCycleTraversal()) {
retComp = cont.getFocusTraversalPolicy().getDefaultComponent(cont);
if (retComp != null && log.isLoggable(PlatformLogger.FINE)) {
if (retComp != null && log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Transfered focus down-cycle to " + retComp +
" in the focus cycle root " + cont);
}
@ -205,7 +205,7 @@ public class SortingFocusTraversalPolicy
cont.getFocusTraversalPolicy().getDefaultComponent(cont) :
cont.getFocusTraversalPolicy().getLastComponent(cont));
if (retComp != null && log.isLoggable(PlatformLogger.FINE)) {
if (retComp != null && log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Transfered focus to " + retComp + " in the FTP provider " + cont);
}
}
@ -236,7 +236,7 @@ public class SortingFocusTraversalPolicy
* aComponent is null
*/
public Component getComponentAfter(Container aContainer, Component aComponent) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Searching in " + aContainer + " for component after " + aComponent);
}
@ -260,7 +260,7 @@ public class SortingFocusTraversalPolicy
// See if the component is inside of policy provider.
Container provider = getTopmostProvider(aContainer, aComponent);
if (provider != null) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Asking FTP " + provider + " for component after " + aComponent);
}
@ -271,7 +271,7 @@ public class SortingFocusTraversalPolicy
// Null result means that we overstepped the limit of the FTP's cycle.
// In that case we must quit the cycle, otherwise return the component found.
if (afterComp != null) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### FTP returned " + afterComp);
}
return afterComp;
@ -281,14 +281,14 @@ public class SortingFocusTraversalPolicy
List<Component> cycle = getFocusTraversalCycle(aContainer);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Cycle is " + cycle + ", component is " + aComponent);
}
int index = getComponentIndex(cycle, aComponent);
if (index < 0) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Didn't find component " + aComponent + " in a cycle " + aContainer);
}
return getFirstComponent(aContainer);
@ -353,7 +353,7 @@ public class SortingFocusTraversalPolicy
// See if the component is inside of policy provider.
Container provider = getTopmostProvider(aContainer, aComponent);
if (provider != null) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Asking FTP " + provider + " for component after " + aComponent);
}
@ -364,7 +364,7 @@ public class SortingFocusTraversalPolicy
// Null result means that we overstepped the limit of the FTP's cycle.
// In that case we must quit the cycle, otherwise return the component found.
if (beforeComp != null) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### FTP returned " + beforeComp);
}
return beforeComp;
@ -379,14 +379,14 @@ public class SortingFocusTraversalPolicy
List<Component> cycle = getFocusTraversalCycle(aContainer);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Cycle is " + cycle + ", component is " + aComponent);
}
int index = getComponentIndex(cycle, aComponent);
if (index < 0) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Didn't find component " + aComponent + " in a cycle " + aContainer);
}
return getLastComponent(aContainer);
@ -432,7 +432,7 @@ public class SortingFocusTraversalPolicy
public Component getFirstComponent(Container aContainer) {
List<Component> cycle;
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Getting first component in " + aContainer);
}
if (aContainer == null) {
@ -446,12 +446,12 @@ public class SortingFocusTraversalPolicy
}
if (cycle.size() == 0) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Cycle is empty");
}
return null;
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Cycle is " + cycle);
}
@ -480,7 +480,7 @@ public class SortingFocusTraversalPolicy
*/
public Component getLastComponent(Container aContainer) {
List<Component> cycle;
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Getting last component in " + aContainer);
}
@ -495,12 +495,12 @@ public class SortingFocusTraversalPolicy
}
if (cycle.size() == 0) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Cycle is empty");
}
return null;
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### Cycle is " + cycle);
}

2
jdk/src/share/classes/sun/awt/AWTAutoShutdown.java
View File

@ -375,7 +375,7 @@ public final class AWTAutoShutdown implements Runnable {
}
final void dumpPeers(final PlatformLogger aLog) {
if (aLog.isLoggable(PlatformLogger.FINE)) {
if (aLog.isLoggable(PlatformLogger.Level.FINE)) {
synchronized (activationLock) {
synchronized (mainLock) {
aLog.fine("Mapped peers:");

4
jdk/src/share/classes/sun/awt/DebugSettings.java
View File

@ -128,7 +128,7 @@ final class DebugSettings {
});
// echo the initial property settings to stdout
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("DebugSettings:\n{0}", this);
}
}
@ -250,7 +250,7 @@ final class DebugSettings {
}
private void println(Object object) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer(object.toString());
}
}

6
jdk/src/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java
View File

@ -57,7 +57,7 @@ public abstract class KeyboardFocusManagerPeerImpl implements KeyboardFocusManag
public void clearGlobalFocusOwner(Window activeWindow) {
if (activeWindow != null) {
Component focusOwner = activeWindow.getFocusOwner();
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("Clearing global focus owner " + focusOwner);
}
if (focusOwner != null) {
@ -127,7 +127,7 @@ public abstract class KeyboardFocusManagerPeerImpl implements KeyboardFocusManag
FocusEvent fl = new CausedFocusEvent(currentOwner, FocusEvent.FOCUS_LOST,
false, lightweightChild, cause);
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Posting focus event: " + fl);
}
SunToolkit.postEvent(SunToolkit.targetToAppContext(currentOwner), fl);
@ -136,7 +136,7 @@ public abstract class KeyboardFocusManagerPeerImpl implements KeyboardFocusManag
FocusEvent fg = new CausedFocusEvent(lightweightChild, FocusEvent.FOCUS_GAINED,
false, currentOwner, cause);
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Posting focus event: " + fg);
}
SunToolkit.postEvent(SunToolkit.targetToAppContext(lightweightChild), fg);

20
jdk/src/share/classes/sun/awt/ScrollPaneWheelScroller.java
View File

@ -47,7 +47,7 @@ public abstract class ScrollPaneWheelScroller {
* Called from ScrollPane.processMouseWheelEvent()
*/
public static void handleWheelScrolling(ScrollPane sp, MouseWheelEvent e) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("x = " + e.getX() + ", y = " + e.getY() + ", src is " + e.getSource());
}
int increment = 0;
@ -56,7 +56,7 @@ public abstract class ScrollPaneWheelScroller {
Adjustable adj = getAdjustableToScroll(sp);
if (adj != null) {
increment = getIncrementFromAdjustable(adj, e);
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("increment from adjustable(" + adj.getClass() + ") : " + increment);
}
scrollAdjustable(adj, increment);
@ -74,7 +74,7 @@ public abstract class ScrollPaneWheelScroller {
// if policy is display always or never, use vert
if (policy == ScrollPane.SCROLLBARS_ALWAYS ||
policy == ScrollPane.SCROLLBARS_NEVER) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("using vertical scrolling due to scrollbar policy");
}
return sp.getVAdjustable();
@ -85,7 +85,7 @@ public abstract class ScrollPaneWheelScroller {
Insets ins = sp.getInsets();
int vertScrollWidth = sp.getVScrollbarWidth();
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("insets: l = " + ins.left + ", r = " + ins.right +
", t = " + ins.top + ", b = " + ins.bottom);
log.finer("vertScrollWidth = " + vertScrollWidth);
@ -94,7 +94,7 @@ public abstract class ScrollPaneWheelScroller {
// Check if scrollbar is showing by examining insets of the
// ScrollPane
if (ins.right >= vertScrollWidth) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("using vertical scrolling because scrollbar is present");
}
return sp.getVAdjustable();
@ -102,13 +102,13 @@ public abstract class ScrollPaneWheelScroller {
else {
int horizScrollHeight = sp.getHScrollbarHeight();
if (ins.bottom >= horizScrollHeight) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("using horiz scrolling because scrollbar is present");
}
return sp.getHAdjustable();
}
else {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("using NO scrollbar becsause neither is present");
}
return null;
@ -124,7 +124,7 @@ public abstract class ScrollPaneWheelScroller {
*/
public static int getIncrementFromAdjustable(Adjustable adj,
MouseWheelEvent e) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
if (adj == null) {
log.fine("Assertion (adj != null) failed");
}
@ -146,7 +146,7 @@ public abstract class ScrollPaneWheelScroller {
* bounds and sets the new value to the Adjustable.
*/
public static void scrollAdjustable(Adjustable adj, int amount) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
if (adj == null) {
log.fine("Assertion (adj != null) failed");
}
@ -157,7 +157,7 @@ public abstract class ScrollPaneWheelScroller {
int current = adj.getValue();
int upperLimit = adj.getMaximum() - adj.getVisibleAmount();
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("doScrolling by " + amount);
}

16
jdk/src/share/classes/sun/awt/SunDisplayChanger.java
View File

@ -71,12 +71,12 @@ public class SunDisplayChanger {
* notified when the display is changed.
*/
public void add(DisplayChangedListener theListener) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
if (theListener == null) {
log.fine("Assertion (theListener != null) failed");
}
}
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Adding listener: " + theListener);
}
listeners.put(theListener, null);
@ -86,12 +86,12 @@ public class SunDisplayChanger {
* Remove the given DisplayChangeListener from this SunDisplayChanger.
*/
public void remove(DisplayChangedListener theListener) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
if (theListener == null) {
log.fine("Assertion (theListener != null) failed");
}
}
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Removing listener: " + theListener);
}
listeners.remove(theListener);
@ -102,7 +102,7 @@ public class SunDisplayChanger {
* taken place by calling their displayChanged() methods.
*/
public void notifyListeners() {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("notifyListeners");
}
// This method is implemented by making a clone of the set of listeners,
@ -126,7 +126,7 @@ public class SunDisplayChanger {
while (itr.hasNext()) {
DisplayChangedListener current = itr.next();
try {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("displayChanged for listener: " + current);
}
current.displayChanged();
@ -146,7 +146,7 @@ public class SunDisplayChanger {
* taken place by calling their paletteChanged() methods.
*/
public void notifyPaletteChanged() {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("notifyPaletteChanged");
}
// This method is implemented by making a clone of the set of listeners,
@ -169,7 +169,7 @@ public class SunDisplayChanger {
while (itr.hasNext()) {
DisplayChangedListener current = itr.next();
try {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("paletteChanged for listener: " + current);
}
current.paletteChanged();

2
jdk/src/share/classes/sun/awt/SunGraphicsCallback.java
View File

@ -88,7 +88,7 @@ public abstract class SunGraphicsCallback {
int ncomponents = comps.length;
Shape clip = g.getClip();
if (log.isLoggable(PlatformLogger.FINER) && (clip != null)) {
if (log.isLoggable(PlatformLogger.Level.FINER) && (clip != null)) {
Rectangle newrect = clip.getBounds();
log.finer("x = " + newrect.x + ", y = " + newrect.y +
", width = " + newrect.width +

2
jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java
View File

@ -398,7 +398,7 @@ public abstract class DataTransferer {
* "text".
*/
public static boolean doesSubtypeSupportCharset(DataFlavor flavor) {
if (dtLog.isLoggable(PlatformLogger.FINE)) {
if (dtLog.isLoggable(PlatformLogger.Level.FINE)) {
if (!"text".equals(flavor.getPrimaryType())) {
dtLog.fine("Assertion (\"text\".equals(flavor.getPrimaryType())) failed");
}

2
jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
View File

@ -869,7 +869,7 @@ public abstract class SunDropTargetContextPeer implements DropTargetContextPeer,
void registerEvent(SunDropTargetEvent e) {
handler.lock();
if (!eventSet.add(e) && dndLog.isLoggable(PlatformLogger.FINE)) {
if (!eventSet.add(e) && dndLog.isLoggable(PlatformLogger.Level.FINE)) {
dndLog.fine("Event is already registered: " + e);
}
handler.unlock();

4
jdk/src/share/classes/sun/awt/im/InputContext.java
View File

@ -387,7 +387,7 @@ public class InputContext extends java.awt.im.InputContext
}
previousInputMethod = null;
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Current client component " + currentClientComponent);
}
if (inputMethod instanceof InputMethodAdapter) {
@ -887,7 +887,7 @@ public class InputContext extends java.awt.im.InputContext
private void logCreationFailed(Throwable throwable) {
PlatformLogger logger = PlatformLogger.getLogger("sun.awt.im");
if (logger.isLoggable(PlatformLogger.CONFIG)) {
if (logger.isLoggable(PlatformLogger.Level.CONFIG)) {
String errorTextFormat = Toolkit.getProperty("AWT.InputMethodCreationFailed",
"Could not create {0}. Reason: {1}");
Object[] args =

2
jdk/src/share/classes/sun/font/SunFontManager.java
View File

@ -3236,7 +3236,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
registeredFontFiles.add(fullName);
if (FontUtilities.debugFonts()
&& FontUtilities.getLogger().isLoggable(PlatformLogger.INFO)) {
&& FontUtilities.getLogger().isLoggable(PlatformLogger.Level.INFO)) {
String message = "Registering font " + fullName;
String[] natNames = getNativeNames(fullName, null);
if (natNames == null) {

4
jdk/src/share/classes/sun/net/ftp/impl/FtpClient.java
View File

@ -430,7 +430,7 @@ public class FtpClient extends sun.net.ftp.FtpClient {
}
response = replyBuf.toString();
replyBuf.setLength(0);
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest("Server [" + serverAddr + "] --> " + response);
}
@ -472,7 +472,7 @@ public class FtpClient extends sun.net.ftp.FtpClient {
/** Sends command <i>cmd</i> to the server. */
private void sendServer(String cmd) {
out.print(cmd);
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest("Server [" + serverAddr + "] <-- " + cmd);
}
}

2
jdk/src/share/classes/sun/net/www/http/HttpClient.java
View File

@ -125,7 +125,7 @@ public class HttpClient extends NetworkClient {
private static final PlatformLogger logger = HttpURLConnection.getHttpLogger();
private static void logFinest(String msg) {
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest(msg);
}
}

38
jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
View File

@ -413,13 +413,13 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
return java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<PasswordAuthentication>() {
public PasswordAuthentication run() {
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest("Requesting Authentication: host =" + host + " url = " + url);
}
PasswordAuthentication pass = Authenticator.requestPasswordAuthentication(
host, addr, port, protocol,
prompt, scheme, url, authType);
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest("Authentication returned: " + (pass != null ? pass.toString() : "null"));
}
return pass;
@ -632,7 +632,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
if (!chunked) {
if (requests.findValue("Transfer-Encoding") != null) {
requests.remove("Transfer-Encoding");
if (logger.isLoggable(PlatformLogger.WARNING)) {
if (logger.isLoggable(PlatformLogger.Level.WARNING)) {
logger.warning(
"use streaming mode for chunked encoding");
}
@ -645,7 +645,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
setRequests=true;
}
if (logger.isLoggable(PlatformLogger.FINE)) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine(requests.toString());
}
http.writeRequests(requests, poster, streaming());
@ -991,7 +991,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
&& !(cachedResponse instanceof SecureCacheResponse)) {
cachedResponse = null;
}
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest("Cache Request for " + uri + " / " + getRequestMethod());
logger.finest("From cache: " + (cachedResponse != null ? cachedResponse.toString() : "null"));
}
@ -1032,7 +1032,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
});
if (sel != null) {
URI uri = sun.net.www.ParseUtil.toURI(url);
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest("ProxySelector Request for " + uri);
}
Iterator<Proxy> it = sel.select(uri).iterator();
@ -1049,7 +1049,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
http = getNewHttpClient(url, p, connectTimeout, false);
http.setReadTimeout(readTimeout);
}
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
if (p != null) {
logger.finest("Proxy used: " + p.toString());
}
@ -1308,14 +1308,14 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
URI uri = ParseUtil.toURI(url);
if (uri != null) {
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest("CookieHandler request for " + uri);
}
Map<String, List<String>> cookies
= cookieHandler.get(
uri, requests.getHeaders(EXCLUDE_HEADERS));
if (!cookies.isEmpty()) {
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest("Cookies retrieved: " + cookies.toString());
}
for (Map.Entry<String, List<String>> entry :
@ -1476,14 +1476,14 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
writeRequests();
}
http.parseHTTP(responses, pi, this);
if (logger.isLoggable(PlatformLogger.FINE)) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine(responses.toString());
}
boolean b1 = responses.filterNTLMResponses("WWW-Authenticate");
boolean b2 = responses.filterNTLMResponses("Proxy-Authenticate");
if (b1 || b2) {
if (logger.isLoggable(PlatformLogger.FINE)) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine(">>>> Headers are filtered");
logger.fine(responses.toString());
}
@ -1943,12 +1943,12 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
http.parseHTTP(responses, null, this);
/* Log the response to the CONNECT */
if (logger.isLoggable(PlatformLogger.FINE)) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine(responses.toString());
}
if (responses.filterNTLMResponses("Proxy-Authenticate")) {
if (logger.isLoggable(PlatformLogger.FINE)) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine(">>>> Headers are filtered");
logger.fine(responses.toString());
}
@ -2075,7 +2075,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
setPreemptiveProxyAuthentication(requests);
/* Log the CONNECT request */
if (logger.isLoggable(PlatformLogger.FINE)) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine(requests.toString());
}
@ -2218,7 +2218,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
ret = new NegotiateAuthentication(new HttpCallerInfo(authhdr.getHttpCallerInfo(), "Kerberos"));
break;
case UNKNOWN:
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest("Unknown/Unsupported authentication scheme: " + scheme);
}
/*fall through*/
@ -2247,7 +2247,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
}
}
}
if (logger.isLoggable(PlatformLogger.FINER)) {
if (logger.isLoggable(PlatformLogger.Level.FINER)) {
logger.finer("Proxy Authentication for " + authhdr.toString() +" returned " + (ret != null ? ret.toString() : "null"));
}
return ret;
@ -2377,7 +2377,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
}
break;
case UNKNOWN:
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest("Unknown/Unsupported authentication scheme: " + scheme);
}
/*fall through*/
@ -2404,7 +2404,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
}
}
}
if (logger.isLoggable(PlatformLogger.FINER)) {
if (logger.isLoggable(PlatformLogger.Level.FINER)) {
logger.finer("Server Authentication for " + authhdr.toString() +" returned " + (ret != null ? ret.toString() : "null"));
}
return ret;
@ -2532,7 +2532,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
if (streaming()) {
throw new HttpRetryException (RETRY_MSG3, stat, loc);
}
if (logger.isLoggable(PlatformLogger.FINE)) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine("Redirected from " + url + " to " + locUrl);
}

2
jdk/src/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java
View File

@ -142,7 +142,7 @@ class NTLMAuthenticationProxy {
static void finest(Exception e) {
PlatformLogger logger = HttpURLConnection.getHttpLogger();
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest("NTLMAuthenticationProxy: " + e);
}
}

2
jdk/src/share/classes/sun/net/www/protocol/http/Negotiator.java
View File

@ -76,7 +76,7 @@ public abstract class Negotiator {
private static void finest(Exception e) {
PlatformLogger logger = HttpURLConnection.getHttpLogger();
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest("NegotiateAuthentication: " + e);
}
}

2
jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java
View File

@ -350,7 +350,7 @@ final class HttpsClient extends HttpClient
if (httpuc != null && ret.needsTunneling())
httpuc.setTunnelState(TUNNELING);
PlatformLogger logger = HttpURLConnection.getHttpLogger();
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest("KeepAlive stream retrieved from the cache, " + ret);
}
}

2
jdk/src/solaris/classes/sun/awt/X11/ListHelper.java
View File

@ -261,7 +261,7 @@ public class ListHelper implements XScrollbarClient {
}
public int y2index(int y) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("y=" + y +", firstIdx=" + firstDisplayedIndex() +", itemHeight=" + getItemHeight()
+ ",item_margin=" + ITEM_MARGIN);
}

2
jdk/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java
View File

@ -59,7 +59,7 @@ class UnsafeXDisposerRecord implements sun.java2d.DisposerRecord {
XToolkit.awtLock();
try {
if (!disposed) {
if (XlibWrapper.isBuildInternal && "Java2D Disposer".equals(Thread.currentThread().getName()) && log.isLoggable(PlatformLogger.WARNING)) {
if (XlibWrapper.isBuildInternal && "Java2D Disposer".equals(Thread.currentThread().getName()) && log.isLoggable(PlatformLogger.Level.WARNING)) {
if (place != null) {
log.warning(name + " object was not disposed before finalization!", place);
} else {

16
jdk/src/solaris/classes/sun/awt/X11/XAWTXSettings.java
View File

@ -55,7 +55,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener {
}
void initXSettings() {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Initializing XAWT XSettings");
}
settings = new XMSelection("_XSETTINGS");
@ -68,27 +68,27 @@ class XAWTXSettings extends XSettings implements XMSelectionListener {
}
public void ownerDeath(int screen, XMSelection sel, long deadOwner) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Owner " + deadOwner + " died for selection " + sel + " screen "+ screen);
}
}
public void ownerChanged(int screen, XMSelection sel, long newOwner, long data, long timestamp) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("New Owner "+ newOwner + " for selection = " + sel + " screen " +screen );
}
}
public void selectionChanged(int screen, XMSelection sel, long owner , XPropertyEvent event) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Selection changed on sel " + sel + " screen = " + screen + " owner = " + owner + " event = " + event);
}
updateXSettings(screen,owner);
}
void initPerScreenXSettings() {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Updating Per XSettings changes");
}
@ -124,7 +124,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener {
}
private Map getUpdatedSettings(final long owner) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("owner =" + owner);
}
if (0 == owner) {
@ -140,7 +140,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener {
int status = getter.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance());
if (status != XConstants.Success || getter.getData() == 0) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("OH OH : getter failed status = " + status );
}
settings = null;
@ -148,7 +148,7 @@ class XAWTXSettings extends XSettings implements XMSelectionListener {
long ptr = getter.getData();
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("noItems = " + getter.getNumberOfItems());
}
byte array[] = Native.toBytes(ptr,getter.getNumberOfItems());

10
jdk/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java
View File

@ -330,7 +330,7 @@ abstract public class XBaseMenuWindow extends XWindow {
items.add(mp);
}
} else {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("WARNING: Attempt to add menu item without a peer");
}
}
@ -351,7 +351,7 @@ abstract public class XBaseMenuWindow extends XWindow {
if (index < items.size()) {
items.remove(index);
} else {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("WARNING: Attempt to remove non-existing menu item, index : " + index + ", item count : " + items.size());
}
}
@ -386,7 +386,7 @@ abstract public class XBaseMenuWindow extends XWindow {
XMenuPeer showingSubmenu = getShowingSubmenu();
int newSelectedIndex = (item != null) ? items.indexOf(item) : -1;
if (this.selectedIndex != newSelectedIndex) {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Selected index changed, was : " + this.selectedIndex + ", new : " + newSelectedIndex);
}
this.selectedIndex = newSelectedIndex;
@ -426,7 +426,7 @@ abstract public class XBaseMenuWindow extends XWindow {
try {
synchronized(getMenuTreeLock()) {
if (showingSubmenu != submenuToShow) {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Changing showing submenu");
}
if (showingSubmenu != null) {
@ -1122,7 +1122,7 @@ abstract public class XBaseMenuWindow extends XWindow {
* that grabs input focus
*/
void doHandleJavaKeyEvent(KeyEvent event) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer(event.toString());
}
if (event.getID() != KeyEvent.KEY_PRESSED) {

30
jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java
View File

@ -160,7 +160,7 @@ public class XBaseWindow {
* with class-specific values and perform post-initialization actions.
*/
void postInit(XCreateWindowParams params) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("WM name is " + getWMName());
}
updateWMName();
@ -362,7 +362,7 @@ public class XBaseWindow {
value_mask |= XConstants.CWBitGravity;
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Creating window for " + this + " with the following attributes: \n" + params);
}
window = XlibWrapper.XCreateWindow(XToolkit.getDisplay(),
@ -482,7 +482,7 @@ public class XBaseWindow {
}
public void setSizeHints(long flags, int x, int y, int width, int height) {
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Setting hints, flags " + XlibWrapper.hintsToString(flags));
}
XToolkit.awtLock();
@ -545,7 +545,7 @@ public class XBaseWindow {
flags |= XUtilConstants.PWinGravity;
hints.set_flags(flags);
hints.set_win_gravity((int)XConstants.NorthWestGravity);
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Setting hints, resulted flags " + XlibWrapper.hintsToString(flags) +
", values " + hints);
}
@ -599,7 +599,7 @@ public class XBaseWindow {
public void xRequestFocus(long time) {
XToolkit.awtLock();
try {
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("XSetInputFocus on " + Long.toHexString(getWindow()) + " with time " + time);
}
XlibWrapper.XSetInputFocus2(XToolkit.getDisplay(), getWindow(), time);
@ -610,7 +610,7 @@ public class XBaseWindow {
public void xRequestFocus() {
XToolkit.awtLock();
try {
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("XSetInputFocus on " + Long.toHexString(getWindow()));
}
XlibWrapper.XSetInputFocus(XToolkit.getDisplay(), getWindow());
@ -629,7 +629,7 @@ public class XBaseWindow {
}
public void xSetVisible(boolean visible) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Setting visible on " + this + " to " + visible);
}
XToolkit.awtLock();
@ -716,7 +716,7 @@ public class XBaseWindow {
insLog.warning("Attempt to resize uncreated window");
throw new IllegalStateException("Attempt to resize uncreated window");
}
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Setting bounds on " + this + " to (" + x + ", " + y + "), " + width + "x" + height);
}
width = Math.max(MIN_SIZE, width);
@ -834,7 +834,7 @@ public class XBaseWindow {
* The active grab overrides activated automatic grab.
*/
public boolean grabInput() {
if (grabLog.isLoggable(PlatformLogger.FINE)) {
if (grabLog.isLoggable(PlatformLogger.Level.FINE)) {
grabLog.fine("Grab input on {0}", this);
}
@ -899,7 +899,7 @@ public class XBaseWindow {
XToolkit.awtLock();
try {
XBaseWindow grabWindow = XAwtState.getGrabWindow();
if (grabLog.isLoggable(PlatformLogger.FINE)) {
if (grabLog.isLoggable(PlatformLogger.Level.FINE)) {
grabLog.fine("UnGrab input on {0}", grabWindow);
}
if (grabWindow != null) {
@ -943,7 +943,7 @@ public class XBaseWindow {
mapped = false;
}
public void handleReparentNotifyEvent(XEvent xev) {
if (eventLog.isLoggable(PlatformLogger.FINER)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINER)) {
XReparentEvent msg = xev.get_xreparent();
eventLog.finer(msg.toString());
}
@ -953,7 +953,7 @@ public class XBaseWindow {
if (XPropertyCache.isCachingSupported()) {
XPropertyCache.clearCache(window, XAtom.get(msg.get_atom()));
}
if (eventLog.isLoggable(PlatformLogger.FINER)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINER)) {
eventLog.finer("{0}", msg);
}
}
@ -983,7 +983,7 @@ public class XBaseWindow {
}
public void handleClientMessage(XEvent xev) {
if (eventLog.isLoggable(PlatformLogger.FINER)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINER)) {
XClientMessageEvent msg = xev.get_xclient();
eventLog.finer(msg.toString());
}
@ -1039,7 +1039,7 @@ public class XBaseWindow {
}
public void handleConfigureNotifyEvent(XEvent xev) {
XConfigureEvent xe = xev.get_xconfigure();
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Configure, {0}", xe);
}
x = xe.get_x();
@ -1092,7 +1092,7 @@ public class XBaseWindow {
}
public void dispatchEvent(XEvent xev) {
if (eventLog.isLoggable(PlatformLogger.FINEST)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) {
eventLog.finest(xev.toString());
}
int type = xev.get_type();

8
jdk/src/solaris/classes/sun/awt/X11/XCheckboxPeer.java
View File

@ -172,7 +172,7 @@ class XCheckboxPeer extends XComponentPeer implements CheckboxPeer {
Checkbox cb = (Checkbox) e.getSource();
if (cb.contains(e.getX(), e.getY())) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("mousePressed() on " + target.getName() + " : armed = " + armed + ", pressed = " + pressed
+ ", selected = " + selected + ", enabled = " + isEnabled());
}
@ -190,7 +190,7 @@ class XCheckboxPeer extends XComponentPeer implements CheckboxPeer {
}
public void mouseReleased(MouseEvent e) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("mouseReleased() on " + target.getName() + ": armed = " + armed + ", pressed = " + pressed
+ ", selected = " + selected + ", enabled = " + isEnabled());
}
@ -215,7 +215,7 @@ class XCheckboxPeer extends XComponentPeer implements CheckboxPeer {
}
public void mouseEntered(MouseEvent e) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("mouseEntered() on " + target.getName() + ": armed = " + armed + ", pressed = " + pressed
+ ", selected = " + selected + ", enabled = " + isEnabled());
}
@ -226,7 +226,7 @@ class XCheckboxPeer extends XComponentPeer implements CheckboxPeer {
}
public void mouseExited(MouseEvent e) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("mouseExited() on " + target.getName() + ": armed = " + armed + ", pressed = " + pressed
+ ", selected = " + selected + ", enabled = " + isEnabled());
}

2
jdk/src/solaris/classes/sun/awt/X11/XChoicePeer.java
View File

@ -892,7 +892,7 @@ public class XChoicePeer extends XComponentPeer implements ChoicePeer, ToplevelS
if (transX > 0 && transX < width &&
transY > 0 && transY < height) {
int newIdx = helper.y2index(transY);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("transX=" + transX + ", transY=" + transY
+ ",width=" + width + ", height=" + height
+ ", newIdx=" + newIdx + " on " + target);

40
jdk/src/solaris/classes/sun/awt/X11/XComponentPeer.java
View File

@ -214,7 +214,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
* Called when component receives focus
*/
public void focusGained(FocusEvent e) {
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("{0}", e);
}
bHasFocus = true;
@ -224,7 +224,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
* Called when component loses focus
*/
public void focusLost(FocusEvent e) {
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("{0}", e);
}
bHasFocus = false;
@ -298,7 +298,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
case XKeyboardFocusManagerPeer.SNFH_SUCCESS_PROCEED:
// Currently we just generate focus events like we deal with lightweight instead of calling
// XSetInputFocus on native window
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Proceeding with request to " +
lightweightChild + " in " + target);
}
@ -325,7 +325,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
*/
boolean res = wpeer.requestWindowFocus(null);
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Requested window focus: " + res);
}
// If parent window can be made focused and has been made focused(synchronously)
@ -347,7 +347,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
}
private boolean rejectFocusRequestHelper(String logMsg) {
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer(logMsg);
}
XKeyboardFocusManagerPeer.removeLastFocusRequest(target);
@ -355,7 +355,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
}
void handleJavaFocusEvent(AWTEvent e) {
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer(e.toString());
}
if (e.getID() == FocusEvent.FOCUS_GAINED) {
@ -386,7 +386,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
* @see java.awt.peer.ComponentPeer
*/
public void setEnabled(final boolean value) {
if (enableLog.isLoggable(PlatformLogger.FINE)) {
if (enableLog.isLoggable(PlatformLogger.Level.FINE)) {
enableLog.fine("{0}ing {1}", (value ? "Enabl" : "Disabl"), this);
}
boolean status = value;
@ -467,13 +467,13 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
if (true) {
switch(e.getID()) {
case PaintEvent.UPDATE:
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("XCP coalescePaintEvent : UPDATE : add : x = " +
r.x + ", y = " + r.y + ", width = " + r.width + ",height = " + r.height);
}
return;
case PaintEvent.PAINT:
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("XCP coalescePaintEvent : PAINT : add : x = " +
r.x + ", y = " + r.y + ", width = " + r.width + ",height = " + r.height);
}
@ -640,7 +640,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
}
public void setBackground(Color c) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Set background to " + c);
}
synchronized (getStateLock()) {
@ -651,7 +651,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
}
public void setForeground(Color c) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Set foreground to " + c);
}
synchronized (getStateLock()) {
@ -672,7 +672,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
* @since JDK1.0
*/
public FontMetrics getFontMetrics(Font font) {
if (fontLog.isLoggable(PlatformLogger.FINE)) {
if (fontLog.isLoggable(PlatformLogger.Level.FINE)) {
fontLog.fine("Getting font metrics for " + font);
}
return sun.font.FontDesignMetrics.getMetrics(font);
@ -1158,7 +1158,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
public void createBuffers(int numBuffers, BufferCapabilities caps)
throws AWTException
{
if (buffersLog.isLoggable(PlatformLogger.FINE)) {
if (buffersLog.isLoggable(PlatformLogger.Level.FINE)) {
buffersLog.fine("createBuffers(" + numBuffers + ", " + caps + ")");
}
// set the caps first, they're used when creating the bb
@ -1176,7 +1176,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
public void flip(int x1, int y1, int x2, int y2,
BufferCapabilities.FlipContents flipAction)
{
if (buffersLog.isLoggable(PlatformLogger.FINE)) {
if (buffersLog.isLoggable(PlatformLogger.Level.FINE)) {
buffersLog.fine("flip(" + flipAction + ")");
}
if (backBuffer == 0) {
@ -1187,7 +1187,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
}
public Image getBackBuffer() {
if (buffersLog.isLoggable(PlatformLogger.FINE)) {
if (buffersLog.isLoggable(PlatformLogger.Level.FINE)) {
buffersLog.fine("getBackBuffer()");
}
if (backBuffer == 0) {
@ -1197,7 +1197,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
}
public void destroyBuffers() {
if (buffersLog.isLoggable(PlatformLogger.FINE)) {
if (buffersLog.isLoggable(PlatformLogger.Level.FINE)) {
buffersLog.fine("destroyBuffers()");
}
graphicsConfig.destroyBackBuffer(backBuffer);
@ -1232,7 +1232,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
* ButtonPress, ButtonRelease, KeyPress, KeyRelease, EnterNotify, LeaveNotify, MotionNotify
*/
protected boolean isEventDisabled(XEvent e) {
if (enableLog.isLoggable(PlatformLogger.FINEST)) {
if (enableLog.isLoggable(PlatformLogger.Level.FINEST)) {
enableLog.finest("Component is {1}, checking for disabled event {0}", e, (isEnabled()?"enabled":"disable"));
}
if (!isEnabled()) {
@ -1244,7 +1244,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
case XConstants.EnterNotify:
case XConstants.LeaveNotify:
case XConstants.MotionNotify:
if (enableLog.isLoggable(PlatformLogger.FINER)) {
if (enableLog.isLoggable(PlatformLogger.Level.FINER)) {
enableLog.finer("Event {0} is disable", e);
}
return true;
@ -1367,7 +1367,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
*/
public void applyShape(Region shape) {
if (XlibUtil.isShapingSupported()) {
if (shapeLog.isLoggable(PlatformLogger.FINER)) {
if (shapeLog.isLoggable(PlatformLogger.Level.FINER)) {
shapeLog.finer(
"*** INFO: Setting shape: PEER: " + this
+ "; WINDOW: " + getWindow()
@ -1397,7 +1397,7 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
XToolkit.awtUnlock();
}
} else {
if (shapeLog.isLoggable(PlatformLogger.FINER)) {
if (shapeLog.isLoggable(PlatformLogger.Level.FINER)) {
shapeLog.finer("*** WARNING: Shaping is NOT supported!");
}
}

2
jdk/src/solaris/classes/sun/awt/X11/XContentWindow.java
View File

@ -115,7 +115,7 @@ public final class XContentWindow extends XWindow {
if (in != null) {
newBounds.setLocation(-in.left, -in.top);
}
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Setting content bounds {0}, old bounds {1}",
newBounds, getBounds());
}

60
jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
View File

@ -79,7 +79,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
Rectangle bounds = (Rectangle)params.get(BOUNDS);
dimensions = new WindowDimensions(bounds, getRealInsets(), false);
params.put(BOUNDS, dimensions.getClientRect());
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Initial dimensions {0}", dimensions);
}
@ -182,7 +182,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
}
public void setTitle(String title) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Title is " + title);
}
winAttr.title = title;
@ -232,7 +232,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
// If we somehow received focus events forward it instead to proxy
// FIXME: Shouldn't we instead check for inferrior?
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Received focus event on shell: " + xfe);
}
// focusProxy.xRequestFocus();
@ -276,7 +276,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
wm_set_insets = XWM.getInsetsFromProp(getWindow(), changedAtom);
}
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("FRAME_EXTENTS: {0}", wm_set_insets);
}
@ -305,7 +305,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
public void handleReparentNotifyEvent(XEvent xev) {
XReparentEvent xe = xev.get_xreparent();
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine(xe.toString());
}
reparent_serial = xe.get_serial();
@ -346,7 +346,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
// Check if we have insets provided by the WM
Insets correctWM = getWMSetInsets(null);
if (correctWM != null) {
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("wm-provided insets {0}", correctWM);
}
// If these insets are equal to our current insets - no actions are necessary
@ -361,7 +361,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
} else {
correctWM = XWM.getWM().getInsets(this, xe.get_window(), xe.get_parent());
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
if (correctWM != null) {
insLog.finer("correctWM {0}", correctWM);
} else {
@ -387,7 +387,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
* initial insets were wrong (most likely they were).
*/
Insets correction = difference(correctWM, currentInsets);
if (insLog.isLoggable(PlatformLogger.FINEST)) {
if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
insLog.finest("Corrention {0}", correction);
}
if (!isNull(correction)) {
@ -399,7 +399,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
//update minimum size hints
updateMinSizeHints();
}
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Dimensions before reparent: " + dimensions);
}
@ -474,7 +474,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
public Insets getInsets() {
Insets in = copy(getRealInsets());
in.top += getMenuBarHeight();
if (insLog.isLoggable(PlatformLogger.FINEST)) {
if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
insLog.finest("Get insets returns {0}", in);
}
return in;
@ -504,7 +504,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
public void reshape(WindowDimensions newDimensions, int op,
boolean userReshape)
{
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Reshaping " + this + " to " + newDimensions + " op " + op + " user reshape " + userReshape);
}
if (userReshape) {
@ -525,7 +525,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
XToolkit.awtLock();
try {
if (!isReparented() || !isVisible()) {
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("- not reparented({0}) or not visible({1}), default reshape",
Boolean.valueOf(isReparented()), Boolean.valueOf(visible));
}
@ -633,7 +633,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
dims.setSize(width, height);
break;
}
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("For the operation {0} new dimensions are {1}",
operationToString(operation), dims);
}
@ -666,7 +666,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
public void handleConfigureNotifyEvent(XEvent xev) {
assert (SunToolkit.isAWTLockHeldByCurrentThread());
XConfigureEvent xe = xev.get_xconfigure();
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Configure notify {0}", xe);
}
@ -705,7 +705,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
* it!!!! or we wind up in a bogus location.
*/
int runningWM = XWM.getWMID();
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("reparented={0}, visible={1}, WM={2}, decorations={3}",
isReparented(), isVisible(), runningWM, getDecorations());
}
@ -719,7 +719,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
if (!insets_corrected && getDecorations() != XWindowAttributesData.AWT_DECOR_NONE) {
long parent = XlibUtil.getParentWindow(window);
Insets correctWM = (parent != -1) ? XWM.getWM().getInsets(this, window, parent) : null;
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
if (correctWM != null) {
insLog.finer("Configure notify - insets : " + correctWM);
} else {
@ -759,7 +759,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
case XWM.SAWFISH_WM:
{
Point xlocation = queryXLocation();
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("New X location: {0}", xlocation);
}
if (xlocation != null) {
@ -778,7 +778,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
copy(currentInsets),
true);
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Insets are {0}, new dimensions {1}",
currentInsets, newDimensions);
}
@ -816,7 +816,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
}
public void setShellBounds(Rectangle rec) {
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Setting shell bounds on " + this + " to " + rec);
}
XToolkit.awtLock();
@ -830,7 +830,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
}
}
public void setShellSize(Rectangle rec) {
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Setting shell size on " + this + " to " + rec);
}
XToolkit.awtLock();
@ -843,7 +843,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
}
}
public void setShellPosition(Rectangle rec) {
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Setting shell position on " + this + " to " + rec);
}
XToolkit.awtLock();
@ -945,7 +945,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
return toGlobal(0,0);
} else {
Point location = target.getLocation();
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("getLocationOnScreen {0} not reparented: {1} ",
this, location);
}
@ -985,7 +985,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
}
public void setVisible(boolean vis) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Setting {0} to visible {1}", this, Boolean.valueOf(vis));
}
if (vis && !isVisible()) {
@ -1038,7 +1038,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
}
private void handleWmTakeFocus(XClientMessageEvent cl) {
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("WM_TAKE_FOCUS on {0}", this);
}
requestWindowFocus(cl.get_data(1), true);
@ -1053,11 +1053,11 @@ abstract class XDecoratedPeer extends XWindowPeer {
// by "proxy" - invisible mapped window. When we want to set X input focus to
// toplevel set it on proxy instead.
if (focusProxy == null) {
if (focusLog.isLoggable(PlatformLogger.WARNING)) {
if (focusLog.isLoggable(PlatformLogger.Level.WARNING)) {
focusLog.warning("Focus proxy is null for " + this);
}
} else {
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("Requesting focus to proxy: " + focusProxy);
}
if (timeProvided) {
@ -1151,7 +1151,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
Window focusedWindow = XKeyboardFocusManagerPeer.getInstance().getCurrentFocusedWindow();
Window activeWindow = XWindowPeer.getDecoratedOwner(focusedWindow);
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Current window is: active={0}, focused={1}",
Boolean.valueOf(target == activeWindow),
Boolean.valueOf(target == focusedWindow));
@ -1178,20 +1178,20 @@ abstract class XDecoratedPeer extends XWindowPeer {
return true;
}
Window realNativeFocusedWindow = XWindowPeer.getNativeFocusedWindow();
if (focusLog.isLoggable(PlatformLogger.FINEST)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
focusLog.finest("Real native focused window: " + realNativeFocusedWindow +
"\nKFM's focused window: " + focusedWindow);
}
// A workaround for Metacity. See 6522725, 6613426, 7147075.
if (target == realNativeFocusedWindow && XWM.getWMID() == XWM.METACITY_WM) {
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("The window is already natively focused.");
}
return true;
}
}
if (focusLog.isLoggable(PlatformLogger.FINE)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
focusLog.fine("Requesting focus to " + (this == toFocus ? "this window" : toFocus));
}

2
jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java
View File

@ -395,7 +395,7 @@ class XDnDDragSourceProtocol extends XDragSourceProtocol {
return false;
}
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest(" sourceWindow=" + sourceWindow +
" get_window=" + xclient.get_window() +
" xclient=" + xclient);

12
jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java
View File

@ -993,7 +993,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol {
if (sourceFormats != null && sourceFormats.length > 3) {
data1 |= XDnDConstants.XDND_DATA_TYPES_BIT;
}
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest(" "
+ " entryVersion=" + version
+ " sourceProtocolVersion=" +
@ -1052,7 +1052,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol {
public boolean forwardEventToEmbedded(long embedded, long ctxt,
int eventID) {
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest(" ctxt=" + ctxt +
" type=" + (ctxt != 0 ?
getMessageType(new
@ -1080,7 +1080,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol {
long data3 = Native.getLong(ctxt + size + 2 * Native.getLongSize());
long data4 = Native.getLong(ctxt + size + 3 * Native.getLongSize());
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest(" 1 "
+ " embedded=" + embedded
+ " source=" + xclient.get_data(0)
@ -1114,7 +1114,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol {
if ((XErrorHandlerUtil.saved_error != null) &&
(XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) {
if (logger.isLoggable(PlatformLogger.WARNING)) {
if (logger.isLoggable(PlatformLogger.Level.WARNING)) {
logger.warning("Cannot set XdndTypeList on the proxy window");
}
}
@ -1122,7 +1122,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol {
XToolkit.awtUnlock();
}
} else {
if (logger.isLoggable(PlatformLogger.WARNING)) {
if (logger.isLoggable(PlatformLogger.Level.WARNING)) {
logger.warning("Cannot read XdndTypeList from the source window");
}
}
@ -1137,7 +1137,7 @@ class XDnDDropTargetProtocol extends XDropTargetProtocol {
overXEmbedClient = true;
}
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest(" 2 "
+ " embedded=" + embedded
+ " xclient=" + xclient);

2
jdk/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java
View File

@ -542,7 +542,7 @@ public final class XDragSourceContextPeer
return false;
}
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest(" proxyModeSourceWindow=" +
getProxyModeSourceWindow() +
" ev=" + ev);

2
jdk/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java
View File

@ -199,7 +199,7 @@ final class XDropTargetContextPeer extends SunDropTargetContextPeer {
structure. */
long ctxt = getNativeDragContext();
if (logger.isLoggable(PlatformLogger.FINER)) {
if (logger.isLoggable(PlatformLogger.Level.FINER)) {
logger.finer(" processing " + event + " ctxt=" + ctxt +
" consumed=" + event.isConsumed());
}

6
jdk/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java
View File

@ -116,7 +116,7 @@ abstract class XDropTargetProtocol {
XClientMessageEvent xclient) {
EmbedderRegistryEntry entry = getEmbedderRegistryEntry(toplevel);
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest(" entry={0}", entry);
}
// Window not registered as an embedder for this protocol.
@ -124,7 +124,7 @@ abstract class XDropTargetProtocol {
return false;
}
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest(" entry.isOverriden()={0}", entry.isOverriden());
}
// Window didn't have an associated drop site, so there is no need
@ -137,7 +137,7 @@ abstract class XDropTargetProtocol {
long proxy = entry.getProxy();
if (logger.isLoggable(PlatformLogger.FINEST)) {
if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
logger.finest(" proxy={0} toplevel={1}", proxy, toplevel);
}
if (proxy == 0) {

8
jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java
View File

@ -614,7 +614,7 @@ final class XDropTargetRegistry {
if (info != null &&
info.getProtocolVersion() >= XDnDConstants.XDND_MIN_PROTOCOL_VERSION) {
if (logger.isLoggable(PlatformLogger.FINE)) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine(" XEmbed drop site will be registered for " + Long.toHexString(clientWindow));
}
registerEmbeddedDropSite(canvasWindow, clientWindow);
@ -628,14 +628,14 @@ final class XDropTargetRegistry {
dropTargetProtocol.registerEmbeddedDropSite(clientWindow);
}
if (logger.isLoggable(PlatformLogger.FINE)) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine(" XEmbed drop site has been registered for " + Long.toHexString(clientWindow));
}
}
}
public void unregisterXEmbedClient(long canvasWindow, long clientWindow) {
if (logger.isLoggable(PlatformLogger.FINE)) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine(" XEmbed drop site will be unregistered for " + Long.toHexString(clientWindow));
}
Iterator dropTargetProtocols =
@ -649,7 +649,7 @@ final class XDropTargetRegistry {
unregisterEmbeddedDropSite(canvasWindow, clientWindow);
if (logger.isLoggable(PlatformLogger.FINE)) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine(" XEmbed drop site has beed unregistered for " + Long.toHexString(clientWindow));
}
}

54
jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java
View File

@ -123,7 +123,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
}
void initDispatching() {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("Init embedding for " + Long.toHexString(xembed.handle));
}
XToolkit.awtLock();
@ -142,7 +142,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
}
void endDispatching() {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("End dispatching for " + Long.toHexString(xembed.handle));
}
XToolkit.awtLock();
@ -164,7 +164,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
}
void childDestroyed() {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("Child " + Long.toHexString(xembed.handle) + " has self-destroyed.");
}
endDispatching();
@ -196,10 +196,10 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
switch (ev.get_type()) {
case XConstants.CreateNotify:
XCreateWindowEvent cr = ev.get_xcreatewindow();
if (xembedLog.isLoggable(PlatformLogger.FINEST)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINEST)) {
xembedLog.finest("Message on embedder: " + cr);
}
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Create notify for parent " + Long.toHexString(cr.get_parent()) +
", window " + Long.toHexString(cr.get_window()));
}
@ -207,20 +207,20 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
break;
case XConstants.DestroyNotify:
XDestroyWindowEvent dn = ev.get_xdestroywindow();
if (xembedLog.isLoggable(PlatformLogger.FINEST)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINEST)) {
xembedLog.finest("Message on embedder: " + dn);
}
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Destroy notify for parent: " + dn);
}
childDestroyed();
break;
case XConstants.ReparentNotify:
XReparentEvent rep = ev.get_xreparent();
if (xembedLog.isLoggable(PlatformLogger.FINEST)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINEST)) {
xembedLog.finest("Message on embedder: " + rep);
}
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Reparent notify for parent " + Long.toHexString(rep.get_parent()) +
", window " + Long.toHexString(rep.get_window()) +
", event " + Long.toHexString(rep.get_event()));
@ -323,7 +323,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
}
void childResized() {
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
Rectangle bounds = getClientBounds();
xembedLog.finer("Child resized: " + bounds);
// It is not required to update embedder's size when client size changes
@ -388,7 +388,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
}
void detachChild() {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("Detaching child " + Long.toHexString(xembed.handle));
}
/**
@ -471,7 +471,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
try {
XKeyEvent ke = new XKeyEvent(data);
ke.set_window(xembed.handle);
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("Forwarding native key event: " + ke);
}
XToolkit.awtLock();
@ -504,7 +504,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
postEvent(new InvocationEvent(target, new Runnable() {
public void run() {
GrabbedKey grab = new GrabbedKey(keysym, modifiers);
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("Grabbing key: " + grab);
}
synchronized(GRAB_LOCK) {
@ -518,7 +518,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
postEvent(new InvocationEvent(target, new Runnable() {
public void run() {
GrabbedKey grab = new GrabbedKey(keysym, modifiers);
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("UnGrabbing key: " + grab);
}
synchronized(GRAB_LOCK) {
@ -533,7 +533,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
public void run() {
AWTKeyStroke stroke = xembed.getKeyStrokeForKeySym(keysym, modifiers);
if (stroke != null) {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("Registering accelerator " + accel_id + " for " + stroke);
}
synchronized(ACCEL_LOCK) {
@ -553,7 +553,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
synchronized(ACCEL_LOCK) {
stroke = accelerators.get(accel_id);
if (stroke != null) {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("Unregistering accelerator: " + accel_id);
}
accelerators.remove(accel_id);
@ -601,7 +601,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
boolean result = false;
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Post-processing event " + e);
}
@ -616,7 +616,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
}
}
if (exists) {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("Activating accelerator " + accel_id);
}
xembed.sendMessage(xembed.handle, XEMBED_ACTIVATE_ACCELERATOR, accel_id, 0, 0); // FIXME: How about overloaded?
@ -630,7 +630,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
exists = grabbed_keys.contains(key);
}
if (exists) {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("Forwarding grabbed key " + e);
}
forwardKeyEvent(e);
@ -651,11 +651,11 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
public void handleClientMessage(XEvent xev) {
super.handleClientMessage(xev);
XClientMessageEvent msg = xev.get_xclient();
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Client message to embedder: " + msg);
}
if (msg.get_message_type() == xembed.XEmbed.getAtom()) {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine(xembed.XEmbedMessageToString(msg));
}
}
@ -723,7 +723,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
}
public boolean processXEmbedDnDEvent(long ctxt, int eventID) {
if (xembedLog.isLoggable(PlatformLogger.FINEST)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINEST)) {
xembedLog.finest(" Drop target=" + target.getDropTarget());
}
if (target.getDropTarget() instanceof XEmbedDropTarget) {
@ -758,7 +758,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
boolean new_mapped = (flags & XEMBED_MAPPED) != 0;
boolean currently_mapped = XlibUtil.getWindowMapState(handle) != XConstants.IsUnmapped;
if (new_mapped != currently_mapped) {
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Mapping state of the client has changed, old state: " + currently_mapped + ", new state: " + new_mapped);
}
if (new_mapped) {
@ -777,7 +777,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
}
}
} else {
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Mapping state didn't change, mapped: " + currently_mapped);
}
}
@ -790,7 +790,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
public void handlePropertyNotify(XEvent xev) {
if (isXEmbedActive()) {
XPropertyEvent ev = xev.get_xproperty();
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Property change on client: " + ev);
}
if (ev.get_atom() == XAtom.XA_WM_NORMAL_HINTS) {
@ -813,7 +813,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
void handleConfigureNotify(XEvent xev) {
if (isXEmbedActive()) {
XConfigureEvent ev = xev.get_xconfigure();
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Bounds change on client: " + ev);
}
if (xev.get_xany().get_window() == handle) {
@ -866,7 +866,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
// We recognize only these masks
modifiers = ke.get_state() & (XConstants.ShiftMask | XConstants.ControlMask | XConstants.LockMask);
if (xembedLog.isLoggable(PlatformLogger.FINEST)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINEST)) {
xembedLog.finest("Mapped " + e + " to " + this);
}
} finally {

8
jdk/src/solaris/classes/sun/awt/X11/XEmbedClientHelper.java
View File

@ -53,7 +53,7 @@ public class XEmbedClientHelper extends XEmbedHelper implements XEventDispatcher
}
void setClient(XEmbeddedFramePeer client) {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("XEmbed client: " + client);
}
if (embedded != null) {
@ -67,7 +67,7 @@ public class XEmbedClientHelper extends XEmbedHelper implements XEventDispatcher
}
void install() {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("Installing xembedder on " + embedded);
}
long[] info = new long[] { XEMBED_VERSION, XEMBED_MAPPED };
@ -95,11 +95,11 @@ public class XEmbedClientHelper extends XEmbedHelper implements XEventDispatcher
void handleClientMessage(XEvent xev) {
XClientMessageEvent msg = xev.get_xclient();
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine(msg.toString());
}
if (msg.get_message_type() == XEmbed.getAtom()) {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("Embedded message: " + msgidToString((int)msg.get_data(1)));
}
switch ((int)msg.get_data(1)) {

6
jdk/src/solaris/classes/sun/awt/X11/XEmbedHelper.java
View File

@ -82,13 +82,13 @@ public class XEmbedHelper {
XEmbedHelper() {
if (XEmbed == null) {
XEmbed = XAtom.get("_XEMBED");
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Created atom " + XEmbed.toString());
}
}
if (XEmbedInfo == null) {
XEmbedInfo = XAtom.get("_XEMBED_INFO");
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Created atom " + XEmbedInfo.toString());
}
}
@ -110,7 +110,7 @@ public class XEmbedHelper {
msg.set_data(4, data2);
XToolkit.awtLock();
try {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("Sending " + XEmbedMessageToString(msg));
}
XlibWrapper.XSendEvent(XToolkit.getDisplay(), window, false, XConstants.NoEventMask, msg.pData);

24
jdk/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java
View File

@ -81,7 +81,7 @@ public class XEmbedServerTester implements XEventDispatcher {
throw new RuntimeException("Can't create robot");
}
initAccel();
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("XEmbed client(tester), embedder window: " + Long.toHexString(parent));
}
}
@ -91,7 +91,7 @@ public class XEmbedServerTester implements XEventDispatcher {
}
private void dumpReceivedEvents() {
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Events received so far:");
int pos = 0;
for (Integer event : events) {
@ -395,7 +395,7 @@ public class XEmbedServerTester implements XEventDispatcher {
SubstructureNotifyMask | KeyPressMask)});
window = new XBaseWindow(params);
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Created tester window: " + window);
}
@ -535,7 +535,7 @@ public class XEmbedServerTester implements XEventDispatcher {
synchronized(EVENT_LOCK) {
// Check for already received events after the request
if (checkEventList(position, event) != -1) {
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("The event " + XEmbedHelper.msgidToString(event) + " has already been received");
}
return;
@ -543,14 +543,14 @@ public class XEmbedServerTester implements XEventDispatcher {
if (eventReceived == event) {
// Already received
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Already received " + XEmbedHelper.msgidToString(event));
}
return;
}
eventReceived = -1;
eventWaited = event;
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Waiting for " + XEmbedHelper.msgidToString(event) + " starting from " + position);
}
try {
@ -563,7 +563,7 @@ public class XEmbedServerTester implements XEventDispatcher {
dumpReceivedEvents();
throw new RuntimeException("Didn't receive event " + XEmbedHelper.msgidToString(event) + " but recevied " + XEmbedHelper.msgidToString(eventReceived));
} else {
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Successfully recevied " + XEmbedHelper.msgidToString(event));
}
}
@ -648,7 +648,7 @@ public class XEmbedServerTester implements XEventDispatcher {
if (ev.get_type() == ClientMessage) {
XClientMessageEvent msg = ev.get_xclient();
if (msg.get_message_type() == xembed.XEmbed.getAtom()) {
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine("Embedded message: " + XEmbedHelper.msgidToString((int)msg.get_data(1)));
}
switch ((int)msg.get_data(1)) {
@ -675,12 +675,12 @@ public class XEmbedServerTester implements XEventDispatcher {
synchronized(EVENT_LOCK) {
events.add((int)msg.get_data(1));
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Tester is waiting for " + XEmbedHelper.msgidToString(eventWaited));
}
if ((int)msg.get_data(1) == eventWaited) {
eventReceived = (int)msg.get_data(1);
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Notifying waiting object for event " + System.identityHashCode(EVENT_LOCK));
}
EVENT_LOCK.notifyAll();
@ -692,12 +692,12 @@ public class XEmbedServerTester implements XEventDispatcher {
int eventID = (int)ev.get_type() | SYSTEM_EVENT_MASK;
events.add(eventID);
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Tester is waiting for " + XEmbedHelper.msgidToString(eventWaited) + ", but we received " + ev + "(" + XEmbedHelper.msgidToString(eventID) + ")");
}
if (eventID == eventWaited) {
eventReceived = eventID;
if (xembedLog.isLoggable(PlatformLogger.FINER)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINER)) {
xembedLog.finer("Notifying waiting object" + System.identityHashCode(EVENT_LOCK));
}
EVENT_LOCK.notifyAll();

2
jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java
View File

@ -139,7 +139,7 @@ public class XEmbeddedFramePeer extends XFramePeer {
{
assert (SunToolkit.isAWTLockHeldByCurrentThread());
XConfigureEvent xe = xev.get_xconfigure();
if (xembedLog.isLoggable(PlatformLogger.FINE)) {
if (xembedLog.isLoggable(PlatformLogger.Level.FINE)) {
xembedLog.fine(xe.toString());
}

2
jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java
View File

@ -119,7 +119,7 @@ public final class XErrorHandlerUtil {
// Default XErrorHandler may just terminate the process. Don't call it.
// return XlibWrapper.CallErrorHandler(saved_error_handler, display, error.pData);
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Unhandled XErrorEvent: " +
"id=" + error.get_resourceid() + ", " +
"serial=" + error.get_serial() + ", " +

2
jdk/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java
View File

@ -720,7 +720,7 @@ class XFileDialogPeer extends XDialogPeer implements FileDialogPeer, ActionListe
}
File fe = new File(dir).getAbsoluteFile();
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Current directory : " + fe);
}

20
jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java
View File

@ -75,7 +75,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer {
winAttr.isResizable = true; // target.isResizable();
winAttr.title = target.getTitle();
winAttr.initialResizability = target.isResizable();
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Frame''s initial attributes: decor {0}, resizable {1}, undecorated {2}, initial state {3}",
Integer.valueOf(winAttr.decorations), Boolean.valueOf(winAttr.initialResizability),
Boolean.valueOf(!winAttr.nativeDecor), Integer.valueOf(winAttr.initialState));
@ -209,7 +209,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer {
}
public void setMaximizedBounds(Rectangle b) {
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Setting maximized bounds to " + b);
}
if (b == null) return;
@ -228,7 +228,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer {
} else {
hints.set_max_height((int)XlibWrapper.DisplayHeight(XToolkit.getDisplay(), XlibWrapper.DefaultScreen(XToolkit.getDisplay())));
}
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Setting hints, flags " + XlibWrapper.hintsToString(hints.get_flags()));
}
XlibWrapper.XSetWMNormalHints(XToolkit.getDisplay(), window, hints.pData);
@ -258,18 +258,18 @@ class XFramePeer extends XDecoratedPeer implements FramePeer {
int changed = state ^ newState;
int changeIconic = changed & Frame.ICONIFIED;
boolean iconic = (newState & Frame.ICONIFIED) != 0;
if (stateLog.isLoggable(PlatformLogger.FINER)) {
if (stateLog.isLoggable(PlatformLogger.Level.FINER)) {
stateLog.finer("Changing state, old state {0}, new state {1}(iconic {2})",
Integer.valueOf(state), Integer.valueOf(newState), Boolean.valueOf(iconic));
}
if (changeIconic != 0 && iconic) {
if (stateLog.isLoggable(PlatformLogger.FINER)) {
if (stateLog.isLoggable(PlatformLogger.Level.FINER)) {
stateLog.finer("Iconifying shell " + getShell() + ", this " + this + ", screen " + getScreenNumber());
}
XToolkit.awtLock();
try {
int res = XlibWrapper.XIconifyWindow(XToolkit.getDisplay(), getShell(), getScreenNumber());
if (stateLog.isLoggable(PlatformLogger.FINER)) {
if (stateLog.isLoggable(PlatformLogger.Level.FINER)) {
stateLog.finer("XIconifyWindow returned " + res);
}
}
@ -281,7 +281,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer {
setExtendedState(newState);
}
if (changeIconic != 0 && !iconic) {
if (stateLog.isLoggable(PlatformLogger.FINER)) {
if (stateLog.isLoggable(PlatformLogger.Level.FINER)) {
stateLog.finer("DeIconifying " + this);
}
xSetVisible(true);
@ -296,7 +296,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer {
super.handlePropertyNotify(xev);
XPropertyEvent ev = xev.get_xproperty();
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Property change {0}", ev);
}
/*
@ -311,7 +311,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer {
final int newState = XWM.getWM().getState(this);
int changed = state ^ newState;
if (changed == 0) {
if (stateLog.isLoggable(PlatformLogger.FINER)) {
if (stateLog.isLoggable(PlatformLogger.Level.FINER)) {
stateLog.finer("State is the same: " + state);
}
return;
@ -365,7 +365,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer {
XWMHints hints = getWMHints();
hints.set_flags((int)XUtilConstants.StateHint | hints.get_flags());
hints.set_initial_state(wm_state);
if (stateLog.isLoggable(PlatformLogger.FINE)) {
if (stateLog.isLoggable(PlatformLogger.Level.FINE)) {
stateLog.fine("Setting initial WM state on " + this + " to " + wm_state);
}
XlibWrapper.XSetWMHints(XToolkit.getDisplay(), getWindow(), hints.pData);

20
jdk/src/solaris/classes/sun/awt/X11/XIconWindow.java
View File

@ -62,7 +62,7 @@ public class XIconWindow extends XBaseWindow {
final long screen = adata.get_awt_visInfo().get_screen();
final long display = XToolkit.getDisplay();
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest(adata.toString());
}
@ -74,13 +74,13 @@ public class XIconWindow extends XBaseWindow {
}
int count = Native.getInt(XlibWrapper.iarg1);
long sizes_ptr = Native.getLong(XlibWrapper.larg1); // XIconSize*
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("count = {1}, sizes_ptr = {0}", Long.valueOf(sizes_ptr), Integer.valueOf(count));
}
XIconSize[] res = new XIconSize[count];
for (int i = 0; i < count; i++, sizes_ptr += XIconSize.getSize()) {
res[i] = new XIconSize(sizes_ptr);
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("sizes_ptr[{1}] = {0}", res[i], Integer.valueOf(i));
}
}
@ -99,7 +99,7 @@ public class XIconWindow extends XBaseWindow {
}
XIconSize[] sizeList = getIconSizes();
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Icon sizes: {0}", (Object[]) sizeList);
}
if (sizeList == null) {
@ -148,11 +148,11 @@ public class XIconWindow extends XBaseWindow {
}
}
}
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("found=" + found);
}
if (!found) {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("widthHint=" + widthHint + ", heightHint=" + heightHint
+ ", saveWidth=" + saveWidth + ", saveHeight=" + saveHeight
+ ", max_width=" + sizeList[0].get_max_width()
@ -168,7 +168,7 @@ public class XIconWindow extends XBaseWindow {
/* determine which way to scale */
int wdiff = widthHint - sizeList[0].get_max_width();
int hdiff = heightHint - sizeList[0].get_max_height();
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("wdiff=" + wdiff + ", hdiff=" + hdiff);
}
if (wdiff >= hdiff) { /* need to scale width more */
@ -200,7 +200,7 @@ public class XIconWindow extends XBaseWindow {
XToolkit.awtUnlock();
}
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("return " + saveWidth + "x" + saveHeight);
}
return new Dimension(saveWidth, saveHeight);
@ -427,7 +427,7 @@ public class XIconWindow extends XBaseWindow {
}
}
if (min != null) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Icon: {0}x{1}", min.getWidth(null), min.getHeight(null));
}
setIconImage(min);
@ -455,7 +455,7 @@ public class XIconWindow extends XBaseWindow {
}
Dimension iconSize = getIconSize(width, height);
if (iconSize != null) {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Icon size: {0}", iconSize);
}
iconWidth = iconSize.width;

4
jdk/src/solaris/classes/sun/awt/X11/XInputMethod.java
View File

@ -102,7 +102,7 @@ public class XInputMethod extends X11InputMethod {
protected ComponentPeer getPeer(Component client) {
XComponentPeer peer;
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Client is " + client);
}
peer = (XComponentPeer)XToolkit.targetToPeer(client);
@ -110,7 +110,7 @@ public class XInputMethod extends X11InputMethod {
client = getParent(client);
peer = (XComponentPeer)XToolkit.targetToPeer(client);
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Peer is {0}, client is {1}", peer, client);
}

2
jdk/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java
View File

@ -60,7 +60,7 @@ public class XKeyboardFocusManagerPeer extends KeyboardFocusManagerPeerImpl {
@Override
public void setCurrentFocusedWindow(Window win) {
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Setting current focused window " + win);
}

52
jdk/src/solaris/classes/sun/awt/X11/XListPeer.java
View File

@ -575,12 +575,12 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
}
void mousePressed(MouseEvent mouseEvent) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer(mouseEvent.toString() + ", hsb " + hsbVis + ", vsb " + vsbVis);
}
if (isEnabled() && mouseEvent.getButton() == MouseEvent.BUTTON1) {
if (inWindow(mouseEvent.getX(), mouseEvent.getY())) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Mouse press in items area");
}
active = WINDOW;
@ -619,7 +619,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
currentIndex = -1;
}
} else if (inVerticalScrollbar(mouseEvent.getX(), mouseEvent.getY())) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Mouse press in vertical scrollbar");
}
active = VERSCROLLBAR;
@ -628,7 +628,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
mouseEvent.getX() - (width - SCROLLBAR_WIDTH),
mouseEvent.getY());
} else if (inHorizontalScrollbar(mouseEvent.getX(), mouseEvent.getY())) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Mouse press in horizontal scrollbar");
}
active = HORSCROLLBAR;
@ -813,7 +813,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
void keyPressed(KeyEvent e) {
int keyCode = e.getKeyCode();
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine(e.toString());
}
switch(keyCode) {
@ -1000,7 +1000,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
*/
public void notifyValue(XScrollbar obj, int type, int v, boolean isAdjusting) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Notify value changed on " + obj + " to " + v);
}
int value = obj.getValue();
@ -1085,7 +1085,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
}
}
}
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Adding item '" + item + "' to " + addedIndex);
}
@ -1105,7 +1105,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
| ((vsb.needsRepaint())?(PAINT_VSCROLL):0);
}
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Last visible: " + getLastVisibleItem() +
", hsb changed : " + (hsbWasVis ^ hsbVis) + ", items changed " + repaintItems);
}
@ -1123,11 +1123,11 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
boolean vsbWasVisible = vsbVis;
int oldLastDisplayed = lastItemDisplayed();
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Deleting from " + s + " to " + e);
}
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Last displayed item: " + oldLastDisplayed + ", items in window " + itemsInWindow() +
", size " + items.size());
}
@ -1197,7 +1197,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
options |= PAINT_FOCUS;
}
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Multiple selections: " + multipleSelections);
}
@ -1452,7 +1452,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
* y is the number of items to scroll
*/
void scrollVertical(int y) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Scrolling vertically by " + y);
}
int itemsInWin = itemsInWindow();
@ -1494,7 +1494,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
* x is the number of pixels to scroll
*/
void scrollHorizontal(int x) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Scrolling horizontally by " + y);
}
int w = getListWidth();
@ -1732,7 +1732,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
}
if (localBuffer == null) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Creating buffer " + width + "x" + height);
}
// use GraphicsConfig.cCVI() instead of Component.cVI(),
@ -1771,7 +1771,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
private void paint(Graphics listG, int firstItem, int lastItem, int options,
Rectangle source, Point distance) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Repaint from " + firstItem + " to " + lastItem + " options " + options);
}
if (firstItem > lastItem) {
@ -1862,7 +1862,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
}
private void paintItems(Graphics g, int firstItem, int lastItem, int options) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Painting items from " + firstItem + " to " + lastItem + ", focused " + focusIndex + ", first " + getFirstVisibleItem() + ", last " + getLastVisibleItem());
}
@ -1875,7 +1875,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
firstItem = Math.max(getFirstVisibleItem(), firstItem);
lastItem = Math.min(lastItem, items.size()-1);
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Actually painting items from " + firstItem + " to " + lastItem +
", items in window " + itemsInWindow());
}
@ -1885,7 +1885,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
}
private void paintItem(Graphics g, int index) {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Painting item " + index);
}
// 4895367 - only paint items which are visible
@ -1895,7 +1895,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
int h = getItemHeight();
int y = getItemY(index);
int x = getItemX();
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Setting clip " + new Rectangle(x, y, w - (SPACE*2), h-(SPACE*2)));
}
g.setClip(x, y, w - (SPACE*2), h-(SPACE*2));
@ -1903,14 +1903,14 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
// Always paint the background so that focus is unpainted in
// multiselect mode
if (isSelected(index)) {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Painted item is selected");
}
g.setColor(getListForeground());
} else {
g.setColor(getListBackground());
}
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Filling " + new Rectangle(x, y, w, h));
}
g.fillRect(x, y, w, h);
@ -1936,7 +1936,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
}
void paintScrollBar(XScrollbar scr, Graphics g, int x, int y, int width, int height, boolean paintAll) {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Painting scrollbar " + scr + " width " +
width + " height " + height + ", paintAll " + paintAll);
}
@ -1976,19 +1976,19 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
if (paintFocus && !hasFocus()) {
paintFocus = false;
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Painting focus, focus index " + getFocusIndex() + ", focus is " +
(isItemHidden(getFocusIndex())?("invisible"):("visible")) + ", paint focus is " + paintFocus);
}
Shape clip = g.getClip();
g.setClip(0, 0, listWidth, listHeight);
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Setting focus clip " + new Rectangle(0, 0, listWidth, listHeight));
}
Rectangle rect = getFocusRect();
if (prevFocusRect != null) {
// Erase focus rect
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Erasing previous focus rect " + prevFocusRect);
}
g.setColor(getListBackground());
@ -1997,7 +1997,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
}
if (paintFocus) {
// Paint new
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Painting focus rect " + rect);
}
g.setColor(getListForeground()); // Focus color is always black on Linux

18
jdk/src/solaris/classes/sun/awt/X11/XMSelection.java
View File

@ -128,7 +128,7 @@ public class XMSelection {
long display = XToolkit.getDisplay();
synchronized(this) {
setOwner(owner, screen);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("New Selection Owner for screen " + screen + " = " + owner );
}
XlibWrapper.XSelectInput(display, owner, XConstants.StructureNotifyMask | eventMask);
@ -150,14 +150,14 @@ public class XMSelection {
try {
try {
long display = XToolkit.getDisplay();
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Grabbing XServer");
}
XlibWrapper.XGrabServer(display);
synchronized(this) {
String selection_name = getName()+"_S"+screen;
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Screen = " + screen + " selection name = " + selection_name);
}
XAtom atom = XAtom.get(selection_name);
@ -166,7 +166,7 @@ public class XMSelection {
long owner = XlibWrapper.XGetSelectionOwner(display, atom.getAtom());
if (owner != 0) {
setOwner(owner, screen);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Selection Owner for screen " + screen + " = " + owner );
}
XlibWrapper.XSelectInput(display, owner, XConstants.StructureNotifyMask | extra_mask);
@ -183,7 +183,7 @@ public class XMSelection {
e.printStackTrace();
}
finally {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("UnGrabbing XServer");
}
XlibWrapper.XUngrabServer(XToolkit.getDisplay());
@ -197,7 +197,7 @@ public class XMSelection {
static boolean processClientMessage(XEvent xev, int screen) {
XClientMessageEvent xce = xev.get_xclient();
if (xce.get_message_type() == XA_MANAGER.getAtom()) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("client messags = " + xce);
}
long timestamp = xce.get_data(0);
@ -306,7 +306,7 @@ public class XMSelection {
synchronized void dispatchSelectionChanged( XPropertyEvent ev, int screen) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Selection Changed : Screen = " + screen + "Event =" + ev);
}
if (listeners != null) {
@ -319,7 +319,7 @@ public class XMSelection {
}
synchronized void dispatchOwnerDeath(XDestroyWindowEvent de, int screen) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Owner dead : Screen = " + screen + "Event =" + de);
}
if (listeners != null) {
@ -333,7 +333,7 @@ public class XMSelection {
}
void dispatchSelectionEvent(XEvent xev, int screen) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Event =" + xev);
}
if (xev.get_type() == XConstants.DestroyNotify) {

2
jdk/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java
View File

@ -519,7 +519,7 @@ public class XMenuBarPeer extends XBaseMenuWindow implements MenuBarPeer {
*/
public void handleKeyPress(XEvent xev) {
XKeyEvent xkey = xev.get_xkey();
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine(xkey.toString());
}
if (isEventDisabled(xev)) {

6
jdk/src/solaris/classes/sun/awt/X11/XMenuPeer.java
View File

@ -111,7 +111,7 @@ public class XMenuPeer extends XMenuItemPeer implements MenuPeer {
* for adding separators
*/
public void addSeparator() {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("addSeparator is not implemented");
}
}
@ -121,7 +121,7 @@ public class XMenuPeer extends XMenuItemPeer implements MenuPeer {
if (menuWindow != null) {
menuWindow.addItem(item);
} else {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Attempt to use XMenuWindowPeer without window");
}
}
@ -132,7 +132,7 @@ public class XMenuPeer extends XMenuItemPeer implements MenuPeer {
if (menuWindow != null) {
menuWindow.delItem(index);
} else {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Attempt to use XMenuWindowPeer without window");
}
}

2
jdk/src/solaris/classes/sun/awt/X11/XMenuWindow.java
View File

@ -399,7 +399,7 @@ public class XMenuWindow extends XBaseMenuWindow {
if (!isCreated()) {
return;
}
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("showing menu window + " + getWindow() + " at " + bounds);
}
XToolkit.awtLock();

22
jdk/src/solaris/classes/sun/awt/X11/XNETProtocol.java
View File

@ -45,7 +45,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt
}
public void setState(XWindowPeer window, int state) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Setting state of " + window + " to " + state);
}
if (window.isShowing()) {
@ -57,7 +57,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt
private void setInitialState(XWindowPeer window, int state) {
XAtomList old_state = window.getNETWMState();
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Current state of the window {0} is {1}", window, old_state);
}
if ((state & Frame.MAXIMIZED_VERT) != 0) {
@ -70,7 +70,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt
} else {
old_state.remove(XA_NET_WM_STATE_MAXIMIZED_HORZ);
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Setting initial state of the window {0} to {1}", window, old_state);
}
window.setNETWMState(old_state);
@ -105,7 +105,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt
default:
return;
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Requesting state on " + window + " for " + state);
}
req.set_type((int)XConstants.ClientMessage);
@ -189,7 +189,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt
req.set_data(1, state.getAtom());
// Fix for 6735584: req.data[2] must be set to 0 when only one property is changed
req.set_data(2, 0);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Setting _NET_STATE atom {0} on {1} for {2}", state, window, Boolean.valueOf(isAdd));
}
XToolkit.awtLock();
@ -216,7 +216,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt
* @param reset Indicates operation, 'set' if false, 'reset' if true
*/
private void setStateHelper(XWindowPeer window, XAtom state, boolean set) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Window visibility is: withdrawn={0}, visible={1}, mapped={2} showing={3}",
Boolean.valueOf(window.isWithdrawn()), Boolean.valueOf(window.isVisible()),
Boolean.valueOf(window.isMapped()), Boolean.valueOf(window.isShowing()));
@ -225,7 +225,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt
requestState(window, state, set);
} else {
XAtomList net_wm_state = window.getNETWMState();
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Current state on {0} is {1}", window, net_wm_state);
}
if (!set) {
@ -233,7 +233,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt
} else {
net_wm_state.add(state);
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Setting states on {0} to {1}", window, net_wm_state);
}
window.setNETWMState(net_wm_state);
@ -292,7 +292,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt
}
NetWindow = checkAnchor(XA_NET_SUPPORTING_WM_CHECK, XAtom.XA_WINDOW);
supportChecked = true;
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### " + this + " is active: " + (NetWindow != 0));
}
}
@ -304,7 +304,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt
boolean doStateProtocol() {
boolean res = active() && checkProtocol(XA_NET_SUPPORTED, XA_NET_WM_STATE);
if (stateLog.isLoggable(PlatformLogger.FINER)) {
if (stateLog.isLoggable(PlatformLogger.Level.FINER)) {
stateLog.finer("doStateProtocol() returns " + res);
}
return res;
@ -333,7 +333,7 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt
if (net_wm_name_string == null) {
return false;
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### WM_NAME = " + net_wm_name_string);
}
return net_wm_name_string.startsWith(name);

4
jdk/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java
View File

@ -123,7 +123,7 @@ public class XPopupMenuPeer extends XMenuWindow implements PopupMenuPeer {
* for adding separators
*/
public void addSeparator() {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("addSeparator is not implemented");
}
}
@ -343,7 +343,7 @@ public class XPopupMenuPeer extends XMenuWindow implements PopupMenuPeer {
*/
public void handleKeyPress(XEvent xev) {
XKeyEvent xkey = xev.get_xkey();
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine(xkey.toString());
}
if (isEventDisabled(xev)) {

2
jdk/src/solaris/classes/sun/awt/X11/XProtocol.java
View File

@ -54,7 +54,7 @@ class XProtocol {
} finally {
if (firstCheck) {
firstCheck = false;
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("{0}:{1} supports {2}", this, listName, protocols);
}
}

12
jdk/src/solaris/classes/sun/awt/X11/XScrollbar.java
View File

@ -118,7 +118,7 @@ abstract class XScrollbar {
abstract protected void rebuildArrows();
public void setSize(int width, int height) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Setting scroll bar " + this + " size to " + width + "x" + height);
}
this.width = width;
@ -166,7 +166,7 @@ abstract class XScrollbar {
* @param paintAll paint the whole scrollbar if true, just the thumb is false
*/
void paint(Graphics g, Color colors[], boolean paintAll) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Painting scrollbar " + this);
}
@ -339,7 +339,7 @@ abstract class XScrollbar {
* Tell the scroller to start scrolling.
*/
void startScrolling() {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Start scrolling on " + this);
}
// Make sure that we scroll at least once
@ -361,7 +361,7 @@ abstract class XScrollbar {
* See 6243382 for more information
*/
void startScrollingInstance() {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Start scrolling on " + this);
}
// Make sure that we scroll at least once
@ -376,7 +376,7 @@ abstract class XScrollbar {
* See 6243382 for more information
*/
void stopScrollingInstance() {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Stop scrolling on " + this);
}
@ -464,7 +464,7 @@ abstract class XScrollbar {
return;
}
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
String type;
switch (id) {
case MouseEvent.MOUSE_PRESSED:

2
jdk/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java
View File

@ -156,7 +156,7 @@ class XScrollbarPeer extends XComponentPeer implements ScrollbarPeer, XScrollbar
public void handleJavaKeyEvent(KeyEvent event) {
super.handleJavaKeyEvent(event);
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("KeyEvent on scrollbar: " + event);
}
if (!(event.isConsumed()) && event.getID() == KeyEvent.KEY_RELEASED) {

4
jdk/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java
View File

@ -58,7 +58,7 @@ public class XSystemTrayPeer implements SystemTrayPeer, XMSelectionListener {
long selection_owner = selection.getOwner(SCREEN);
available = (selection_owner != XConstants.None);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine(" check if system tray is available. selection owner: " + selection_owner);
}
}
@ -108,7 +108,7 @@ public class XSystemTrayPeer implements SystemTrayPeer, XMSelectionListener {
void addTrayIcon(XTrayIconPeer tiPeer) throws AWTException {
long selection_owner = selection.getOwner(SCREEN);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine(" send SYSTEM_TRAY_REQUEST_DOCK message to owner: " + selection_owner);
}

2
jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java
View File

@ -258,7 +258,7 @@ public class XTextFieldPeer extends XComponentPeer implements TextFieldPeer {
}
public void setBackground(Color c) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("target="+ target + ", old=" + background + ", new=" + c);
}
background = c;

44
jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
View File

@ -266,7 +266,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
((XAWTXSettings)xs).dispose();
}
freeXKB();
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
dumpPeers();
}
}
@ -524,7 +524,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
}
static void processException(Throwable thr) {
if (log.isLoggable(PlatformLogger.WARNING)) {
if (log.isLoggable(PlatformLogger.Level.WARNING)) {
log.warning("Exception on Toolkit thread", thr);
}
}
@ -586,7 +586,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
continue;
}
if (eventLog.isLoggable(PlatformLogger.FINER)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINER)) {
eventLog.finer("{0}", ev);
}
@ -602,13 +602,13 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
}
}
}
if( keyEventLog.isLoggable(PlatformLogger.FINE) && (ev.get_type() == XConstants.KeyPress || ev.get_type() == XConstants.KeyRelease) ) {
if( keyEventLog.isLoggable(PlatformLogger.Level.FINE) && (ev.get_type() == XConstants.KeyPress || ev.get_type() == XConstants.KeyRelease) ) {
keyEventLog.fine("before XFilterEvent:"+ev);
}
if (XlibWrapper.XFilterEvent(ev.getPData(), w)) {
continue;
}
if( keyEventLog.isLoggable(PlatformLogger.FINE) && (ev.get_type() == XConstants.KeyPress || ev.get_type() == XConstants.KeyRelease) ) {
if( keyEventLog.isLoggable(PlatformLogger.Level.FINE) && (ev.get_type() == XConstants.KeyPress || ev.get_type() == XConstants.KeyRelease) ) {
keyEventLog.fine("after XFilterEvent:"+ev); // IS THIS CORRECT?
}
@ -1321,7 +1321,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
}
static void dumpPeers() {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Mapped windows:");
Iterator iter = winMap.entrySet().iterator();
while (iter.hasNext()) {
@ -1417,7 +1417,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
}
} catch (InterruptedException ie) {
// Note: the returned timeStamp can be incorrect in this case.
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Catched exception, timeStamp may not be correct (ie = " + ie + ")");
}
}
@ -1584,7 +1584,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
name = "gnome." + name;
setDesktopProperty(name, e.getValue());
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("name = " + name + " value = " + e.getValue());
}
@ -1773,7 +1773,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
} finally {
awtUnlock();
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("metaMask = " + metaMask);
log.fine("altMask = " + altMask);
log.fine("numLockMask = " + numLockMask);
@ -1795,11 +1795,11 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
}
awtLock();
try {
if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) {
if (timeoutTaskLog.isLoggable(PlatformLogger.Level.FINER)) {
timeoutTaskLog.finer("Removing task " + task);
}
if (timeoutTasks == null) {
if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) {
if (timeoutTaskLog.isLoggable(PlatformLogger.Level.FINER)) {
timeoutTaskLog.finer("Task is not scheduled");
}
return;
@ -1846,7 +1846,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
awtLock();
try {
if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) {
if (timeoutTaskLog.isLoggable(PlatformLogger.Level.FINER)) {
timeoutTaskLog.finer("XToolkit.schedule(): current time={0}" +
"; interval={1}" +
"; task being added={2}" + "; tasks before addition={3}",
@ -1893,7 +1893,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
* Called from run() under awtLock.
*/
private static void callTimeoutTasks() {
if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) {
if (timeoutTaskLog.isLoggable(PlatformLogger.Level.FINER)) {
timeoutTaskLog.finer("XToolkit.callTimeoutTasks(): current time={0}" +
"; tasks={1}", Long.valueOf(System.currentTimeMillis()), timeoutTasks);
}
@ -1911,7 +1911,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
for (Iterator iter = tasks.iterator(); iter.hasNext();) {
Runnable task = (Runnable)iter.next();
if (timeoutTaskLog.isLoggable(PlatformLogger.FINER)) {
if (timeoutTaskLog.isLoggable(PlatformLogger.Level.FINER)) {
timeoutTaskLog.finer("XToolkit.callTimeoutTasks(): current time={0}" +
"; about to run task={1}", Long.valueOf(currentTime), task);
}
@ -1986,7 +1986,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
*/
long current_time_utc = System.currentTimeMillis();
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("reset_time=" + reset_time_utc + ", current_time=" + current_time_utc
+ ", server_offset=" + server_offset + ", wrap_time=" + WRAP_TIME_MILLIS);
}
@ -1995,7 +1995,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
reset_time_utc = System.currentTimeMillis() - getCurrentServerTime();
}
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("result = " + (reset_time_utc + server_offset));
}
return reset_time_utc + server_offset;
@ -2074,14 +2074,14 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
if (prop == null) {
backingStoreType = XConstants.NotUseful;
if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) {
if (backingStoreLog.isLoggable(PlatformLogger.Level.CONFIG)) {
backingStoreLog.config("The system property sun.awt.backingStore is not set" +
", by default backingStore=NotUseful");
}
return;
}
if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) {
if (backingStoreLog.isLoggable(PlatformLogger.Level.CONFIG)) {
backingStoreLog.config("The system property sun.awt.backingStore is " + prop);
}
prop = prop.toLowerCase();
@ -2093,7 +2093,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
backingStoreType = XConstants.NotUseful;
}
if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) {
if (backingStoreLog.isLoggable(PlatformLogger.Level.CONFIG)) {
backingStoreLog.config("backingStore(as provided by the system property)=" +
( backingStoreType == XConstants.NotUseful ? "NotUseful"
: backingStoreType == XConstants.WhenMapped ?
@ -2103,7 +2103,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
if (sun.java2d.x11.X11SurfaceData.isDgaAvailable()) {
backingStoreType = XConstants.NotUseful;
if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) {
if (backingStoreLog.isLoggable(PlatformLogger.Level.CONFIG)) {
backingStoreLog.config("DGA is available, backingStore=NotUseful");
}
@ -2118,7 +2118,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
== XConstants.NotUseful) {
backingStoreType = XConstants.NotUseful;
if (backingStoreLog.isLoggable(PlatformLogger.CONFIG)) {
if (backingStoreLog.isLoggable(PlatformLogger.Level.CONFIG)) {
backingStoreLog.config("Backing store is not available on the screen " +
i + ", backingStore=NotUseful");
}
@ -2396,7 +2396,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
// Wait for selection notify for oops on win
long event_number = getEventNumber();
XAtom atom = XAtom.get("WM_S0");
if (eventLog.isLoggable(PlatformLogger.FINER)) {
if (eventLog.isLoggable(PlatformLogger.Level.FINER)) {
eventLog.finer("WM_S0 selection owner {0}", XlibWrapper.XGetSelectionOwner(getDisplay(), atom.getAtom()));
}
XlibWrapper.XConvertSelection(getDisplay(), atom.getAtom(),

14
jdk/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java
View File

@ -106,7 +106,7 @@ public class XTrayIconPeer implements TrayIconPeer,
XConfigureEvent ce = ev.get_xconfigure();
if (ctrLog.isLoggable(PlatformLogger.FINE)) {
if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) {
ctrLog.fine("ConfigureNotify on parent of {0}: {1}x{2}+{3}+{4} (old: {5}+{6})",
XTrayIconPeer.this, ce.get_width(), ce.get_height(),
ce.get_x(), ce.get_y(), old_x, old_y);
@ -130,7 +130,7 @@ public class XTrayIconPeer implements TrayIconPeer,
// If both the height and the width differ from the fixed size then WM
// must level at least one side to the fixed size. For some reason it may take
// a few hops (even after reparenting) and we have to skip the intermediate ones.
if (ctrLog.isLoggable(PlatformLogger.FINE)) {
if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) {
ctrLog.fine("ConfigureNotify on parent of {0}. Skipping as intermediate resizing.",
XTrayIconPeer.this);
}
@ -138,7 +138,7 @@ public class XTrayIconPeer implements TrayIconPeer,
} else if (ce.get_height() > TRAY_ICON_HEIGHT) {
if (ctrLog.isLoggable(PlatformLogger.FINE)) {
if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) {
ctrLog.fine("ConfigureNotify on parent of {0}. Centering by \"Y\".",
XTrayIconPeer.this);
}
@ -153,7 +153,7 @@ public class XTrayIconPeer implements TrayIconPeer,
} else if (ce.get_width() > TRAY_ICON_WIDTH) {
if (ctrLog.isLoggable(PlatformLogger.FINE)) {
if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) {
ctrLog.fine("ConfigureNotify on parent of {0}. Centering by \"X\".",
XTrayIconPeer.this);
}
@ -173,7 +173,7 @@ public class XTrayIconPeer implements TrayIconPeer,
if (ex_height != 0) {
if (ctrLog.isLoggable(PlatformLogger.FINE)) {
if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) {
ctrLog.fine("ConfigureNotify on parent of {0}. Move detected. Centering by \"Y\".",
XTrayIconPeer.this);
}
@ -184,7 +184,7 @@ public class XTrayIconPeer implements TrayIconPeer,
} else if (ex_width != 0) {
if (ctrLog.isLoggable(PlatformLogger.FINE)) {
if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) {
ctrLog.fine("ConfigureNotify on parent of {0}. Move detected. Centering by \"X\".",
XTrayIconPeer.this);
}
@ -193,7 +193,7 @@ public class XTrayIconPeer implements TrayIconPeer,
ce.get_x() + ex_width/2 - TRAY_ICON_WIDTH/2,
ce.get_y());
} else {
if (ctrLog.isLoggable(PlatformLogger.FINE)) {
if (ctrLog.isLoggable(PlatformLogger.Level.FINE)) {
ctrLog.fine("ConfigureNotify on parent of {0}. Move detected. Skipping.",
XTrayIconPeer.this);
}

14
jdk/src/solaris/classes/sun/awt/X11/XWINProtocol.java
View File

@ -63,7 +63,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol {
req.set_format(32);
req.set_data(0, (WIN_STATE_MAXIMIZED_HORIZ | WIN_STATE_MAXIMIZED_VERT));
req.set_data(1, win_state);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Sending WIN_STATE to root to change the state to " + win_state);
}
try {
@ -113,7 +113,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol {
win_state &= ~WIN_STATE_MAXIMIZED_HORIZ;
}
if ((old_win_state ^ win_state) != 0) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Setting WIN_STATE on " + window + " to change the state to " + win_state);
}
XA_WIN_STATE.setCard32Property(window, win_state);
@ -160,7 +160,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol {
req.set_data(0, layer == LAYER_NORMAL ? WIN_LAYER_NORMAL : WIN_LAYER_ONTOP);
req.set_data(1, 0);
req.set_data(2, 0);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Setting layer " + layer + " by root message : " + req);
}
XToolkit.awtLock();
@ -177,7 +177,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol {
}
req.dispose();
} else {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Setting layer property to " + layer);
}
XA_WIN_LAYER.setCard32Property(window, layer == LAYER_NORMAL ? WIN_LAYER_NORMAL : WIN_LAYER_ONTOP);
@ -205,7 +205,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol {
}
WinWindow = checkAnchor(XA_WIN_SUPPORTING_WM_CHECK, XAtom.XA_CARDINAL);
supportChecked = true;
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### " + this + " is active: " + (WinWindow != 0));
}
}
@ -216,7 +216,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol {
}
boolean doStateProtocol() {
boolean res = active() && checkProtocol(XA_WIN_PROTOCOLS, XA_WIN_STATE);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### " + this + " supports state: " + res);
}
return res;
@ -224,7 +224,7 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol {
boolean doLayerProtocol() {
boolean res = active() && checkProtocol(XA_WIN_PROTOCOLS, XA_WIN_LAYER);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("### " + this + " supports layer: " + res);
}
return res;

60
jdk/src/solaris/classes/sun/awt/X11/XWM.java
View File

@ -149,7 +149,7 @@ final class XWM
XWM(int WMID) {
this.WMID = WMID;
initializeProtocols();
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Window manager: " + toString());
}
}
@ -255,7 +255,7 @@ final class XWM
* having a window manager running. I.e. it does not reparent
* top level shells.
*/
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("eXcursion means NO_WM");
}
return true;
@ -273,7 +273,7 @@ final class XWM
long selection_owner =
XlibWrapper.XGetSelectionOwner(XToolkit.getDisplay(),
XAtom.get(selection_name).getAtom());
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("selection owner of " + selection_name
+ " is " + selection_owner);
}
@ -302,7 +302,7 @@ final class XWM
XToolkit.getDefaultRootWindow(),
XConstants.CWEventMask,
substruct.pData);
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("It looks like there is no WM thus NO_WM");
}
}
@ -346,7 +346,7 @@ final class XWM
byte[] bytes = XlibWrapper.getStringBytes(getter.getData());
String id = new String(bytes);
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("ENLIGHTENMENT_COMMS is " + id);
}
@ -355,15 +355,15 @@ final class XWM
try {
Matcher match = winIdPat.matcher(id);
if (match.matches()) {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Match group count: " + match.groupCount());
}
String longId = match.group(1);
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("Match group 1 " + longId);
}
long winid = Long.parseLong(longId, 16);
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Enlightenment communication window " + winid);
}
return winid;
@ -372,7 +372,7 @@ final class XWM
return 0;
}
} catch (Exception e) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
e.printStackTrace();
}
return 0;
@ -418,7 +418,7 @@ final class XWM
static boolean isCDE() {
if (!XA_DT_SM_WINDOW_INFO.isInterned()) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("{0} is not interned", XA_DT_SM_WINDOW_INFO);
}
return false;
@ -451,7 +451,7 @@ final class XWM
/* Now check that this window has _DT_SM_STATE_INFO (ignore contents) */
if (!XA_DT_SM_STATE_INFO.isInterned()) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("{0} is not interned", XA_DT_SM_STATE_INFO);
}
return false;
@ -625,7 +625,7 @@ final class XWM
*/
if (!XA_ICEWM_WINOPTHINT.isInterned()) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("{0} is not interned", XA_ICEWM_WINOPTHINT);
}
return false;
@ -661,7 +661,7 @@ final class XWM
*/
static boolean isIceWM() {
if (!XA_ICEWM_WINOPTHINT.isInterned()) {
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("{0} is not interned", XA_ICEWM_WINOPTHINT);
}
return false;
@ -674,7 +674,7 @@ final class XWM
try {
int status = getter.execute();
boolean res = (status == XConstants.Success && getter.getActualType() != 0);
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Status getting XA_ICEWM_WINOPTHINT: " + !res);
}
return !res || isNetWMName("IceWM");
@ -730,7 +730,7 @@ final class XWM
return wm;
}
static int getWMID() {
if (insLog.isLoggable(PlatformLogger.FINEST)) {
if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
insLog.finest("awt_wmgr = " + awt_wmgr);
}
/*
@ -754,7 +754,7 @@ final class XWM
// Later, WM will initialize its own version of protocol
XNETProtocol l_net_protocol = g_net_protocol = new XNETProtocol();
l_net_protocol.detect();
if (log.isLoggable(PlatformLogger.FINE) && l_net_protocol.active()) {
if (log.isLoggable(PlatformLogger.Level.FINE) && l_net_protocol.active()) {
log.fine("_NET_WM_NAME is " + l_net_protocol.getWMName());
}
XWINProtocol win = g_win_protocol = new XWINProtocol();
@ -838,7 +838,7 @@ final class XWM
}
hints.set_flags(hints.get_flags() & ~mask);
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Setting hints, flags " + XlibWrapper.hintsToString(hints.get_flags()));
}
XlibWrapper.XSetWMNormalHints(XToolkit.getDisplay(),
@ -897,7 +897,7 @@ final class XWM
XAtomList decorDel = new XAtomList();
decorations = normalizeMotifDecor(decorations);
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Setting OL_DECOR to " + Integer.toBinaryString(decorations));
}
if ((decorations & MWMConstants.MWM_DECOR_TITLE) == 0) {
@ -916,7 +916,7 @@ final class XWM
insLog.finer("Deleting OL_DECOR");
XA_OL_DECOR_DEL.DeleteProperty(window);
} else {
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Setting OL_DECOR to " + decorDel);
}
XA_OL_DECOR_DEL.setAtomListProperty(window, decorDel);
@ -946,7 +946,7 @@ final class XWM
hints.set_functions(functions);
hints.set_decorations(decorations);
if (stateLog.isLoggable(PlatformLogger.FINER)) {
if (stateLog.isLoggable(PlatformLogger.Level.FINER)) {
stateLog.finer("Setting MWM_HINTS to " + hints);
}
window.setMWMHints(hints);
@ -1010,7 +1010,7 @@ final class XWM
* Make specified shell resizable.
*/
static void setShellResizable(XDecoratedPeer window) {
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Setting shell resizable " + window);
}
XToolkit.awtLock();
@ -1042,7 +1042,7 @@ final class XWM
static void setShellNotResizable(XDecoratedPeer window, WindowDimensions newDimensions, Rectangle shellBounds,
boolean justChangeSize)
{
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("Setting non-resizable shell " + window + ", dimensions " + newDimensions +
", shellBounds " + shellBounds +", just change size: " + justChangeSize);
}
@ -1176,7 +1176,7 @@ final class XWM
stateLog.finer("WithdrawnState");
return false;
} else {
if (stateLog.isLoggable(PlatformLogger.FINER)) {
if (stateLog.isLoggable(PlatformLogger.Level.FINER)) {
stateLog.finer("Window WM_STATE is " + wm_state);
}
}
@ -1187,7 +1187,7 @@ final class XWM
for (XStateProtocol proto : getProtocols(XStateProtocol.class)) {
is_state_change |= proto.isStateChange(e);
if (stateLog.isLoggable(PlatformLogger.FINEST)) {
if (stateLog.isLoggable(PlatformLogger.Level.FINEST)) {
stateLog.finest(proto + ": is state changed = " + is_state_change);
}
}
@ -1341,7 +1341,7 @@ final class XWM
res = defaultInsets;
}
}
if (insLog.isLoggable(PlatformLogger.FINEST)) {
if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
insLog.finest("WM guessed insets: " + res);
}
return res;
@ -1412,7 +1412,7 @@ final class XWM
XNETProtocol net_protocol = getWM().getNETProtocol();
if (net_protocol != null && net_protocol.active()) {
Insets insets = getInsetsFromProp(window, XA_NET_FRAME_EXTENTS);
if (insLog.isLoggable(PlatformLogger.FINE)) {
if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
insLog.fine("_NET_FRAME_EXTENTS: {0}", insets);
}
@ -1555,7 +1555,7 @@ final class XWM
* [mwm, e!, kwin, fvwm2 ... ]
*/
Insets correctWM = XWM.getInsetsFromExtents(window);
if (insLog.isLoggable(PlatformLogger.FINER)) {
if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
insLog.finer("Got insets from property: {0}", correctWM);
}
@ -1618,7 +1618,7 @@ final class XWM
}
case XWM.OTHER_WM:
default: { /* this is very similar to the E! case above */
if (insLog.isLoggable(PlatformLogger.FINEST)) {
if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
insLog.finest("Getting correct insets for OTHER_WM/default, parent: {0}", parent);
}
syncTopLevelPos(parent, lwinAttr);
@ -1647,7 +1647,7 @@ final class XWM
&& lwinAttr.get_width()+2*lwinAttr.get_border_width() == pattr.get_width()
&& lwinAttr.get_height()+2*lwinAttr.get_border_width() == pattr.get_height())
{
if (insLog.isLoggable(PlatformLogger.FINEST)) {
if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
insLog.finest("Double reparenting detected, pattr({2})={0}, lwinAttr({3})={1}",
lwinAttr, pattr, parent, window);
}
@ -1677,7 +1677,7 @@ final class XWM
* widths and inner/outer distinction, so for the time
* being, just ignore it.
*/
if (insLog.isLoggable(PlatformLogger.FINEST)) {
if (insLog.isLoggable(PlatformLogger.Level.FINEST)) {
insLog.finest("Attrs before calculation: pattr({2})={0}, lwinAttr({3})={1}",
lwinAttr, pattr, parent, window);
}

46
jdk/src/solaris/classes/sun/awt/X11/XWindow.java
View File

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

48
jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
View File

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

8
jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java
View File

@ -324,7 +324,7 @@ public class X11GraphicsEnvironment
// pRunningXinerama() simply returns a global boolean variable,
// so there is no need to synchronize here
xinerState = Boolean.valueOf(pRunningXinerama());
if (screenLog.isLoggable(PlatformLogger.FINER)) {
if (screenLog.isLoggable(PlatformLogger.Level.FINER)) {
screenLog.finer("Running Xinerama: " + xinerState);
}
}
@ -408,7 +408,7 @@ public class X11GraphicsEnvironment
(unionRect.width / 2) + unionRect.x < center.x + 1 &&
(unionRect.height / 2) + unionRect.y < center.y + 1) {
if (screenLog.isLoggable(PlatformLogger.FINER)) {
if (screenLog.isLoggable(PlatformLogger.Level.FINER)) {
screenLog.finer("Video Wall: center point is at center of all displays.");
}
return unionRect;
@ -416,7 +416,7 @@ public class X11GraphicsEnvironment
// next, check if at center of one monitor
if (centerMonitorRect != null) {
if (screenLog.isLoggable(PlatformLogger.FINER)) {
if (screenLog.isLoggable(PlatformLogger.Level.FINER)) {
screenLog.finer("Center point at center of a particular " +
"monitor, but not of the entire virtual display.");
}
@ -424,7 +424,7 @@ public class X11GraphicsEnvironment
}
// otherwise, the center is at some weird spot: return unionRect
if (screenLog.isLoggable(PlatformLogger.FINER)) {
if (screenLog.isLoggable(PlatformLogger.Level.FINER)) {
screenLog.finer("Center point is somewhere strange - return union of all bounds.");
}
return unionRect;

2
jdk/src/solaris/classes/sun/awt/X11InputMethod.java
View File

@ -326,7 +326,7 @@ public abstract class X11InputMethod extends InputMethodAdapter {
return;
if (lastXICFocussedComponent != null){
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("XICFocused {0}, AWTFocused {1}",
lastXICFocussedComponent, awtFocussedComponent);
}

14
jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java
View File

@ -177,7 +177,7 @@ public abstract class WComponentPeer extends WObjectPeer
void dynamicallyLayoutContainer() {
// If we got the WM_SIZING, this must be a Container, right?
// In fact, it must be the top-level Container.
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
Container parent = WToolkit.getNativeContainer((Component)target);
if (parent != null) {
log.fine("Assertion (parent == null) failed");
@ -282,7 +282,7 @@ public abstract class WComponentPeer extends WObjectPeer
paintArea.add(r, e.getID());
}
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
switch(e.getID()) {
case PaintEvent.UPDATE:
log.finest("coalescePaintEvent: UPDATE: add: x = " +
@ -360,7 +360,7 @@ public abstract class WComponentPeer extends WObjectPeer
}
void handleJavaFocusEvent(FocusEvent fe) {
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer(fe.toString());
}
setFocus(fe.getID() == FocusEvent.FOCUS_GAINED);
@ -682,7 +682,7 @@ public abstract class WComponentPeer extends WObjectPeer
case WKeyboardFocusManagerPeer.SNFH_FAILURE:
return false;
case WKeyboardFocusManagerPeer.SNFH_SUCCESS_PROCEED:
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Proceeding with request to " + lightweightChild + " in " + target);
}
Window parentWindow = SunToolkit.getContainingWindow((Component)target);
@ -695,7 +695,7 @@ public abstract class WComponentPeer extends WObjectPeer
}
boolean res = wpeer.requestWindowFocus(cause);
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer("Requested window focus: " + res);
}
// If parent window can be made focused and has been made focused(synchronously)
@ -717,7 +717,7 @@ public abstract class WComponentPeer extends WObjectPeer
}
private boolean rejectFocusRequestHelper(String logMsg) {
if (focusLog.isLoggable(PlatformLogger.FINER)) {
if (focusLog.isLoggable(PlatformLogger.Level.FINER)) {
focusLog.finer(logMsg);
}
WKeyboardFocusManagerPeer.removeLastFocusRequest((Component)target);
@ -1094,7 +1094,7 @@ public abstract class WComponentPeer extends WObjectPeer
*/
@SuppressWarnings("deprecation")
public void applyShape(Region shape) {
if (shapeLog.isLoggable(PlatformLogger.FINER)) {
if (shapeLog.isLoggable(PlatformLogger.Level.FINER)) {
shapeLog.finer("*** INFO: Setting shape: PEER: " + this
+ "; TARGET: " + target
+ "; SHAPE: " + shape);

14
jdk/src/windows/classes/sun/awt/windows/WDesktopProperties.java
View File

@ -110,7 +110,7 @@ class WDesktopProperties {
*/
private synchronized void setBooleanProperty(String key, boolean value) {
assert( key != null );
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine(key + "=" + String.valueOf(value));
}
map.put(key, Boolean.valueOf(value));
@ -121,7 +121,7 @@ class WDesktopProperties {
*/
private synchronized void setIntegerProperty(String key, int value) {
assert( key != null );
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine(key + "=" + String.valueOf(value));
}
map.put(key, Integer.valueOf(value));
@ -132,7 +132,7 @@ class WDesktopProperties {
*/
private synchronized void setStringProperty(String key, String value) {
assert( key != null );
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine(key + "=" + value);
}
map.put(key, value);
@ -144,7 +144,7 @@ class WDesktopProperties {
private synchronized void setColorProperty(String key, int r, int g, int b) {
assert( key != null && r <= 255 && g <=255 && b <= 255 );
Color color = new Color(r, g, b);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine(key + "=" + color);
}
map.put(key, color);
@ -172,14 +172,14 @@ class WDesktopProperties {
name = mappedName;
}
Font font = new Font(name, style, size);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine(key + "=" + font);
}
map.put(key, font);
String sizeKey = key + ".height";
Integer iSize = Integer.valueOf(size);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine(sizeKey + "=" + iSize);
}
map.put(sizeKey, iSize);
@ -192,7 +192,7 @@ class WDesktopProperties {
assert( key != null && winEventName != null );
Runnable soundRunnable = new WinPlaySound(winEventName);
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine(key + "=" + soundRunnable);
}
map.put(key, soundRunnable);

2
jdk/src/windows/classes/sun/awt/windows/WMenuItemPeer.java
View File

@ -165,7 +165,7 @@ class WMenuItemPeer extends WObjectPeer implements MenuItemPeer {
ResourceBundle rb = ResourceBundle.getBundle("sun.awt.windows.awtLocalization");
return Font.decode(rb.getString("menuFont"));
} catch (MissingResourceException e) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("WMenuItemPeer: " + e.getMessage()+". Using default MenuItem font.", e);
}
return new Font("SanSerif", Font.PLAIN, 11);

8
jdk/src/windows/classes/sun/awt/windows/WScrollPanePeer.java
View File

@ -161,7 +161,7 @@ class WScrollPanePeer extends WPanelPeer implements ScrollPanePeer {
}
public PeerEvent coalesceEvents(PeerEvent newEvent) {
if (log.isLoggable(PlatformLogger.FINEST)) {
if (log.isLoggable(PlatformLogger.Level.FINEST)) {
log.finest("ScrollEvent coalesced: " + newEvent);
}
if (newEvent instanceof ScrollEvent) {
@ -204,7 +204,7 @@ class WScrollPanePeer extends WPanelPeer implements ScrollPanePeer {
} else if (orient == Adjustable.HORIZONTAL) {
adj = (ScrollPaneAdjustable)sp.getHAdjustable();
} else {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Assertion failed: unknown orient");
}
}
@ -231,7 +231,7 @@ class WScrollPanePeer extends WPanelPeer implements ScrollPanePeer {
newpos = this.pos;
break;
default:
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Assertion failed: unknown type");
}
return;
@ -259,7 +259,7 @@ class WScrollPanePeer extends WPanelPeer implements ScrollPanePeer {
{
hwAncestor = hwAncestor.getParent();
}
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
if (hwAncestor == null) {
log.fine("Assertion (hwAncestor != null) failed, " +
"couldn't find heavyweight ancestor of scroll pane child");

6
jdk/src/windows/classes/sun/awt/windows/WToolkit.java
View File

@ -112,7 +112,7 @@ public class WToolkit extends SunToolkit implements Runnable {
initIDs();
// Print out which version of Windows is running
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("Win version: " + getWindowsVersion());
}
@ -848,7 +848,7 @@ public class WToolkit extends SunToolkit implements Runnable {
lazilyInitWProps();
Boolean prop = (Boolean) desktopProperties.get("awt.dynamicLayoutSupported");
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("In WTK.isDynamicLayoutSupported()" +
" nativeDynamic == " + nativeDynamic +
" wprops.dynamic == " + prop);
@ -886,7 +886,7 @@ public class WToolkit extends SunToolkit implements Runnable {
Map<String, Object> props = wprops.getProperties();
for (String propName : props.keySet()) {
Object val = props.get(propName);
if (log.isLoggable(PlatformLogger.FINER)) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("changed " + propName + " to " + val);
}
setDesktopProperty(propName, val);

8
jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java
View File

@ -460,7 +460,7 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer,
public void updateGC() {
int scrn = getScreenImOn();
if (screenLog.isLoggable(PlatformLogger.FINER)) {
if (screenLog.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Screen number: " + scrn);
}
@ -485,7 +485,7 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer,
// is now mostly on.
winGraphicsConfig = (Win32GraphicsConfig)newDev
.getDefaultConfiguration();
if (screenLog.isLoggable(PlatformLogger.FINE)) {
if (screenLog.isLoggable(PlatformLogger.Level.FINE)) {
if (winGraphicsConfig == null) {
screenLog.fine("Assertion (winGraphicsConfig != null) failed");
}
@ -730,7 +730,7 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer,
TranslucentWindowPainter currentPainter = painter;
if (currentPainter != null) {
currentPainter.updateWindow(repaint);
} else if (log.isLoggable(PlatformLogger.FINER)) {
} else if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Translucent window painter is null in updateWindow");
}
}
@ -766,7 +766,7 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer,
public void propertyChange(PropertyChangeEvent e) {
boolean isDisposed = (Boolean)e.getNewValue();
if (isDisposed != true) {
if (log.isLoggable(PlatformLogger.FINE)) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine(" Assertion (newValue != true) failed for AppContext.GUI_DISPOSED ");
}
}