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 (executable)
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -626,14 +626,9 @@ public class SeqPanel
   }\r
 \r
 \r
-  public void highlightSequence(jalview.datamodel.SequenceI seq, int index)\r
+  public void highlightSequence(SearchResults results)\r
   {\r
-    if(av.alignment.findIndex(seq)>-1)\r
-    {\r
-      SearchResults highlight = new SearchResults();\r
-      highlight.addResult(seq,index,index);\r
-      seqCanvas.highlightSearchResults(highlight);\r
-    }\r
+    seqCanvas.highlightSearchResults(results);\r
   }\r
 \r
   public void updateColours(SequenceI seq, int index)\r

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 893ce2c..37262bb 100755 (executable)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -582,14 +582,9 @@ public class SeqPanel
   }\r
 \r
 \r
-  public void highlightSequence(jalview.datamodel.SequenceI seq, int index)\r
+  public void highlightSequence(SearchResults results)\r
   {\r
-    if(av.alignment.findIndex(seq)>-1)\r
-    {\r
-      SearchResults highlight = new SearchResults();\r
-      highlight.addResult(seq,index,index);\r
-      seqCanvas.highlightSearchResults(highlight);\r
-    }\r
+      seqCanvas.highlightSearchResults(results);\r
   }\r
 \r
   public void updateColours(SequenceI seq, int index)\r

diff --git a/src/jalview/structure/SequenceListener.java b/src/jalview/structure/SequenceListener.java
index b4eefd6..bda215e 100644 (file)
--- a/src/jalview/structure/SequenceListener.java
+++ b/src/jalview/structure/SequenceListener.java
@@ -24,7 +24,7 @@ public interface SequenceListener
 {\r
   public void mouseOverSequence(SequenceI sequence, int index);\r
 \r
-  public void highlightSequence(jalview.datamodel.SequenceI seq, int index);\r
+  public void highlightSequence(jalview.datamodel.SearchResults results);\r
 \r
   public void updateColours(SequenceI sequence, int index);\r
 }\r

diff --git a/src/jalview/structure/StructureSelectionManager.java b/src/jalview/structure/StructureSelectionManager.java
index 48f46ed..cf5054d 100644 (file)
--- 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);
+        }
+
       }
     }
   }