JAL-345 refactor list of sequences that are highlighted from Id Canvas to Alignment...

[jalview.git] / src / jalview / gui / IdCanvas.java

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index cf88c90..b886552 100755 (executable)
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -61,8 +61,6 @@ public class IdCanvas extends JPanel implements ViewportListenerI
 
   boolean fastPaint = false;
 
-  List<SequenceI> searchResults;
-
   AnnotationPanel ap;
 
   private Font idfont;
@@ -103,7 +101,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI
     int xPos = 0;
     int panelWidth = getWidth();
     int charHeight = av.getCharHeight();
-
+    List<SequenceI> searchResults = av.getHighlightedSeqs();
     if ((searchResults != null) && searchResults.contains(s))
     {
       g.setColor(Color.black);
@@ -163,6 +161,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI
     }
 
     ViewportRanges ranges = av.getRanges();
+    List<SequenceI> searchResults = av.getHighlightedSeqs();
 
     gg.copyArea(0, 0, getWidth(), imgHeight, 0,
             -vertical * av.getCharHeight());
@@ -252,7 +251,8 @@ public class IdCanvas extends JPanel implements ViewportListenerI
     gg.setColor(Color.white);
     gg.fillRect(0, 0, getWidth(), imgHeight);
     
-    drawIds(gg, av, av.getRanges().getStartSeq(), av.getRanges().getEndSeq(), searchResults);
+    drawIds(gg, av, av.getRanges().getStartSeq(),
+            av.getRanges().getEndSeq(), av.getHighlightedSeqs());
     
     g.drawImage(image, 0, 0, this);
   }
@@ -544,18 +544,6 @@ public class IdCanvas extends JPanel implements ViewportListenerI
     return getIdfont();
   }
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param list
-   *          DOCUMENT ME!
-   */
-  public void setHighlighted(List<SequenceI> list)
-  {
-    searchResults = list;
-    repaint();
-  }
-
   public Font getIdfont()
   {
     return idfont;