X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;h=b933d30eef139504b79e6a9fc9f14813d16f85a8;hb=36e7c887ef91f49f6065dea063180f7de146b3e1;hp=cf72daf92b1397060395cebd4c6978bb65f15656;hpb=af00f89579328012da26b151996997b1735265b4;p=jalview.git

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index cf72daf..b933d30 100755
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -23,24 +23,23 @@ package jalview.appletgui;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 import jalview.viewmodel.OverviewDimensions;
-import jalview.viewmodel.OverviewDimensionsAllVisible;
-import jalview.viewmodel.OverviewDimensionsWithHidden;
+import jalview.viewmodel.OverviewDimensionsHideHidden;
+import jalview.viewmodel.OverviewDimensionsShowHidden;
 
 import java.awt.BorderLayout;
+import java.awt.CheckboxMenuItem;
 import java.awt.Dimension;
 import java.awt.Panel;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import java.awt.PopupMenu;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 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
 {
@@ -62,7 +61,7 @@ public class OverviewPanel extends Panel implements Runnable,
     this.ap = alPanel;
     setLayout(null);
 
-    od = new OverviewDimensionsWithHidden(av.getRanges(),
+    od = new OverviewDimensionsShowHidden(av.getRanges(),
             (av.isShowAnnotation() && av.getSequenceConsensusHash() != null));
 
     oviewCanvas = new OverviewCanvas(od, av);
@@ -105,7 +104,7 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void mouseClicked(MouseEvent evt)
   {
-    if (SwingUtilities.isRightMouseButton(evt))
+    if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
     {
       showPopupMenu(evt);
     }
@@ -136,7 +135,7 @@ public class OverviewPanel extends Panel implements Runnable,
 
   private void mouseAction(MouseEvent evt)
   {
-    if (SwingUtilities.isRightMouseButton(evt))
+    if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
     {
       if (!Platform.isAMac())
       {
@@ -208,20 +207,21 @@ public class OverviewPanel extends Panel implements Runnable,
    */
   private void showPopupMenu(MouseEvent e)
   {
-    JPopupMenu popup = new JPopupMenu();
-    ActionListener menuListener = new ActionListener()
+    PopupMenu popup = new PopupMenu();
+    ItemListener menuListener = new ItemListener()
     {
       @Override
-      public void actionPerformed(ActionEvent event)
+      public void itemStateChanged(ItemEvent e)
       {
-        // switch on/off the hidden columns view
         toggleHiddenColumns();
       }
     };
-    JMenuItem item = new JMenuItem(
+    CheckboxMenuItem item = new CheckboxMenuItem(
             MessageManager.getString("label.togglehidden"));
+    item.setState(showHidden);
     popup.add(item);
-    item.addActionListener(menuListener);
+    item.addItemListener(menuListener);
+    this.add(popup);
     popup.show(this, e.getX(), e.getY());
   }
 
@@ -233,14 +233,14 @@ public class OverviewPanel extends Panel implements Runnable,
     if (showHidden)
     {
       showHidden = false;
-      od = new OverviewDimensionsAllVisible(av.getRanges(),
+      od = new OverviewDimensionsHideHidden(av.getRanges(),
               (av.isShowAnnotation() && av
                       .getAlignmentConservationAnnotation() != null));
     }
     else
     {
       showHidden = true;
-      od = new OverviewDimensionsWithHidden(av.getRanges(),
+      od = new OverviewDimensionsShowHidden(av.getRanges(),
               (av.isShowAnnotation() && av
                       .getAlignmentConservationAnnotation() != null));
     }