X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;fp=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;h=cf72daf92b1397060395cebd4c6978bb65f15656;hb=a714684d20bb1b8423e0e63d6f3257c2bffa850b;hp=5cac6f5425ab2c3fb2c604784e384d02765a00e0;hpb=e0aee2e0eb48c09a557a61fece6c0f4fdcae110b;p=jalview.git diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java index 5cac6f5..cf72daf 100755 --- 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);