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

equal deleted inserted replaced

-:8c95ea7056b7
+:d46b91465a81
 dispatchEventImpl(event, src);
 } else {
 fwDispatcher.scheduleDispatch(new Runnable() {
 @Override
 public void run() {
-dispatchEventImpl(event, src);
+if (dispatchThread.filterAndCheckEvent(event)) {
+dispatchEventImpl(event, src);
+}
 }
 });
 }
 return null;
 }
 */
 public SecondaryLoop createSecondaryLoop() {
 return createSecondaryLoop(null, null, 0);
 }
+private class FwSecondaryLoopWrapper implements SecondaryLoop {
+final private SecondaryLoop loop;
+final private EventFilter filter;
+public FwSecondaryLoopWrapper(SecondaryLoop loop, EventFilter filter) {
+this.loop = loop;
+this.filter = filter;
+}
+@Override
+public boolean enter() {
+if (filter != null) {
+dispatchThread.addEventFilter(filter);
+}
+return loop.enter();
+}
+@Override
+public boolean exit() {
+if (filter != null) {
+dispatchThread.removeEventFilter(filter);
+}
+return loop.exit();
+}
+}
 SecondaryLoop createSecondaryLoop(Conditional cond, EventFilter filter, long interval) {
 pushPopLock.lock();
 try {
 if (nextQueue != null) {
 // Forward the request to the top of EventQueue stack
 return nextQueue.createSecondaryLoop(cond, filter, interval);
 }
 if (fwDispatcher != null) {
-return fwDispatcher.createSecondaryLoop();
+return new FwSecondaryLoopWrapper(fwDispatcher.createSecondaryLoop(), filter);
 }
 if (dispatchThread == null) {
 initDispatchThread();
 }
 return new WaitDispatchSupport(dispatchThread, cond, filter, interval);