after merge

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

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 9ed48b2..9030341 100755 (executable)
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -290,35 +290,38 @@ public class SeqPanel
       }\r
     }\r
 \r
-    ap.alignFrame.statusBar.setText(text.toString());\r
+    if(seqCanvas.pdbCanvas!=null && sequence==seqCanvas.pdbCanvas.sequence)\r
+    {\r
+      seqCanvas.pdbCanvas.highlightRes(sequence.findPosition(res));\r
+    }\r
+\r
 \r
     // use aa to see if the mouse pointer is on a\r
-    if (av.showSequenceFeatures)\r
+    if (av.showSequenceFeatures && sequence.getSequenceFeatures()!=null)\r
     {\r
       Vector features = sequence.getSequenceFeatures();\r
       Enumeration e = features.elements();\r
-      StringBuffer sbuffer = new StringBuffer();\r
+      text.append(" Sequence Feature: ");\r
 \r
       while (e.hasMoreElements())\r
       {\r
         SequenceFeature sf = (SequenceFeature) e.nextElement();\r
-        if (sf.getStart() <= sequence.findPosition(res) &&\r
+        if (sf.getBegin() <= sequence.findPosition(res) &&\r
             sf.getEnd() >= sequence.findPosition(res))\r
         {\r
-          if (sbuffer.length() > 0)\r
-          {\r
-            sbuffer.append("; ");\r
-          }\r
-          sbuffer.append(sf.getType() + " " + sf.getDescription());\r
+          text.append(sf.getDescription());\r
           if (sf.getStatus().length() > 0)\r
           {\r
-            sbuffer.append(" (" + sf.getStatus() + ")");\r
+            text.append(" (" + sf.getStatus() + ")");\r
           }\r
+          text.append("; ");\r
         }\r
 \r
       }\r
     }\r
 \r
+     ap.alignFrame.statusBar.setText(text.toString());\r
+\r
   }\r
 \r
   public void doMouseDragged(MouseEvent evt)\r
@@ -504,6 +507,9 @@ public class SeqPanel
     oldSeq = seq;\r
     startWrapBlock=wrappedBlock;\r
 \r
+    if(seq==-1)\r
+      return;\r
+\r
     SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);\r
 \r
     if (sequence == null || res > sequence.getLength())\r