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

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index 1a61429..c510803 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) 2007 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,77 +50,62 @@ 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);
+        }
 
       }
     }
     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);
 
-    if(sequence.getDescription()==null)
+    if (sequence.getDescription() == null)
     {
-      if(tooltip!=null)
+      if (tooltip != null)
+      {
         tooltip.setVisible(false);
+      }
       tooltip = null;
       return;
     }
 
     if (tooltip == null)
+    {
       tooltip = new Tooltip(
           sequence.getDisplayId(true)
           + "\n" + sequence.getDescription(), idCanvas);
+    }
     else
+    {
       tooltip.setTip(sequence.getDisplayId(true)
                      + "\n" + sequence.getDescription());
-
-    tooltip.repaint();
-
+    }
   }
 
   public void mouseDragged(MouseEvent e)
   {
     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)
     {
@@ -132,34 +117,31 @@ public class IdPanel
     }
 
     lastid = seq;
-    alignPanel.repaint();
+    alignPanel.paintAlignment(false);
   }
 
   public void mouseClicked(MouseEvent e)
   {
     if (e.getClickCount() < 2)
-        return;
-
-    int y = e.getY();
-
-    if (av.getWrapAlignment())
     {
-      y -= (2 * av.charHeight);
+      return;
     }
 
     //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);
+    {
+      id = id.substring(id.lastIndexOf("|") + 1);
+    }
 
     String target = links.elementAt(0).toString();
     target = target.substring(0, target.indexOf("|"));
     String url = links.elementAt(0).toString();
-    url = url.substring(url.indexOf("|")+1);
+    url = url.substring(url.indexOf("|") + 1);
 
     int index = url.indexOf("$SEQUENCE_ID$");
-    url = url.substring(0, index)+ id + url.substring(index+13);
+    url = url.substring(0, index) + id + url.substring(index + 13);
 
     try
     {
@@ -201,7 +183,7 @@ public class IdPanel
 
   public void mousePressed(MouseEvent e)
   {
-    if (e.getClickCount() >1 )
+    if (e.getClickCount() > 1)
     {
       return;
     }
@@ -212,31 +194,27 @@ 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)
     {
-      APopupMenu popup = new APopupMenu(alignPanel, (Sequence) av.getAlignment().getSequenceAt(seq), links);
+      APopupMenu popup = new APopupMenu(alignPanel,
+                                        (Sequence) av.getAlignment().
+                                        getSequenceAt(seq), links);
       this.add(popup);
       popup.show(this, e.getX(), e.getY());
       return;
     }
 
-
-    if ((av.getSelectionGroup() == null) ||
-            ((!e.isControlDown() && !e.isShiftDown()) && av.getSelectionGroup() != null))
+    if ( (av.getSelectionGroup() == null) ||
+        ( (!e.isControlDown() && !e.isShiftDown()) && av.getSelectionGroup() != null))
     {
       av.setSelectionGroup(new SequenceGroup());
       av.getSelectionGroup().setStartRes(0);
       av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);
     }
 
-
     if (e.isShiftDown() && lastid != -1)
     {
       selectSeqs(lastid, seq);
@@ -246,7 +224,7 @@ public class IdPanel
       selectSeq(seq);
     }
 
-    alignPanel.repaint();
+    alignPanel.paintAlignment(false);
   }
 
   void selectSeq(int seq)
@@ -260,6 +238,12 @@ public class IdPanel
   {
 
     lastid = start;
+
+    if (end >= av.getAlignment().getHeight())
+    {
+      end = av.getAlignment().getHeight() - 1;
+    }
+
     if (end < start)
     {
       int tmp = start;
@@ -282,11 +266,13 @@ public class IdPanel
       scrollThread.running = false;
     }
 
-    if(av.getSelectionGroup()!=null)
+    if (av.getSelectionGroup() != null)
+    {
       av.getSelectionGroup().recalcConservation();
+    }
 
     mouseDragging = false;
-    PaintRefresher.Refresh(this, av.alignment);
+    PaintRefresher.Refresh(this, av.getSequenceSetId());
   }
 
   public void highlightSearchResults(java.util.Vector found)
@@ -342,7 +328,7 @@ public class IdPanel
           {
             selectSeqs(lastid - 1, seq);
           }
-          else if (seq > lastid)
+          else if (seq > lastid && seq < av.alignment.getHeight())
           {
             selectSeqs(lastid + 1, seq);
           }
@@ -354,7 +340,7 @@ public class IdPanel
           running = false;
         }
 
-        alignPanel.repaint();
+        alignPanel.paintAlignment(true);
         try
         {
           Thread.sleep(100);