From 62839df6d47520194f008458b48ecb688c7e2c07 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Mon, 29 Jun 2020 18:39:41 +0100 Subject: [PATCH] JAL-3493 fix patch for 2.11.1_js (nb - these changes should not be merged to 2.11.2!) --- src/jalview/gui/AlignmentPanel.java | 2 +- test/jalview/gui/SeqCanvasTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index 08843aa..277e11d 100644 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -1942,7 +1942,7 @@ public class AlignmentPanel extends GAlignmentPanel implements } av.setSelectionGroup(null); av.getColumnSelection().clear(); - viewport.setSearchResults(null); + av.setSearchResults(null); getIdPanel().getIdCanvas().searchResults = null; av.sendSelection(); // JAL-2034 - should delegate to diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java index de33b52..34e88ad 100644 --- a/test/jalview/gui/SeqCanvasTest.java +++ b/test/jalview/gui/SeqCanvasTest.java @@ -377,6 +377,8 @@ public class SeqCanvasTest @Test(groups = "Functional") public void testClear_HighlightAndSelection() { + AlignFrame af = new FileLoader().LoadFileWaitTillLoaded( + "examples/uniref50.fa", DataSourceType.FILE); AlignViewport av = af.getViewport(); SearchResultsI highlight = new SearchResults(); highlight.addResult( -- 1.7.10.2