Detect new and old names for apple look and feel.

Fix Apple Menu Items to actually work for the first time since November 2010 (db95f29d75)
This should probably be backported also along with I6b31f255981dd064ef19bea2b84e8389d63e71c3 but is less important.

Change-Id: I325f91b0a2f9cf033f47138330abad132a77bf9a
Reviewed-on: http://gerrit.dmdirc.com/2467
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/ui_swing/Apple.java

@@ -33,7 +33,6 @@ import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
-import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationHandler;
@@ -218,8 +217,8 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @return true if we are using the OS X look and feel
      */
     public static boolean isAppleUI() {
-        return isApple() && UIManager.getLookAndFeel().getClass().getName().
-                equals("apple.laf.AquaLookAndFeel");
+        final String name = UIManager.getLookAndFeel().getClass().getName();
+        return isApple() && (name.equals("apple.laf.AquaLookAndFeel") || name.equals("com.apple.laf.AquaLookAndFeel"));
     }
 
     /**
@@ -395,12 +394,16 @@ public final class Apple implements InvocationHandler, ActionListener {
         if (!isApple() || menuBar == null) {
             return;
         }
-        event.setHandled(true);
         final ActionEvent actionEvent = new ActionEvent(this,
                 ActionEvent.ACTION_PERFORMED, name);
 
-        Toolkit.getDefaultToolkit().getSystemEventQueue()
-                .postEvent(actionEvent);
+        for (int i = 0; i < menuBar.getMenuCount(); i++) {
+            final JMenu menu = menuBar.getMenu(i);
+            if (menu instanceof java.awt.event.ActionListener) {
+                ((java.awt.event.ActionListener)menu).actionPerformed(actionEvent);
+                event.setHandled(true);
+            }
+        }
     }
 
     /**