Merge
This commit is contained in:
commit
bbab8a6fb4
@ -189,6 +189,13 @@ public abstract class InfoWindow extends Window {
|
||||
* WARNING: this method is executed on Toolkit thread!
|
||||
*/
|
||||
private void display() {
|
||||
// Execute on EDT to avoid deadlock (see 6280857).
|
||||
SunToolkit.executeOnEventHandlerThread(target, new Runnable() {
|
||||
public void run() {
|
||||
if (liveArguments.isDisposed()) {
|
||||
return;
|
||||
}
|
||||
|
||||
String tooltipString = liveArguments.getTooltipString();
|
||||
if (tooltipString == null) {
|
||||
return;
|
||||
@ -198,12 +205,6 @@ public abstract class InfoWindow extends Window {
|
||||
textLabel.setText(tooltipString);
|
||||
}
|
||||
|
||||
// Execute on EDT to avoid deadlock (see 6280857).
|
||||
SunToolkit.executeOnEventHandlerThread(target, new Runnable() {
|
||||
public void run() {
|
||||
if (liveArguments.isDisposed()) {
|
||||
return;
|
||||
}
|
||||
Point pointer = (Point)AccessController.doPrivileged(new PrivilegedAction() {
|
||||
public Object run() {
|
||||
if (!isPointerOverTrayIcon(liveArguments.getBounds())) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user