X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FIdPanel.java;h=27cbce14a5026ae571dd6256c086f31109e897ec;hb=61505ac1511435b067e647f5c7c9050e5c1eef41;hp=d5489366affa492ff955a180283543b05f18d63b;hpb=6e71f42b0a3713ddbc3054e7ea9d8f5088130ec9;p=jalview.git

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index d548936..27cbce1 100755
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -37,6 +37,7 @@ public class IdPanel
   int width;
   int lastid = -1;
   boolean mouseDragging = false;
+  java.util.Vector links = new java.util.Vector();
 
   public IdPanel(AlignViewport av, AlignmentPanel parent)
   {
@@ -47,27 +48,60 @@ public class IdPanel
     add(idCanvas, BorderLayout.CENTER);
     idCanvas.addMouseListener(this);
     idCanvas.addMouseMotionListener(this);
-  }
 
-  public void mouseMoved(MouseEvent e)
-  {}
+    String label, url;
+    if(av.applet!=null)
+    {
+      for (int i = 1; i < 10; i++)
+      {
+        label = av.applet.getParameter("linkLabel_" + i);
+        url = av.applet.getParameter("linkURL_" + i);
 
-  public void mouseDragged(MouseEvent e)
-  {
-    mouseDragging = true;
+        if (label != null && url != null)
+          links.addElement(label + "|" + url);
 
-    int y = e.getY();
-    if (av.getWrapAlignment())
+      }
+    }
+    if (links.size() < 1)
     {
-      y -= 2 * av.charHeight;
+      links = new java.util.Vector();
+      links.addElement("SRS|http://srs.ebi.ac.uk/srsbin/cgi-bin/wgetz?-newId+(([uniprot-all:$SEQUENCE_ID$]))+-view+SwissEntry");
     }
-    int seq = av.getIndex(y);
+  }
 
-    if (seq < 0)
+  Tooltip tooltip;
+  public void mouseMoved(MouseEvent e)
+  {
+    int seq = alignPanel.seqPanel.findSeq(e);
+
+    SequenceI sequence = av.getAlignment().getSequenceAt(seq);
+
+    if(sequence.getDescription()==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 seq = Math.max(0, alignPanel.seqPanel.findSeq(e));
+
     if (seq < lastid)
     {
       selectSeqs(lastid - 1, seq);
@@ -83,29 +117,33 @@ public class IdPanel
 
   public void mouseClicked(MouseEvent e)
   {
-    if (e.getClickCount() == 2)
-    {
-      int y = e.getY();
-      if (av.getWrapAlignment())
-      {
-        y -= 2 * av.charHeight;
-      }
+    if (e.getClickCount() < 2)
+        return;
 
-      int seq = av.getIndex(y);
-      String id = av.getAlignment().getSequenceAt(seq).getName();
 
-      try
-      {
-        jalview.bin.JalviewLite.showURL(
-            "http://srs.ebi.ac.uk/srs7bin/cgi-bin/wgetz?-e+[swall-id:" + id +
-            "]+-vn+2");
-      }
-      catch (Exception ex)
-      {
-        ex.printStackTrace();
-      }
-    }
+    //DEFAULT LINK IS FIRST IN THE LINK LIST
+    int seq = alignPanel.seqPanel.findSeq(e);
+    String id = av.getAlignment().getSequenceAt(seq).getName();
+    if (id.indexOf("|") > -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);
+
+    int index = url.indexOf("$SEQUENCE_ID$");
+    url = url.substring(0, index)+ id + url.substring(index+13);
 
+    try
+    {
+
+      alignPanel.alignFrame.showURL(url, target);
+    }
+    catch (Exception ex)
+    {
+      ex.printStackTrace();
+    }
   }
 
   public void mouseEntered(MouseEvent e)
@@ -137,7 +175,7 @@ public class IdPanel
 
   public void mousePressed(MouseEvent e)
   {
-    if (e.getClickCount() == 2)
+    if (e.getClickCount() >1 )
     {
       return;
     }
@@ -148,46 +186,26 @@ 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, null);
+      APopupMenu popup = new APopupMenu(alignPanel, (Sequence) av.getAlignment().getSequenceAt(seq), links);
       this.add(popup);
       popup.show(this, e.getX(), e.getY());
       return;
     }
 
-    if (!e.isControlDown() && !e.isShiftDown() &&
-        av.alignment.findGroup(av.alignment.getSequenceAt(seq)) != null)
-    {
 
-      SequenceGroup selection = new SequenceGroup();
-      SequenceGroup sg = av.alignment.findGroup(av.alignment.getSequenceAt(seq));
-      selection.setStartRes(0);
-      selection.setEndRes(av.alignment.getWidth() - 1);
-      for (int i = 0; i < sg.getSize(); i++)
-      {
-        selection.addSequence(sg.getSequenceAt(i), true);
-      }
-
-      av.setSelectionGroup(selection);
-      return;
-    }
-
-    if (av.getSelectionGroup() == null ||
-        (!e.isControlDown() && 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);
     }
 
-    av.getSelectionGroup().setStartRes(0);
-    av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);
 
     if (e.isShiftDown() && lastid != -1)
     {
@@ -294,11 +312,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