X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FEmbmenuFrame.java;h=b6b81faf6ac94d8298196dcb9e69216b8eeee1b9;hb=a83adb45bdf9554e270921b4baad94defd314b36;hp=be4eab62b6401bcf61e993d86180e1e20a2defab;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git

diff --git a/src/jalview/appletgui/EmbmenuFrame.java b/src/jalview/appletgui/EmbmenuFrame.java
index be4eab6..b6b81fa 100644
--- a/src/jalview/appletgui/EmbmenuFrame.java
+++ b/src/jalview/appletgui/EmbmenuFrame.java
@@ -20,6 +20,8 @@
  */
 package jalview.appletgui;
 
+import jalview.util.Platform;
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.FlowLayout;
@@ -49,10 +51,11 @@ import java.util.Map;
  * @author Jim Procter and Andrew Waterhouse
  * 
  */
+@SuppressWarnings("serial")
 public class EmbmenuFrame extends Frame implements MouseListener
 {
-  protected static final Font FONT_ARIAL_PLAIN_11 = new Font(
-            "Arial", Font.PLAIN, 11);
+  protected static final Font FONT_ARIAL_PLAIN_11 = new Font("Arial",
+          Font.PLAIN, 11);
 
   public static final Font DEFAULT_MENU_FONT = FONT_ARIAL_PLAIN_11;
 
@@ -95,7 +98,7 @@ public class EmbmenuFrame extends Frame implements MouseListener
       return false;
     }
     // DEBUG Hint: can test embedded menus by inserting true here.
-    if (new jalview.util.Platform().isAMac())
+    if (Platform.isAMacAndNotJS())
     {
       // Build the embedded menu panel, allowing override with system font
       embeddedMenu = makeEmbeddedPopupMenu(topMenuBar, true, false);
@@ -156,8 +159,7 @@ public class EmbmenuFrame extends Frame implements MouseListener
    * @return the panel instance for convenience.
    */
   protected Panel makeEmbeddedPopupMenu(MenuBar menuBar, Font font,
-          boolean overrideFonts,
-          Panel embeddedMenu,
+          boolean overrideFonts, Panel embeddedMenu,
           MouseListener clickHandler)
   {
     if (overrideFonts)
@@ -208,8 +210,8 @@ public class EmbmenuFrame extends Frame implements MouseListener
     if (popup != null)
     {
       embeddedMenu.add(popup);
-      popup.show(embeddedMenu, source.getBounds().x, source.getBounds().y
-              + source.getBounds().getSize().height);
+      popup.show(embeddedMenu, source.getBounds().x,
+              source.getBounds().y + source.getBounds().getSize().height);
     }
   }