X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=f6e7d44ca6bdca5f56b7efa1ad754995628e3aca;hb=14ead5d8009f9ac9a139ae93faf44e67a3998d46;hp=1a61429c0fe36469b6faa58a2590cb74f28d009d;hpb=f441357783f32298b738d32d5c87000ac0e33768;p=jalview.git

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index 1a61429..f6e7d44 100755
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -50,12 +50,12 @@ public class IdPanel
     idCanvas.addMouseMotionListener(this);
 
     String label, url;
-    if(parent.alignFrame.applet!=null)
+    if(av.applet!=null)
     {
       for (int i = 1; i < 10; i++)
       {
-        label = parent.alignFrame.applet.getParameter("linkLabel_" + i);
-        url = parent.alignFrame.applet.getParameter("linkURL_" + i);
+        label = av.applet.getParameter("linkLabel_" + i);
+        url = av.applet.getParameter("linkURL_" + i);
 
         if (label != null && url != null)
           links.addElement(label + "|" + url);
@@ -65,24 +65,14 @@ public class IdPanel
     if (links.size() < 1)
     {
       links = new java.util.Vector();
-      links.addElement("SRS|http://srs.ebi.ac.uk/srs7bin/cgi-bin/wgetz?-e+[uniprot-all:$SEQUENCE_ID$]+-vn+2");
+      links.addElement("SRS|http://srs.ebi.ac.uk/srsbin/cgi-bin/wgetz?-newId+(([uniprot-all:$SEQUENCE_ID$]))+-view+SwissEntry");
     }
   }
 
   Tooltip tooltip;
   public void mouseMoved(MouseEvent e)
   {
-    int y = e.getY();
-    if (av.getWrapAlignment())
-    {
-      y -= 2 * av.charHeight;
-    }
-
-    int seq = av.getIndex(y);
-    if (seq == -1)
-    {
-      return;
-    }
+    int seq = alignPanel.seqPanel.findSeq(e);
 
     SequenceI sequence = av.getAlignment().getSequenceAt(seq);
 
@@ -110,17 +100,7 @@ public class IdPanel
   {
     mouseDragging = true;
 
-    int y = e.getY();
-    if (av.getWrapAlignment())
-    {
-      y -= 2 * av.charHeight;
-    }
-    int seq = av.getIndex(y);
-
-    if (seq < 0)
-    {
-      return;
-    }
+    int seq = Math.max(0, alignPanel.seqPanel.findSeq(e));
 
     if (seq < lastid)
     {
@@ -140,15 +120,9 @@ public class IdPanel
     if (e.getClickCount() < 2)
         return;
 
-    int y = e.getY();
-
-    if (av.getWrapAlignment())
-    {
-      y -= (2 * av.charHeight);
-    }
 
     //DEFAULT LINK IS FIRST IN THE LINK LIST
-    int seq = av.getIndex(y);
+    int seq = alignPanel.seqPanel.findSeq(e);
     String id = av.getAlignment().getSequenceAt(seq).getName();
     if (id.indexOf("|") > -1)
         id = id.substring(id.lastIndexOf("|") + 1);
@@ -212,11 +186,7 @@ public class IdPanel
       y -= 2 * av.charHeight;
     }
 
-    int seq = av.getIndex(y);
-    if (seq == -1)
-    {
-      return;
-    }
+    int seq = alignPanel.seqPanel.findSeq(e);
 
     if ( (e.getModifiers() & InputEvent.BUTTON3_MASK) ==
         InputEvent.BUTTON3_MASK)
@@ -260,6 +230,12 @@ public class IdPanel
   {
 
     lastid = start;
+
+    if (end >= av.getAlignment().getHeight())
+    {
+      end = av.getAlignment().getHeight() - 1;
+    }
+
     if (end < start)
     {
       int tmp = start;
@@ -342,11 +318,12 @@ public class IdPanel
           {
             selectSeqs(lastid - 1, seq);
           }
-          else if (seq > lastid)
+          else if (seq > lastid && seq<av.alignment.getHeight())
           {
             selectSeqs(lastid + 1, seq);
           }
 
+
           lastid = seq;
         }
         else