JAL-2388 Reverted and re-did applet changes

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

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index 5cac6f5..cf72daf 100755 (executable)
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -28,18 +28,19 @@ import jalview.viewmodel.OverviewDimensionsWithHidden;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.awt.MenuItem;
 import java.awt.Panel;
-import java.awt.PopupMenu;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
-import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
 
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+
 public class OverviewPanel extends Panel implements Runnable,
         MouseMotionListener, MouseListener
 {
@@ -104,8 +105,7 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void mouseClicked(MouseEvent evt)
   {
-    // right button press
-    if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+    if (SwingUtilities.isRightMouseButton(evt))
     {
       showPopupMenu(evt);
     }
@@ -136,8 +136,7 @@ public class OverviewPanel extends Panel implements Runnable,
 
   private void mouseAction(MouseEvent evt)
   {
-    // right button press
-    if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+    if (SwingUtilities.isRightMouseButton(evt))
     {
       if (!Platform.isAMac())
       {
@@ -209,7 +208,7 @@ public class OverviewPanel extends Panel implements Runnable,
    */
   private void showPopupMenu(MouseEvent e)
   {
-    PopupMenu popup = new PopupMenu();
+    JPopupMenu popup = new JPopupMenu();
     ActionListener menuListener = new ActionListener()
     {
       @Override
@@ -219,7 +218,7 @@ public class OverviewPanel extends Panel implements Runnable,
         toggleHiddenColumns();
       }
     };
-    MenuItem item = new MenuItem(
+    JMenuItem item = new JMenuItem(
             MessageManager.getString("label.togglehidden"));
     popup.add(item);
     item.addActionListener(menuListener);