JAL-1840 correct setting status bar for structure mouseover
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 26 Aug 2015 11:06:35 +0000 (12:06 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 26 Aug 2015 11:06:35 +0000 (12:06 +0100)
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/SeqPanel.java

index 700f82d..10db71a 100644 (file)
@@ -446,36 +446,8 @@ public class SeqPanel extends Panel implements MouseMotionListener,
       pos = sequence.findPosition(res);
       text.append(" (").append(Integer.toString(pos)).append(")");
     }
-    // Object obj = null;
-    // if (av.getAlignment().isNucleotide())
-    // {
-    // obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res)
-    // + "");
-    // if (obj != null)
-    // {
-    // text.append(" Nucleotide: ");
-    // }
-    // }
-    // else
-    // {
-    // obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) + "");
-    // if (obj != null)
-    // {
-    // text.append("  Residue: ");
-    // }
-    // }
-    //
-    // if (obj != null)
-    // {
-    //
-    // if (obj != "")
-    // {
-    // text.append(obj + " (" + sequence.findPosition(res) + ")");
-    // }
-    // }
 
     ap.alignFrame.statusBar.setText(text.toString());
-
   }
 
   /**
@@ -497,6 +469,10 @@ public class SeqPanel extends Panel implements MouseMotionListener,
     for (Match m : results.getResults())
     {
       SequenceI seq = m.getSequence();
+      if (seq.getDatasetSequence() != null)
+      {
+        seq = seq.getDatasetSequence();
+      }
 
       if (seq == ds)
       {
index 41c3ce1..44b537b 100644 (file)
@@ -892,6 +892,10 @@ public class SeqPanel extends JPanel implements MouseListener,
     for (Match m : results.getResults())
     {
       SequenceI seq = m.getSequence();
+      if (seq.getDatasetSequence() != null)
+      {
+        seq = seq.getDatasetSequence();
+      }
 
       if (seq == ds)
       {