From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 28 Mar 2019 08:07:01 +0000 (+0000)
Subject: Merge branch 'develop' into Jalview-JS/develop
X-Git-Tag: Release_2_11_4_0~45^2~18^2~201
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b8196b19d8f419759df704d0f016de59b0c6ead0;p=jalview.git

Merge branch 'develop' into Jalview-JS/develop
---

b8196b19d8f419759df704d0f016de59b0c6ead0
diff --cc src/jalview/gui/PopupMenu.java
index 37defd0,702773b..4193143
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@@ -74,20 -71,15 +74,18 @@@ import java.util.Vector
  
  import javax.swing.ButtonGroup;
  import javax.swing.JCheckBoxMenuItem;
 -import javax.swing.JColorChooser;
 +import javax.swing.JInternalFrame;
 +import javax.swing.JLabel;
  import javax.swing.JMenu;
  import javax.swing.JMenuItem;
 +import javax.swing.JPanel;
  import javax.swing.JPopupMenu;
  import javax.swing.JRadioButtonMenuItem;
 +import javax.swing.JScrollPane;
  
  /**
-  * DOCUMENT ME!
-  * 
-  * @author $author$
-  * @version $Revision: 1.118 $
+  * The popup menu that is displayed on right-click on a sequence id, or in the
+  * sequence alignment.
   */
  public class PopupMenu extends JPopupMenu implements ColourChangeListener
  {