src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java

*** 24,42 ****
   */
  
  package com.apple.eawt;
  
  import java.awt.*;
  import java.awt.event.WindowEvent;
  import java.io.File;
  import java.net.*;
  import java.util.*;
  import java.util.List;
  import sun.awt.AppContext;
  import sun.awt.SunToolkit;
  
! import com.apple.eawt.AppEvent.*;
  
  class _AppEventHandler {
      private static final int NOTIFY_ABOUT = 1;
      private static final int NOTIFY_PREFS = 2;
      private static final int NOTIFY_OPEN_APP = 3;
--- 24,43 ----
   */
  
  package com.apple.eawt;
  
  import java.awt.*;
+ import java.awt.desktop.*;
  import java.awt.event.WindowEvent;
  import java.io.File;
  import java.net.*;
  import java.util.*;
  import java.util.List;
  import sun.awt.AppContext;
  import sun.awt.SunToolkit;
  
! import java.awt.AppEvent.*;
  
  class _AppEventHandler {
      private static final int NOTIFY_ABOUT = 1;
      private static final int NOTIFY_PREFS = 2;
      private static final int NOTIFY_OPEN_APP = 3;
*** 82,93 ****
      final _HiddenAppDispatcher hiddenAppDispatcher = new _HiddenAppDispatcher();
      final _UserSessionDispatcher userSessionDispatcher = new _UserSessionDispatcher();
      final _ScreenSleepDispatcher screenSleepDispatcher = new _ScreenSleepDispatcher();
      final _SystemSleepDispatcher systemSleepDispatcher = new _SystemSleepDispatcher();
  
-     final _AppEventLegacyHandler legacyHandler = new _AppEventLegacyHandler(this);
- 
      QuitStrategy defaultQuitAction = QuitStrategy.SYSTEM_EXIT_0;
  
      _AppEventHandler() {
          final String strategyProp = System.getProperty("apple.eawt.quitStrategy");
          if (strategyProp == null) return;
--- 83,92 ----
*** 99,119 ****
          } else {
              System.err.println("unrecognized apple.eawt.quitStrategy: " + strategyProp);
          }
      }
  
!     void addListener(final AppEventListener listener) {
!         if (listener instanceof AppReOpenedListener) reOpenAppDispatcher.addListener((AppReOpenedListener)listener);
          if (listener instanceof AppForegroundListener) foregroundAppDispatcher.addListener((AppForegroundListener)listener);
          if (listener instanceof AppHiddenListener) hiddenAppDispatcher.addListener((AppHiddenListener)listener);
          if (listener instanceof UserSessionListener) userSessionDispatcher.addListener((UserSessionListener)listener);
          if (listener instanceof ScreenSleepListener) screenSleepDispatcher.addListener((ScreenSleepListener)listener);
          if (listener instanceof SystemSleepListener) systemSleepDispatcher.addListener((SystemSleepListener)listener);
      }
  
!     void removeListener(final AppEventListener listener) {
!         if (listener instanceof AppReOpenedListener) reOpenAppDispatcher.removeListener((AppReOpenedListener)listener);
          if (listener instanceof AppForegroundListener) foregroundAppDispatcher.removeListener((AppForegroundListener)listener);
          if (listener instanceof AppHiddenListener) hiddenAppDispatcher.removeListener((AppHiddenListener)listener);
          if (listener instanceof UserSessionListener) userSessionDispatcher.removeListener((UserSessionListener)listener);
          if (listener instanceof ScreenSleepListener) screenSleepDispatcher.removeListener((ScreenSleepListener)listener);
          if (listener instanceof SystemSleepListener) systemSleepDispatcher.removeListener((SystemSleepListener)listener);
--- 98,118 ----
          } else {
              System.err.println("unrecognized apple.eawt.quitStrategy: " + strategyProp);
          }
      }
  
!     void addListener(final SystemEventListener listener) {
!         if (listener instanceof AppReopenedListener) reOpenAppDispatcher.addListener((AppReopenedListener)listener);
          if (listener instanceof AppForegroundListener) foregroundAppDispatcher.addListener((AppForegroundListener)listener);
          if (listener instanceof AppHiddenListener) hiddenAppDispatcher.addListener((AppHiddenListener)listener);
          if (listener instanceof UserSessionListener) userSessionDispatcher.addListener((UserSessionListener)listener);
          if (listener instanceof ScreenSleepListener) screenSleepDispatcher.addListener((ScreenSleepListener)listener);
          if (listener instanceof SystemSleepListener) systemSleepDispatcher.addListener((SystemSleepListener)listener);
      }
  
!     void removeListener(final SystemEventListener listener) {
!         if (listener instanceof AppReopenedListener) reOpenAppDispatcher.removeListener((AppReopenedListener)listener);
          if (listener instanceof AppForegroundListener) foregroundAppDispatcher.removeListener((AppForegroundListener)listener);
          if (listener instanceof AppHiddenListener) hiddenAppDispatcher.removeListener((AppHiddenListener)listener);
          if (listener instanceof UserSessionListener) userSessionDispatcher.removeListener((UserSessionListener)listener);
          if (listener instanceof ScreenSleepListener) screenSleepDispatcher.removeListener((ScreenSleepListener)listener);
          if (listener instanceof SystemSleepListener) systemSleepDispatcher.removeListener((SystemSleepListener)listener);
*** 125,138 ****
  
      void setDefaultQuitStrategy(final QuitStrategy defaultQuitAction) {
          this.defaultQuitAction = defaultQuitAction;
      }
  
!     QuitResponse currentQuitResponse;
!     synchronized QuitResponse obtainQuitResponse() {
          if (currentQuitResponse != null) return currentQuitResponse;
!         return currentQuitResponse = new QuitResponse(this);
      }
  
      synchronized void cancelQuit() {
          currentQuitResponse = null;
          nativeReplyToAppShouldTerminate(false);
--- 124,137 ----
  
      void setDefaultQuitStrategy(final QuitStrategy defaultQuitAction) {
          this.defaultQuitAction = defaultQuitAction;
      }
  
!     MacQuitResponse currentQuitResponse;
!     synchronized MacQuitResponse obtainQuitResponse() {
          if (currentQuitResponse != null) return currentQuitResponse;
!         return currentQuitResponse = new MacQuitResponse(this);
      }
  
      synchronized void cancelQuit() {
          currentQuitResponse = null;
          nativeReplyToAppShouldTerminate(false);
*** 268,281 ****
          void performUsing(com.apple.eawt._OpenAppHandler handler, _NativeEvent event) {
              handler.handleOpenApp();
          }
      }
  
!     class _AppReOpenedDispatcher extends _AppEventMultiplexor<AppReOpenedListener> {
!         void performOnListener(AppReOpenedListener listener, final _NativeEvent event) {
!             final AppReOpenedEvent e = new AppReOpenedEvent();
!             listener.appReOpened(e);
          }
      }
  
      class _AppForegroundDispatcher extends _BooleanAppEventMultiplexor<AppForegroundListener, AppForegroundEvent> {
          AppForegroundEvent createEvent(final boolean isTrue) { return new AppForegroundEvent(); }
--- 267,280 ----
          void performUsing(com.apple.eawt._OpenAppHandler handler, _NativeEvent event) {
              handler.handleOpenApp();
          }
      }
  
!     class _AppReOpenedDispatcher extends _AppEventMultiplexor<AppReopenedListener> {
!         void performOnListener(AppReopenedListener listener, final _NativeEvent event) {
!             final AppReopenedEvent e = new AppReopenedEvent();
!             listener.appReopened(e);
          }
      }
  
      class _AppForegroundDispatcher extends _BooleanAppEventMultiplexor<AppForegroundListener, AppForegroundEvent> {
          AppForegroundEvent createEvent(final boolean isTrue) { return new AppForegroundEvent(); }
*** 300,310 ****
              listener.appHidden(e);
          }
      }
  
      class _UserSessionDispatcher extends _BooleanAppEventMultiplexor<UserSessionListener, UserSessionEvent> {
!         UserSessionEvent createEvent(final boolean isTrue) { return new UserSessionEvent(); }
  
          void performFalseEventOn(final UserSessionListener listener, final UserSessionEvent e) {
              listener.userSessionDeactivated(e);
          }
  
--- 299,311 ----
              listener.appHidden(e);
          }
      }
  
      class _UserSessionDispatcher extends _BooleanAppEventMultiplexor<UserSessionListener, UserSessionEvent> {
!         UserSessionEvent createEvent(final boolean isTrue) { 
!             return new UserSessionEvent(AppEvent.UserSessionEvent.REASON_UNSPECIFIED); 
!         }
  
          void performFalseEventOn(final UserSessionListener listener, final UserSessionEvent e) {
              listener.userSessionDeactivated(e);
          }
  
*** 389,399 ****
          void performDefaultAction(final _NativeEvent event) {
              obtainQuitResponse().performQuit();
          }
  
          void performUsing(final QuitHandler handler, final _NativeEvent event) {
!             final QuitResponse response = obtainQuitResponse(); // obtains the "current" quit response
              handler.handleQuitRequestWith(new QuitEvent(), response);
          }
      }
  
  
--- 390,400 ----
          void performDefaultAction(final _NativeEvent event) {
              obtainQuitResponse().performQuit();
          }
  
          void performUsing(final QuitHandler handler, final _NativeEvent event) {
!             final MacQuitResponse response = obtainQuitResponse(); // obtains the "current" quit response
              handler.handleQuitRequestWith(new QuitEvent(), response);
          }
      }
  
  
*** 522,534 ****
          synchronized void setHandler(final H handler) {
              this._handler = handler;
  
              setHandlerContext(AppContext.getAppContext());
  
-             // if a new handler is installed, block addition of legacy ApplicationListeners
-             if (handler == legacyHandler) return;
-             legacyHandler.blockLegacyAPI();
          }
  
          void performDefaultAction(final _NativeEvent event) { } // by default, do nothing
          abstract void performUsing(final H handler, final _NativeEvent event);
  
--- 523,532 ----
*** 572,583 ****
                      for (final _NativeEvent arg : localQueuedEvents) {
                          dispatch(arg);
                      }
                  }
              }
- 
-             // if a new handler is installed, block addition of legacy ApplicationListeners
-             if (handler == legacyHandler) return;
-             legacyHandler.blockLegacyAPI();
          }
      }
  }
--- 570,577 ----