From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 15 May 2007 15:35:07 +0000 (+0000)
Subject: SequenceListener highlights SearchResults, not just a single sequence
X-Git-Tag: Release_2_4~409
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3173d5515901341a2ae3211bd8e4400e966add35;p=jalview.git

SequenceListener highlights SearchResults, not just a single sequence
---

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index c56ded6..24a934c 100755
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -626,14 +626,9 @@ public class SeqPanel
   }
 
 
-  public void highlightSequence(jalview.datamodel.SequenceI seq, int index)
+  public void highlightSequence(SearchResults results)
   {
-    if(av.alignment.findIndex(seq)>-1)
-    {
-      SearchResults highlight = new SearchResults();
-      highlight.addResult(seq,index,index);
-      seqCanvas.highlightSearchResults(highlight);
-    }
+    seqCanvas.highlightSearchResults(results);
   }
 
   public void updateColours(SequenceI seq, int index)
diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 893ce2c..37262bb 100755
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -582,14 +582,9 @@ public class SeqPanel
   }
 
 
-  public void highlightSequence(jalview.datamodel.SequenceI seq, int index)
+  public void highlightSequence(SearchResults results)
   {
-    if(av.alignment.findIndex(seq)>-1)
-    {
-      SearchResults highlight = new SearchResults();
-      highlight.addResult(seq,index,index);
-      seqCanvas.highlightSearchResults(highlight);
-    }
+      seqCanvas.highlightSearchResults(results);
   }
 
   public void updateColours(SequenceI seq, int index)
diff --git a/src/jalview/structure/SequenceListener.java b/src/jalview/structure/SequenceListener.java
index b4eefd6..bda215e 100644
--- a/src/jalview/structure/SequenceListener.java
+++ b/src/jalview/structure/SequenceListener.java
@@ -24,7 +24,7 @@ public interface SequenceListener
 {
   public void mouseOverSequence(SequenceI sequence, int index);
 
-  public void highlightSequence(jalview.datamodel.SequenceI seq, int index);
+  public void highlightSequence(jalview.datamodel.SearchResults results);
 
   public void updateColours(SequenceI sequence, int index);
 }
diff --git a/src/jalview/structure/StructureSelectionManager.java b/src/jalview/structure/StructureSelectionManager.java
index 48f46ed..cf5054d 100644
--- a/src/jalview/structure/StructureSelectionManager.java
+++ b/src/jalview/structure/StructureSelectionManager.java
@@ -240,21 +240,30 @@ public class StructureSelectionManager
   public void mouseOverStructure(int pdbResNum, String chain, String pdbfile)
   {
     SequenceListener sl;
+    SearchResults results = new SearchResults();
     for (int i = 0; i < listeners.size(); i++)
     {
       if (listeners.elementAt(i) instanceof SequenceListener)
       {
-        sl = (SequenceListener) listeners.elementAt(i);
 
         for (int j = 0; j < mappings.length; j++)
         {
           if (mappings[j].pdbfile.equals(pdbfile) &&
               mappings[j].pdbchain.equals(chain))
           {
-            sl.highlightSequence(mappings[j].sequence,
-                                 mappings[j].getSeqPos(pdbResNum));
+            results.addResult(mappings[j].sequence,
+               mappings[j].getSeqPos(pdbResNum),
+               mappings[j].getSeqPos(pdbResNum)
+              );
           }
         }
+
+        if(results.getSize()>0)
+        {
+          ( (SequenceListener) listeners.elementAt(i))
+              .highlightSequence(results);
+        }
+
       }
     }
   }