temp push

[jalview.git] / src / jalview / appletgui / EmbmenuFrame.java

diff --git a/src/jalview/appletgui/EmbmenuFrame.java b/src/jalview/appletgui/EmbmenuFrame.java
index fdd7d46..b6b81fa 100644 (file)
--- a/src/jalview/appletgui/EmbmenuFrame.java
+++ b/src/jalview/appletgui/EmbmenuFrame.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,6 +20,8 @@
  */
 package jalview.appletgui;
 
+import jalview.util.Platform;
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.FlowLayout;
@@ -49,6 +51,7 @@ 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",
@@ -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);
@@ -207,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);
     }
   }