jdk-sandbox: comparison jdk/src/share/classes/java/awt/Dialog.java

equal deleted inserted replaced

-:1ce7938efb03
+:f5dbd940a640
 * @see #getTitle()
 * @see #setTitle(String)
 */
 String title;
-private transient volatile boolean keepBlockingEDT = false;
-private transient volatile boolean keepBlockingCT = false;
 private transient ModalEventFilter modalFilter;
+private transient volatile SecondaryLoop secondaryLoop;
 /*
 * Indicates that this dialog is being hidden. This flag is set to true at
 * the beginning of hide() and to false at the end of hide().
 *
 */
 public void setVisible(boolean b) {
 super.setVisible(b);
 }
-/**
-* Stores the app context on which event dispatch thread the dialog
-* is being shown. Initialized in show(), used in hideAndDisposeHandler()
-*/
-transient private AppContext showAppContext;
 /**
 * Makes the {@code Dialog} visible. If the dialog and/or its owner
 * are not yet displayable, both are made displayable.  The
 * dialog will be validated prior to being made visible.
 * If the dialog is already visible, this will bring the dialog
 public void show() {
 beforeFirstShow = false;
 if (!isModal()) {
 conditionalShow(null, null);
 } else {
-// Set this variable before calling conditionalShow(). That
+AppContext showAppContext = AppContext.getAppContext();
-// way, if the Dialog is hidden right after being shown, we
-// won't mistakenly block this thread.
-keepBlockingEDT = true;
-keepBlockingCT = true;
-// Store the app context on which this dialog is being shown.
-// Event dispatch thread of this app context will be sleeping until
-// we wake it by any event from hideAndDisposeHandler().
-showAppContext = AppContext.getAppContext();
 AtomicLong time = new AtomicLong();
 Component predictedFocusOwner = null;
 try {
 predictedFocusOwner = getMostRecentFocusOwner();
 if (conditionalShow(predictedFocusOwner, time)) {
-// We have two mechanisms for blocking: 1. If we're on the
-// EventDispatchThread, start a new event pump. 2. If we're
-// on any other thread, call wait() on the treelock.
 modalFilter = ModalEventFilter.createFilterForDialog(this);
+Conditional cond = new Conditional() {
-final Runnable pumpEventsForFilter = new Runnable() {
+@Override
-public void run() {
+public boolean evaluate() {
-EventDispatchThread dispatchThread =
+return windowClosingException == null;
-(EventDispatchThread)Thread.currentThread();
-dispatchThread.pumpEventsForFilter(new Conditional() {
-public boolean evaluate() {
-synchronized (getTreeLock()) {
-return keepBlockingEDT && windowClosingException == null;
-}
-}
-}, modalFilter);
 }
 };
 // if this dialog is toolkit-modal, the filter should be added
 // to all EDTs (for all AppContexts)
 }
 }
 modalityPushed();
 try {
-if (EventQueue.isDispatchThread()) {
+EventQueue eventQueue = Toolkit.getDefaultToolkit().getSystemEventQueue();
-/*
+secondaryLoop = eventQueue.createSecondaryLoop(cond, modalFilter, 5000);
-* dispose SequencedEvent we are dispatching on current
+if (!secondaryLoop.enter()) {
-* AppContext, to prevent us from hang.
+secondaryLoop = null;
-*
-*/
-// BugId 4531693 (son@sparc.spb.su)
-SequencedEvent currentSequencedEvent = KeyboardFocusManager.
-getCurrentKeyboardFocusManager().getCurrentSequencedEvent();
-if (currentSequencedEvent != null) {
-currentSequencedEvent.dispose();
-}
-/*
-* Event processing is done inside doPrivileged block so that
-* it wouldn't matter even if user code is on the stack
-* Fix for BugId 6300270
-*/
-AccessController.doPrivileged(new PrivilegedAction() {
-public Object run() {
-pumpEventsForFilter.run();
-return null;
-}
-});
-} else {
-synchronized (getTreeLock()) {
-Toolkit.getEventQueue().postEvent(new PeerEvent(this,
-pumpEventsForFilter,
-PeerEvent.PRIORITY_EVENT));
-while (keepBlockingCT && windowClosingException == null) {
-try {
-getTreeLock().wait();
-} catch (InterruptedException e) {
-break;
-}
-}
-}
 }
 } finally {
 modalityPopped();
 }
 windowClosingException.fillInStackTrace();
 windowClosingException.printStackTrace();
 windowClosingException = null;
 }
 }
-final class WakingRunnable implements Runnable {
-public void run() {
-synchronized (getTreeLock()) {
-keepBlockingCT = false;
-getTreeLock().notifyAll();
-}
-}
-}
 private void hideAndDisposePreHandler() {
 isInHide = true;
 synchronized (getTreeLock()) {
-if (keepBlockingEDT) {
+if (secondaryLoop != null) {
 modalHide();
 // dialog can be shown and then disposed before its
 // modal filter is created
 if (modalFilter != null) {
 modalFilter.disable();
 modalDialogs.remove(this);
 }
 }
 }
 private void hideAndDisposeHandler() {
-synchronized (getTreeLock()) {
+if (secondaryLoop != null) {
-if (keepBlockingEDT) {
+secondaryLoop.exit();
-keepBlockingEDT = false;
+secondaryLoop = null;
-PeerEvent wakingEvent = new PeerEvent(getToolkit(), new WakingRunnable(), PeerEvent.PRIORITY_EVENT);
-AppContext curAppContext = AppContext.getAppContext();
-if (showAppContext != curAppContext) {
-// Wake up event dispatch thread on which the dialog was
-// initially shown
-SunToolkit.postEvent(showAppContext, wakingEvent);
-showAppContext = null;
-} else {
-Toolkit.getEventQueue().postEvent(wakingEvent);
-}
-}
 }
 isInHide = false;
 }
 /**

changeset 6484	f5dbd940a640
parent 5506	202f599c92aa
child 6636	a636784de382