git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3725 helper methods for computing mapped feature range overlap
[jalview.git]
/
src
/
jalview
/
appletgui
/
EmbmenuFrame.java
diff --git
a/src/jalview/appletgui/EmbmenuFrame.java
b/src/jalview/appletgui/EmbmenuFrame.java
index
be4eab6
..
7b489ea
100644
(file)
--- a/
src/jalview/appletgui/EmbmenuFrame.java
+++ b/
src/jalview/appletgui/EmbmenuFrame.java
@@
-49,17
+49,18
@@
import java.util.Map;
* @author Jim Procter and Andrew Waterhouse
*
*/
* @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
*/
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
/**
* the embedded menu is built on this and should be added to the frame at the
@@
-156,8
+157,7
@@
public class EmbmenuFrame extends Frame implements MouseListener
* @return the panel instance for convenience.
*/
protected Panel makeEmbeddedPopupMenu(MenuBar menuBar, Font font,
* @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)
MouseListener clickHandler)
{
if (overrideFonts)
@@
-200,6
+200,7
@@
public class EmbmenuFrame extends Frame implements MouseListener
return embeddedMenu;
}
return embeddedMenu;
}
+ @Override
public void mousePressed(MouseEvent evt)
{
PopupMenu popup = null;
public void mousePressed(MouseEvent evt)
{
PopupMenu popup = null;
@@
-208,8
+209,8
@@
public class EmbmenuFrame extends Frame implements MouseListener
if (popup != null)
{
embeddedMenu.add(popup);
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
+225,22
@@
public class EmbmenuFrame extends Frame implements MouseListener
return embeddedPopup.get(source);
}
return embeddedPopup.get(source);
}
+ @Override
public void mouseClicked(MouseEvent evt)
{
}
public void mouseClicked(MouseEvent evt)
{
}
+ @Override
public void mouseReleased(MouseEvent evt)
{
}
public void mouseReleased(MouseEvent evt)
{
}
+ @Override
public void mouseEntered(MouseEvent evt)
{
}
public void mouseEntered(MouseEvent evt)
{
}
+ @Override
public void mouseExited(MouseEvent evt)
{
}
public void mouseExited(MouseEvent evt)
{
}
@@
-263,11
+268,13
@@
public class EmbmenuFrame extends Frame implements MouseListener
/**
* calls destroyMenus()
*/
/**
* calls destroyMenus()
*/
- public void finalize() throws Throwable
+ @Override
+ public void close()
{
destroyMenus();
embeddedPopup = null;
embeddedMenu = null;
{
destroyMenus();
embeddedPopup = null;
embeddedMenu = null;
- super.finalize();
+ // no close for Frame
+ // super.finalize();
}
}
}
}