X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=0ebb0e84b7a6dc5340ca14787c1b71c03d3acdaa;hb=24fa71ff58eeef65619f56df7635a448e52a3ec8;hp=a6bff677d36fa51d235a279affdd7d356cf8afd4;hpb=d053a3c980cf4318b9a19a255f9fc870e74de989;p=jalview.git

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index a6bff67..0ebb0e8 100755
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -1,13 +1,13 @@
 /*
- * 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
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
  * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
@@ -19,6 +19,7 @@ package jalview.appletgui;
 
 import java.awt.*;
 import java.awt.event.*;
+import java.util.List;
 import java.util.Vector;
 
 import jalview.datamodel.*;
@@ -75,7 +76,7 @@ public class IdPanel extends Panel implements MouseListener,
     if (links.size() < 1)
     {
       links = new java.util.Vector();
-      links.addElement("SRS|http://srs.ebi.ac.uk/srsbin/cgi-bin/wgetz?-newId+(([uniprot-all:$SEQUENCE_ID$]))+-view+SwissEntry");
+      links.addElement("EMBL-EBI Search|http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$");
     }
   }
 
@@ -198,7 +199,7 @@ public class IdPanel extends Panel implements MouseListener,
     // DEFAULT LINK IS FIRST IN THE LINK LIST
     int seq = alignPanel.seqPanel.findSeq(e);
     SequenceI sq = av.getAlignment().getSequenceAt(seq);
-    if (sq==null)
+    if (sq == null)
     {
       return;
     }
@@ -296,7 +297,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();
@@ -304,7 +305,7 @@ public class IdPanel extends Panel implements MouseListener,
       {
         nlinks.addElement(links.elementAt(l));
       }
-      SequenceFeature sf[] = sq==null ? null: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)
@@ -350,7 +351,7 @@ public class IdPanel extends Panel implements MouseListener,
   {
     lastid = seq;
     SequenceI pickedSeq = av.getAlignment().getSequenceAt(seq);
-    av.getSelectionGroup().addOrRemove(pickedSeq, false);
+    av.getSelectionGroup().addOrRemove(pickedSeq, true);
   }
 
   void selectSeqs(int start, int end)
@@ -377,7 +378,7 @@ public class IdPanel extends Panel implements MouseListener,
     for (int i = start; i <= end; i++)
     {
       av.getSelectionGroup().addSequence(
-              av.getAlignment().getSequenceAt(i), false);
+              av.getAlignment().getSequenceAt(i), i == end);
     }
 
   }
@@ -400,16 +401,16 @@ public class IdPanel extends Panel implements MouseListener,
     av.sendSelection();
   }
 
-  public void highlightSearchResults(java.util.Vector found)
+  public void highlightSearchResults(List<SequenceI> list)
   {
-    idCanvas.setHighlighted(found);
+    idCanvas.setHighlighted(list);
 
-    if (found == null)
+    if (list == null)
     {
       return;
     }
 
-    int index = av.getAlignment().findIndex((SequenceI) found.elementAt(0));
+    int index = av.getAlignment().findIndex(list.get(0));
 
     // do we need to scroll the panel?
     if (av.getStartSeq() > index || av.getEndSeq() < index)