From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 21 Apr 2020 13:15:07 +0000 (+0100)
Subject: Merge branch 'develop' into releases/Release_2_11_1_Branch
X-Git-Tag: Release_2_11_1_0~6
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=165cd5fefff08d6633dafb15576ab6c30cdb65d8;hp=-c;p=jalview.git

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

165cd5fefff08d6633dafb15576ab6c30cdb65d8
diff --combined src/jalview/gui/SeqPanel.java
index e3ea098,f28217d..cd974a4
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@@ -207,8 -207,6 +207,6 @@@ public class SeqPanel extends JPane
  
    StringBuffer keyboardNo2;
  
-   java.net.URL linkImageURL;
- 
    private final SequenceAnnotationReport seqARep;
  
    StringBuilder tooltipText = new StringBuilder();
@@@ -229,8 -227,7 +227,7 @@@
     */
    public SeqPanel(AlignViewport viewport, AlignmentPanel alignPanel)
    {
-     linkImageURL = getClass().getResource("/images/link.gif");
-     seqARep = new SequenceAnnotationReport(linkImageURL.toString());
+     seqARep = new SequenceAnnotationReport(true);
      ToolTipManager.sharedInstance().registerComponent(this);
      ToolTipManager.sharedInstance().setInitialDelay(0);
      ToolTipManager.sharedInstance().setDismissDelay(10000);
@@@ -865,8 -862,7 +862,8 @@@
      {
        setStatusMessage(results);
      }
 -    return results.isEmpty() ? null : getHighlightInfo(results);
 +    // JAL-3303 feature suppressed for now pending review
 +    return null; // results.isEmpty() ? null : getHighlightInfo(results);
    }
  
    /**
@@@ -1048,9 -1044,9 +1045,9 @@@
      {
        List<SequenceFeature> features = ap.getFeatureRenderer()
                .findFeaturesAtColumn(sequence, column + 1);
-       unshownFeatures = seqARep.appendFeaturesLengthLimit(tooltipText, pos,
-               features,
-               this.ap.getSeqPanel().seqCanvas.fr, MAX_TOOLTIP_LENGTH);
+       unshownFeatures = seqARep.appendFeatures(tooltipText, pos,
+               features, this.ap.getSeqPanel().seqCanvas.fr,
+               MAX_TOOLTIP_LENGTH);
  
        /*
         * add features in CDS/protein complement at the corresponding
@@@ -1068,9 -1064,8 +1065,8 @@@
                    pos);
            if (mf != null)
            {
-             unshownFeatures = seqARep.appendFeaturesLengthLimit(
-                     tooltipText, pos, mf, fr2,
-                     MAX_TOOLTIP_LENGTH);
+             unshownFeatures = seqARep.appendFeatures(tooltipText,
+                     pos, mf, fr2, MAX_TOOLTIP_LENGTH);
            }
          }
        }