X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=d2832f84f93305d101787cbc5974a6179c36c1fb;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hp=a7a20edf0108c068829d922ef416517408400216;hpb=8a6fa9ea9900d0f106529c3f6283e7f9d76dd2cb;p=jalview.git

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index a7a20ed..d2832f8 100755
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -89,61 +89,62 @@ public class IdPanel extends Panel implements MouseListener,
 
     // look for non-pos features
     StringBuffer tooltiptext = new StringBuffer();
-
-    if (sequence.getDescription() != null)
+    if (sequence != null)
     {
-      tooltiptext.append(sequence.getDescription());
-      tooltiptext.append("\n");
-    }
+      if (sequence.getDescription() != null)
+      {
+        tooltiptext.append(sequence.getDescription());
+        tooltiptext.append("\n");
+      }
 
-    SequenceFeature sf[] = sequence.getSequenceFeatures();
-    for (int sl = 0; sf != null && sl < sf.length; sl++)
-    {
-      if (sf[sl].begin == sf[sl].end && sf[sl].begin == 0)
+      SequenceFeature sf[] = sequence.getSequenceFeatures();
+      for (int sl = 0; sf != null && sl < sf.length; sl++)
       {
-        boolean nl = false;
-        if (sf[sl].getFeatureGroup() != null)
-        {
-          tooltiptext.append(sf[sl].getFeatureGroup());
-          nl = true;
-        }
-        ;
-        if (sf[sl].getType() != null)
-        {
-          tooltiptext.append(" ");
-          tooltiptext.append(sf[sl].getType());
-          nl = true;
-        }
-        ;
-        if (sf[sl].getDescription() != null)
-        {
-          tooltiptext.append(" ");
-          tooltiptext.append(sf[sl].getDescription());
-          nl = true;
-        }
-        ;
-        if (sf[sl].getScore() != Float.NaN && sf[sl].getScore() != 0f)
-        {
-          tooltiptext.append(" Score = ");
-          tooltiptext.append(sf[sl].getScore());
-          nl = true;
-        }
-        ;
-        if (sf[sl].getStatus() != null && sf[sl].getStatus().length() > 0)
-        {
-          tooltiptext.append(" (");
-          tooltiptext.append(sf[sl].getStatus());
-          tooltiptext.append(")");
-          nl = true;
-        }
-        ;
-        if (nl)
+        if (sf[sl].begin == sf[sl].end && sf[sl].begin == 0)
         {
-          tooltiptext.append("\n");
+          boolean nl = false;
+          if (sf[sl].getFeatureGroup() != null)
+          {
+            tooltiptext.append(sf[sl].getFeatureGroup());
+            nl = true;
+          }
+          ;
+          if (sf[sl].getType() != null)
+          {
+            tooltiptext.append(" ");
+            tooltiptext.append(sf[sl].getType());
+            nl = true;
+          }
+          ;
+          if (sf[sl].getDescription() != null)
+          {
+            tooltiptext.append(" ");
+            tooltiptext.append(sf[sl].getDescription());
+            nl = true;
+          }
+          ;
+          if (sf[sl].getScore() != Float.NaN && sf[sl].getScore() != 0f)
+          {
+            tooltiptext.append(" Score = ");
+            tooltiptext.append(sf[sl].getScore());
+            nl = true;
+          }
+          ;
+          if (sf[sl].getStatus() != null && sf[sl].getStatus().length() > 0)
+          {
+            tooltiptext.append(" (");
+            tooltiptext.append(sf[sl].getStatus());
+            tooltiptext.append(")");
+            nl = true;
+          }
+          ;
+          if (nl)
+          {
+            tooltiptext.append("\n");
+          }
         }
       }
     }
-
     if (tooltiptext.length() == 0)
     {
       // nothing to display - so clear tooltip if one is visible
@@ -196,7 +197,12 @@ public class IdPanel extends Panel implements MouseListener,
 
     // DEFAULT LINK IS FIRST IN THE LINK LIST
     int seq = alignPanel.seqPanel.findSeq(e);
-    String id = av.getAlignment().getSequenceAt(seq).getName();
+    SequenceI sq = av.getAlignment().getSequenceAt(seq);
+    if (sq==null)
+    {
+      return;
+    }
+    String id = sq.getName();
 
     String target = null;
     String url = null;
@@ -290,6 +296,7 @@ public class IdPanel extends Panel implements MouseListener,
     if ((e.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
     {
       Sequence sq = (Sequence) av.getAlignment().getSequenceAt(seq);
+      
       // build a new links menu based on the current links + any non-positional
       // features
       Vector nlinks = new Vector();
@@ -297,7 +304,7 @@ public class IdPanel extends Panel implements MouseListener,
       {
         nlinks.addElement(links.elementAt(l));
       }
-      SequenceFeature sf[] = sq.getSequenceFeatures();
+      SequenceFeature sf[] = sq==null ? null:sq.getSequenceFeatures();
       for (int sl = 0; sf != null && sl < sf.length; sl++)
       {
         if (sf[sl].begin == sf[sl].end && sf[sl].begin == 0)
@@ -363,7 +370,10 @@ public class IdPanel extends Panel implements MouseListener,
       end = tmp;
       lastid = end;
     }
-
+    if (av.getSelectionGroup() == null)
+    {
+      av.setSelectionGroup(new SequenceGroup());
+    }
     for (int i = start; i <= end; i++)
     {
       av.getSelectionGroup().addSequence(
@@ -386,6 +396,8 @@ public class IdPanel extends Panel implements MouseListener,
 
     mouseDragging = false;
     PaintRefresher.Refresh(this, av.getSequenceSetId());
+    // always send selection message when mouse is released
+    av.sendSelection();
   }
 
   public void highlightSearchResults(java.util.Vector found)