X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FEmbmenuFrame.java;h=8b2b279e48c306414b5720078811f971a32a4c63;hb=17e4ea278bc9a5fb280db1252ce78b7a295215f5;hp=b6b81faf6ac94d8298196dcb9e69216b8eeee1b9;hpb=e6267883ffc25d76313c9e45967efe2c9e6d1d08;p=jalview.git diff --git a/src/jalview/appletgui/EmbmenuFrame.java b/src/jalview/appletgui/EmbmenuFrame.java index b6b81fa..8b2b279 100644 --- a/src/jalview/appletgui/EmbmenuFrame.java +++ b/src/jalview/appletgui/EmbmenuFrame.java @@ -51,8 +51,8 @@ import java.util.Map; * @author Jim Procter and Andrew Waterhouse * */ -@SuppressWarnings("serial") -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); @@ -62,7 +62,7 @@ public class EmbmenuFrame extends Frame implements MouseListener /** * map from labels to popup menus for the embedded menubar */ - protected Map embeddedPopup = new HashMap(); + protected Map embeddedPopup = new HashMap<>(); /** * the embedded menu is built on this and should be added to the frame at the @@ -202,6 +202,7 @@ public class EmbmenuFrame extends Frame implements MouseListener return embeddedMenu; } + @Override public void mousePressed(MouseEvent evt) { PopupMenu popup = null; @@ -226,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) { } @@ -265,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(); } }