JAL-1636 translate stop codon as '*', mouseover * as STOP

[jalview.git] / src / jalview / appletgui / SeqPanel.java

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 700f82d..4dd131a 100644 (file)
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -432,8 +432,9 @@ public class SeqPanel extends Panel implements MouseMotionListener,
     }
     else
     {
-      residue = "X".equalsIgnoreCase(displayChar) ? "X"
-              : ResidueProperties.aa2Triplet.get(displayChar);
+      residue = "X".equalsIgnoreCase(displayChar) ? "X" : ("*"
+              .equals(displayChar) ? "STOP" : ResidueProperties.aa2Triplet
+              .get(displayChar));
       if (residue != null)
       {
         text.append(" Residue: ").append(residue);
@@ -446,36 +447,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 +470,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)
       {