WebSVN - OpenConcerto - Diff - Rev 177 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/config/MainFrame.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
 import org.openconcerto.utils.JImage;
 import org.openconcerto.utils.OSXAdapter;
 import java.awt.Color;
 import java.awt.Container;
+import java.awt.Desktop;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
     public static final String LIST_MENU = "menu.list";
     public static final String CREATE_MENU = "menu.create";
     public static final String FILE_MENU = "menu.file";
     public static final String HELP_MENU = "menu.help";
+    public static final String PREFS_MENU_ITEM = "preferences";
+    public static final String QUIT_MENU_ITEM = "quit";
+    public static final String ABOUT_MENU_ITEM = "information";
     static private final List<Runnable> runnables = new ArrayList<Runnable>();
     @GuardedBy("MainFrame")
     static private MainFrame instance = null;
     // thread safe
         this.setMinimumSize(minSize);
         final File confFile = new File(conf.getConfDir(), "Configuration" + File.separator + "Frame" + File.separator + "mainFrame" + confSuffix + ".xml");
         new WindowStateManager(this, confFile).loadState();
-        registerForMacOSXEvents();
         this.addWindowListener(new WindowAdapter() {
             @Override
             public void windowClosing(WindowEvent arg0) {
                 quit();
+            }
         // Overrive logo
         final Image im = conf instanceof ComptaPropsConfiguration ? ((ComptaPropsConfiguration) conf).getCustomLogo() : null;
         if (im != null) {
             image.setImage(im);
+        }
-        new NewsUpdater(this.image);
+    }
-    // create the UI menu from the menu manager
+    // create the UI menu from the MenuAndActions and hide items handled by java.awt.Desktop
     public final void initMenuBar() {
         final MenuManager mm = MenuManager.getInstance();
         final PropertyChangeListener listener = new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
         if (SwingThreadUtils.getAncestorOrSelf(JMenuBar.class, item) != this.getJMenuBar())
             throw new IllegalArgumentException("Item not in this menu " + item);
         MenuUtils.removeMenuItem(item);
+    }
+    public void registerDesktopEvents(final MenuAndActions menuAndActions) {
+        // First try standard >=9 way, otherwise fall back to com.apple.eawt.Application
+        if (!this.registerAWTDesktopEvents(menuAndActions))
+            this.registerForMacOSXEvents(menuAndActions);
+    }
+    private boolean registerAWTDesktopEvents(final MenuAndActions menuAndActions) {
+        if (!Desktop.isDesktopSupported())
+            return false;
+        final Desktop desktop = Desktop.getDesktop();
+        final boolean quitHandled = registerAWTDesktopEvent(desktop, "QuitHandler", "APP_QUIT_HANDLER", menuAndActions, QUIT_MENU_ITEM);
+        final boolean aboutHandled = registerAWTDesktopEvent(desktop, "AboutHandler", "APP_ABOUT", menuAndActions, ABOUT_MENU_ITEM);
+        final boolean prefsHandled = registerAWTDesktopEvent(desktop, "PreferencesHandler", "APP_PREFERENCES", menuAndActions, PREFS_MENU_ITEM);
+        return quitHandled && aboutHandled && prefsHandled;
+    }
+    private boolean registerAWTDesktopEvent(final Desktop desktop, final String handlerClassName, final String desktopActionName, final MenuAndActions menuAndActions, final String menuActionName) {
+        final Desktop.Action appPrefsAction;
+        try {
+            appPrefsAction = Desktop.Action.valueOf(desktopActionName);
+        } catch (Exception e) {
+            // JRE <9, fallback to the old way
+            return false;
+        }
+        if (!desktop.isSupported(appPrefsAction)) {
+            // JRE >= 9, but not supported
+            return false;
+        }
+        try {
+            final Class<?> prefHandlerClass = Class.forName("java.awt.desktop." + handlerClassName);
+            final Object prefHandler = Proxy.newProxyInstance(prefHandlerClass.getClassLoader(), new Class<?>[] { prefHandlerClass }, new InvocationHandler() {
+                @Override
+                public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+                    menuAndActions.getAction(menuActionName).actionPerformed(null);
+                    return null;
+                }
+            });
+            desktop.getClass().getMethod("set" + handlerClassName, prefHandlerClass).invoke(desktop, prefHandler);
+            menuAndActions.setMenuItemVisible(menuActionName, false);
+            return true;
+        } catch (Exception e) {
+            // Unknown error, still try to fallback to the old way
+            e.printStackTrace();
+            return false;
+        }
+    }
     // Generic registration with the Mac OS X application menu
     // Checks the platform, then attempts to register with the Apple EAWT
     // See OSXAdapter.java to see how this is done without directly referencing any Apple APIs
+    // Remove once depending on Java 11.
+    @Deprecated
-    public void registerForMacOSXEvents() {
+    public void registerForMacOSXEvents(final MenuAndActions menuAndActions) {
         if (Gestion.MAC_OS_X) {
             try {
                 // Generate and register the OSXAdapter, passing it a hash of all the methods we
                 // wish to use as delegates for various com.apple.eawt.ApplicationListener methods
                 OSXAdapter.setQuitHandler(this, getClass().getDeclaredMethod("quit", new Class[0]));
                 OSXAdapter.setAboutHandler(this, getClass().getDeclaredMethod("about", new Class[0]));
                 OSXAdapter.setPreferencesHandler(this, getClass().getDeclaredMethod("preferences", new Class[0]));
+                menuAndActions.setMenuItemVisible(QUIT_MENU_ITEM, false);
+                menuAndActions.setMenuItemVisible(ABOUT_MENU_ITEM, false);
+                menuAndActions.setMenuItemVisible(PREFS_MENU_ITEM, false);
                 // no OSXAdapter.setFileHandler() for now
             } catch (Exception e) {
                 System.err.println("Error while loading the OSXAdapter:");
                 e.printStackTrace();
+            }
+        }
+    }
     // used by OSXAdapter
+    @Deprecated
     public final void preferences() {
-        MenuManager.getInstance().getActionForId("preferences").actionPerformed(null);
+        MenuManager.getInstance().getActionForId(PREFS_MENU_ITEM).actionPerformed(null);
+    }
+    @Deprecated
     public final void about() {
-        MenuManager.getInstance().getActionForId("information").actionPerformed(null);
+        MenuManager.getInstance().getActionForId(ABOUT_MENU_ITEM).actionPerformed(null);
+    }
     public boolean quit() {
         if (this.getTodoPanel() != null)
             this.getTodoPanel().stopUpdate();

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/config/MainFrame.java - Rev 177 → 182