src/share/classes/java/awt/EventDispatchThread.java

@@ -31,11 +31,10 @@
 
 import java.util.ArrayList;
 import sun.util.logging.PlatformLogger;
 
 import sun.awt.dnd.SunDragSourceContextPeer;
-import sun.awt.EventQueueDelegate;
 
 /**
  * EventDispatchThread is a package-private AWT class which takes
  * events off the EventQueue and dispatches them to the appropriate
  * AWT components.

@@ -156,21 +155,15 @@
     void pumpOneEventForFilters(int id) {
         AWTEvent event = null;
         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);
-                }
 
                 eventOK = true;
                 synchronized (eventFilters) {
                     for (int i = eventFilters.size() - 1; i >= 0; i--) {
                         EventFilter f = eventFilters.get(i);

@@ -192,18 +185,11 @@
 
             if (eventLog.isLoggable(PlatformLogger.Level.FINEST)) {
                 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;
             throw death;
         }