From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 6 Apr 2020 16:27:29 +0000 (+0100)
Subject: Merge branch 'develop' into releases/Release_2_11_1_Branch
X-Git-Tag: Release_2_11_1_0~11
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c103e2ebee9b25cf80ae611ad956cc17f99c763d;hp=-c;p=jalview.git

Merge branch 'develop' into releases/Release_2_11_1_Branch
---

c103e2ebee9b25cf80ae611ad956cc17f99c763d
diff --combined src/jalview/gui/SeqPanel.java
index ecf70e4,27ceb27..e3ea098
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@@ -20,6 -20,24 +20,24 @@@
   */
  package jalview.gui;
  
+ import java.awt.BorderLayout;
+ import java.awt.Color;
+ import java.awt.Font;
+ import java.awt.FontMetrics;
+ import java.awt.Point;
+ import java.awt.event.MouseEvent;
+ import java.awt.event.MouseListener;
+ import java.awt.event.MouseMotionListener;
+ import java.awt.event.MouseWheelEvent;
+ import java.awt.event.MouseWheelListener;
+ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.List;
+ 
+ import javax.swing.JPanel;
+ import javax.swing.SwingUtilities;
+ import javax.swing.ToolTipManager;
+ 
  import jalview.api.AlignViewportI;
  import jalview.bin.Cache;
  import jalview.commands.EditCommand;
@@@ -53,24 -71,6 +71,6 @@@ import jalview.viewmodel.AlignmentViewp
  import jalview.viewmodel.ViewportRanges;
  import jalview.viewmodel.seqfeatures.FeatureRendererModel;
  
- import java.awt.BorderLayout;
- import java.awt.Color;
- import java.awt.Font;
- import java.awt.FontMetrics;
- import java.awt.Point;
- import java.awt.event.MouseEvent;
- import java.awt.event.MouseListener;
- import java.awt.event.MouseMotionListener;
- import java.awt.event.MouseWheelEvent;
- import java.awt.event.MouseWheelListener;
- import java.util.ArrayList;
- import java.util.Collections;
- import java.util.List;
- 
- import javax.swing.JPanel;
- import javax.swing.SwingUtilities;
- import javax.swing.ToolTipManager;
- 
  /**
   * DOCUMENT ME!
   * 
@@@ -865,8 -865,7 +865,8 @@@ public class SeqPanel extends JPane
      {
        setStatusMessage(results);
      }
 -    return results.isEmpty() ? null : getHighlightInfo(results);
 +    // JAL-3303 feature suppressed for now pending review
 +    return null; // results.isEmpty() ? null : getHighlightInfo(results);
    }
  
    /**
@@@ -2061,7 -2060,7 +2061,7 @@@
        return;
      }
  
-     if (evt.getClickCount() > 1)
+     if (evt.getClickCount() > 1 && av.isShowSequenceFeatures())
      {
        sg = av.getSelectionGroup();
        if (sg != null && sg.getSize() == 1