changeset 10227:15c02dcf3b07

8047798: Remove EventQueueDelegate Reviewed-by: anthony, art
author pchelko
date Mon, 23 Jun 2014 22:15:09 +0400
parents a701cc3847a3
children a1ac608d0327
files src/share/classes/com/sun/java/swing/SwingUtilities3.java src/share/classes/java/awt/EventDispatchThread.java src/share/classes/sun/awt/EventQueueDelegate.java test/java/awt/EventQueue/6638195/bug6638195.java
diffstat 4 files changed, 1 insertions(+), 332 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/java/swing/SwingUtilities3.java	Fri Jun 20 13:36:03 2014 -0700
+++ b/src/share/classes/com/sun/java/swing/SwingUtilities3.java	Mon Jun 23 22:15:09 2014 +0400
@@ -25,17 +25,13 @@
 
 package com.sun.java.swing;
 
-import sun.awt.EventQueueDelegate;
 import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 
 import java.util.Collections;
 import java.util.Map;
 import java.util.WeakHashMap;
-import java.util.concurrent.Callable;
 import java.applet.Applet;
-import java.awt.AWTEvent;
-import java.awt.EventQueue;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Window;
@@ -137,86 +133,4 @@
         }
         return delegate;
     }
-
-    /*
-     * We use maps to avoid reflection. Hopefully it should perform better
-     * this way.
-     */
-    public static void setEventQueueDelegate(
-            Map<String, Map<String, Object>> map) {
-        EventQueueDelegate.setDelegate(new EventQueueDelegateFromMap(map));
-    }
-
-    private static class EventQueueDelegateFromMap
-    implements EventQueueDelegate.Delegate {
-        private final AWTEvent[] afterDispatchEventArgument;
-        private final Object[] afterDispatchHandleArgument;
-        private final Callable<Void> afterDispatchCallable;
-
-        private final AWTEvent[] beforeDispatchEventArgument;
-        private final Callable<Object> beforeDispatchCallable;
-
-        private final EventQueue[] getNextEventEventQueueArgument;
-        private final Callable<AWTEvent> getNextEventCallable;
-
-        @SuppressWarnings("unchecked")
-        public EventQueueDelegateFromMap(Map<String, Map<String, Object>> objectMap) {
-            Map<String, Object> methodMap = objectMap.get("afterDispatch");
-            afterDispatchEventArgument = (AWTEvent[]) methodMap.get("event");
-            afterDispatchHandleArgument = (Object[]) methodMap.get("handle");
-            afterDispatchCallable = (Callable<Void>) methodMap.get("method");
-
-            methodMap = objectMap.get("beforeDispatch");
-            beforeDispatchEventArgument = (AWTEvent[]) methodMap.get("event");
-            beforeDispatchCallable = (Callable<Object>) methodMap.get("method");
-
-            methodMap = objectMap.get("getNextEvent");
-            getNextEventEventQueueArgument =
-                (EventQueue[]) methodMap.get("eventQueue");
-            getNextEventCallable = (Callable<AWTEvent>) methodMap.get("method");
-        }
-
-        @Override
-        public void afterDispatch(AWTEvent event, Object handle) throws InterruptedException {
-            afterDispatchEventArgument[0] = event;
-            afterDispatchHandleArgument[0] = handle;
-            try {
-                afterDispatchCallable.call();
-            } catch (InterruptedException e) {
-                throw e;
-            } catch (RuntimeException e) {
-                throw e;
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        @Override
-        public Object beforeDispatch(AWTEvent event) throws InterruptedException {
-            beforeDispatchEventArgument[0] = event;
-            try {
-                return beforeDispatchCallable.call();
-            } catch (InterruptedException e) {
-                throw e;
-            } catch (RuntimeException e) {
-                throw e;
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        @Override
-        public AWTEvent getNextEvent(EventQueue eventQueue) throws InterruptedException {
-            getNextEventEventQueueArgument[0] = eventQueue;
-            try {
-                return getNextEventCallable.call();
-            } catch (InterruptedException e) {
-                throw e;
-            } catch (RuntimeException e) {
-                throw e;
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
 }
--- a/src/share/classes/java/awt/EventDispatchThread.java	Fri Jun 20 13:36:03 2014 -0700
+++ b/src/share/classes/java/awt/EventDispatchThread.java	Mon Jun 23 22:15:09 2014 +0400
@@ -33,7 +33,6 @@
 import sun.util.logging.PlatformLogger;
 
 import sun.awt.dnd.SunDragSourceContextPeer;
-import sun.awt.EventQueueDelegate;
 
 /**
  * EventDispatchThread is a package-private AWT class which takes
@@ -158,17 +157,11 @@
         boolean eventOK = false;
         try {
             EventQueue eq = null;
-            EventQueueDelegate.Delegate delegate = null;
             do {
                 // EventQueue may change during the dispatching
                 eq = getEventQueue();
-                delegate = EventQueueDelegate.getDelegate();
 
-                if (delegate != null && id == ANY_EVENT) {
-                    event = delegate.getNextEvent(eq);
-                } else {
-                    event = (id == ANY_EVENT) ? eq.getNextEvent() : eq.getNextEvent(id);
-                }
+                event = (id == ANY_EVENT) ? eq.getNextEvent() : eq.getNextEvent(id);
 
                 eventOK = true;
                 synchronized (eventFilters) {
@@ -194,14 +187,7 @@
                 eventLog.finest("Dispatching: " + event);
             }
 
-            Object handle = null;
-            if (delegate != null) {
-                handle = delegate.beforeDispatch(event);
-            }
             eq.dispatchEvent(event);
-            if (delegate != null) {
-                delegate.afterDispatch(event, handle);
-            }
         }
         catch (ThreadDeath death) {
             doDispatch = false;
--- a/src/share/classes/sun/awt/EventQueueDelegate.java	Fri Jun 20 13:36:03 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt;
-
-import java.awt.AWTEvent;
-import java.awt.EventQueue;
-
-
-public class EventQueueDelegate {
-    private static final Object EVENT_QUEUE_DELEGATE_KEY =
-        new StringBuilder("EventQueueDelegate.Delegate");
-
-    public static void setDelegate(Delegate delegate) {
-        AppContext.getAppContext().put(EVENT_QUEUE_DELEGATE_KEY, delegate);
-    }
-    public static Delegate getDelegate() {
-        return
-          (Delegate) AppContext.getAppContext().get(EVENT_QUEUE_DELEGATE_KEY);
-    }
-    public interface Delegate {
-        /**
-         * This method allows for changing {@code EventQueue} events order.
-         *
-         * @param eventQueue current {@code EventQueue}
-         * @return next {@code event} for the {@code EventDispatchThread}
-         */
-
-        public AWTEvent getNextEvent(EventQueue eventQueue) throws InterruptedException;
-
-        /**
-         * Notifies delegate before EventQueue.dispatch method.
-         *
-         * Note: this method may mutate the event
-         *
-         * @param event  to be dispatched by {@code dispatch} method
-         * @return handle to be passed to {@code afterDispatch} method
-         */
-        public Object beforeDispatch(AWTEvent event) throws InterruptedException;
-
-        /**
-         * Notifies delegate after EventQueue.dispatch method.
-         *
-         * @param event {@code event} dispatched by the {@code dispatch} method
-         * @param handle object which came from {@code beforeDispatch} method
-         */
-        public void afterDispatch(AWTEvent event, Object handle) throws InterruptedException;
-    }
-}
--- a/test/java/awt/EventQueue/6638195/bug6638195.java	Fri Jun 20 13:36:03 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
- *
- * @bug 6638195 6844297
- * @author Igor Kushnirskiy
- * @summary tests if EventQueueDelegate.Delegate is invoked.
- */
-
-import sun.awt.EventQueueDelegate;
-import com.sun.java.swing.SwingUtilities3;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.awt.*;
-
-public class bug6638195 {
-    public static void main(String[] args) throws Exception {
-        MyEventQueueDelegate delegate = new MyEventQueueDelegate();
-        EventQueueDelegate.setDelegate(delegate);
-        runTest(delegate);
-
-        delegate = new MyEventQueueDelegate();
-        SwingUtilities3.setEventQueueDelegate(getObjectMap(delegate));
-        runTest(delegate);
-    }
-
-    private static void runTest(MyEventQueueDelegate delegate) throws Exception {
-        // We need an empty runnable here, so the next event is
-        // processed with a new EventQueueDelegate. See 6844297
-        // for details
-        EventQueue.invokeLater(
-            new Runnable() {
-                public void run() {
-                }
-            });
-        // The following event is expected to be processed by
-        // the EventQueueDelegate instance
-        EventQueue.invokeLater(
-            new Runnable() {
-                public void run() {
-                }
-            });
-        // Finally, proceed on the main thread
-        final CountDownLatch latch = new CountDownLatch(1);
-        EventQueue.invokeLater(
-            new Runnable() {
-                public void run() {
-                    latch.countDown();
-                }
-            });
-        latch.await();
-        if (!delegate.allInvoked()) {
-            throw new RuntimeException("failed");
-        }
-    }
-
-    static Map<String, Map<String, Object>> getObjectMap(
-          final EventQueueDelegate.Delegate delegate) {
-        Map<String, Map<String, Object>> objectMap =
-            new HashMap<String, Map<String, Object>>();
-        Map<String, Object> methodMap;
-
-        final AWTEvent[] afterDispatchEventArgument = new AWTEvent[1];
-        final Object[] afterDispatchHandleArgument = new Object[1];
-        Callable<Void> afterDispatchCallable =
-            new Callable<Void>() {
-                public Void call() {
-                    try {
-                        delegate.afterDispatch(afterDispatchEventArgument[0],
-                                afterDispatchHandleArgument[0]);
-                    }
-                    catch (InterruptedException e) {
-                        throw new RuntimeException("afterDispatch interrupted", e);
-                    }
-                    return null;
-                }
-            };
-        methodMap = new HashMap<String, Object>();
-        methodMap.put("event", afterDispatchEventArgument);
-        methodMap.put("handle", afterDispatchHandleArgument);
-        methodMap.put("method", afterDispatchCallable);
-        objectMap.put("afterDispatch", methodMap);
-
-        final AWTEvent[] beforeDispatchEventArgument = new AWTEvent[1];
-        Callable<Object> beforeDispatchCallable =
-            new Callable<Object>() {
-                public Object call() {
-                    try {
-                        return delegate.beforeDispatch(
-                                beforeDispatchEventArgument[0]);
-                    }
-                    catch (InterruptedException e) {
-                        throw new RuntimeException("beforeDispatch interrupted", e);
-                    }
-                }
-            };
-        methodMap = new HashMap<String, Object>();
-        methodMap.put("event", beforeDispatchEventArgument);
-        methodMap.put("method", beforeDispatchCallable);
-        objectMap.put("beforeDispatch", methodMap);
-
-        final EventQueue[] getNextEventEventQueueArgument = new EventQueue[1];
-        Callable<AWTEvent> getNextEventCallable =
-            new Callable<AWTEvent>() {
-                public AWTEvent call() throws Exception {
-                    return delegate.getNextEvent(
-                        getNextEventEventQueueArgument[0]);
-                }
-            };
-        methodMap = new HashMap<String, Object>();
-        methodMap.put("eventQueue", getNextEventEventQueueArgument);
-        methodMap.put("method", getNextEventCallable);
-        objectMap.put("getNextEvent", methodMap);
-
-        return objectMap;
-    }
-
-    static class MyEventQueueDelegate implements EventQueueDelegate.Delegate {
-        private volatile boolean getNextEventInvoked = false;
-        private volatile boolean beforeDispatchInvoked = false;
-        private volatile boolean afterDispatchInvoked = false;
-        public AWTEvent getNextEvent(EventQueue eventQueue)
-              throws InterruptedException {
-            getNextEventInvoked = true;
-            return eventQueue.getNextEvent();
-        }
-        public Object beforeDispatch(AWTEvent event) {
-            beforeDispatchInvoked = true;
-            return null;
-        }
-        public void afterDispatch(AWTEvent event, Object handle) {
-            afterDispatchInvoked = true;
-        }
-        private boolean allInvoked() {
-            return getNextEventInvoked && beforeDispatchInvoked && afterDispatchInvoked;
-        }
-    }
-}