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

diff --git a/src/jalview/appletgui/EmbmenuFrame.java b/src/jalview/appletgui/EmbmenuFrame.java
index be4eab6..8b2b279 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,17 +51,18 @@ import java.util.Map;
  * @author Jim Procter and Andrew Waterhouse
  * 
  */
-public class EmbmenuFrame extends Frame implements MouseListener
+public class EmbmenuFrame extends Frame
+        implements MouseListener, AutoCloseable
 {
-  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;
 
   /**
    * map from labels to popup menus for the embedded menubar
    */
-  protected Map<Label, PopupMenu> embeddedPopup = new HashMap<Label, PopupMenu>();
+  protected Map<Label, PopupMenu> embeddedPopup = new HashMap<>();
 
   /**
    * the embedded menu is built on this and should be added to the frame at the
@@ -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)
@@ -200,6 +202,7 @@ public class EmbmenuFrame extends Frame implements MouseListener
     return embeddedMenu;
   }
 
+  @Override
   public void mousePressed(MouseEvent evt)
   {
     PopupMenu popup = null;
@@ -208,8 +211,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);
     }
   }
 
@@ -224,18 +227,22 @@ public class EmbmenuFrame extends Frame implements MouseListener
     return embeddedPopup.get(source);
   }
 
+  @Override
   public void mouseClicked(MouseEvent evt)
   {
   }
 
+  @Override
   public void mouseReleased(MouseEvent evt)
   {
   }
 
+  @Override
   public void mouseEntered(MouseEvent evt)
   {
   }
 
+  @Override
   public void mouseExited(MouseEvent evt)
   {
   }
@@ -263,11 +270,11 @@ public class EmbmenuFrame extends Frame implements MouseListener
   /**
    * calls destroyMenus()
    */
-  public void finalize() throws Throwable
+  @Override
+  public void close()
   {
     destroyMenus();
     embeddedPopup = null;
     embeddedMenu = null;
-    super.finalize();
   }
 }