archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 20:14:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Alexey Utkin 2010-01-13 17:10:23 +03:00
commit bbab8a6fb4
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
jdk/src/solaris/classes/sun/awt/X11/InfoWindow.java
View file

@ -189,21 +189,22 @@ public abstract class InfoWindow extends Window {
* WARNING: this method is executed on Toolkit thread! * WARNING: this method is executed on Toolkit thread!
*/ */
private void display() { private void display() {
String tooltipString = liveArguments.getTooltipString();
if (tooltipString == null) {
return;
} else if (tooltipString.length() > TOOLTIP_MAX_LENGTH) {
textLabel.setText(tooltipString.substring(0, TOOLTIP_MAX_LENGTH));
} else {
textLabel.setText(tooltipString);
}
// Execute on EDT to avoid deadlock (see 6280857). // Execute on EDT to avoid deadlock (see 6280857).
SunToolkit.executeOnEventHandlerThread(target, new Runnable() { SunToolkit.executeOnEventHandlerThread(target, new Runnable() {
public void run() { public void run() {
if (liveArguments.isDisposed()) { if (liveArguments.isDisposed()) {
return; return;
} }
String tooltipString = liveArguments.getTooltipString();
if (tooltipString == null) {
return;
} else if (tooltipString.length() > TOOLTIP_MAX_LENGTH) {
textLabel.setText(tooltipString.substring(0, TOOLTIP_MAX_LENGTH));
} else {
textLabel.setText(tooltipString);
}
Point pointer = (Point)AccessController.doPrivileged(new PrivilegedAction() { Point pointer = (Point)AccessController.doPrivileged(new PrivilegedAction() {
public Object run() { public Object run() {
if (!isPointerOverTrayIcon(liveArguments.getBounds())) { if (!isPointerOverTrayIcon(liveArguments.getBounds())) {