Switch to new srs url

[jalview.git] / src / jalview / appletgui / IdPanel.java

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index b6e6a2b..ed86488 100755 (executable)
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -65,12 +65,46 @@ public class IdPanel
     if (links.size() < 1)\r
     {\r
       links = new java.util.Vector();\r
-      links.addElement("SRS|http://srs.ebi.ac.uk/srs7bin/cgi-bin/wgetz?-e+[uniprot-all:$SEQUENCE_ID$]+-vn+2");\r
+      links.addElement("SRS|http://srs.ebi.ac.uk/srsbin/cgi-bin/wgetz?-newId+(([uniprot-all:$SEQUENCE_ID$]))+-view+SwissEntry");\r
     }\r
   }\r
 \r
+  Tooltip tooltip;\r
   public void mouseMoved(MouseEvent e)\r
-  {}\r
+  {\r
+    int y = e.getY();\r
+    if (av.getWrapAlignment())\r
+    {\r
+      y -= 2 * av.charHeight;\r
+    }\r
+\r
+    int seq = av.getIndex(y);\r
+    if (seq == -1)\r
+    {\r
+      return;\r
+    }\r
+\r
+    SequenceI sequence = av.getAlignment().getSequenceAt(seq);\r
+\r
+    if(sequence.getDescription()==null)\r
+    {\r
+      if(tooltip!=null)\r
+        tooltip.setVisible(false);\r
+      tooltip = null;\r
+      return;\r
+    }\r
+\r
+    if (tooltip == null)\r
+      tooltip = new Tooltip(\r
+          sequence.getDisplayId(true)\r
+          + "\n" + sequence.getDescription(), idCanvas);\r
+    else\r
+      tooltip.setTip(sequence.getDisplayId(true)\r
+                     + "\n" + sequence.getDescription());\r
+\r
+    tooltip.repaint();\r
+\r
+  }\r
 \r
   public void mouseDragged(MouseEvent e)\r
   {\r
@@ -116,6 +150,8 @@ public class IdPanel
     //DEFAULT LINK IS FIRST IN THE LINK LIST\r
     int seq = av.getIndex(y);\r
     String id = av.getAlignment().getSequenceAt(seq).getName();\r
+    if (id.indexOf("|") > -1)\r
+        id = id.substring(id.lastIndexOf("|") + 1);\r
 \r
     String target = links.elementAt(0).toString();\r
     target = target.substring(0, target.indexOf("|"));\r
@@ -127,7 +163,8 @@ public class IdPanel
 \r
     try\r
     {\r
-      jalview.bin.JalviewLite.showURL(url, target);\r
+\r
+      alignPanel.alignFrame.showURL(url, target);\r
     }\r
     catch (Exception ex)\r
     {\r
@@ -190,31 +227,15 @@ public class IdPanel
       return;\r
     }\r
 \r
-    if (!e.isControlDown() && !e.isShiftDown() &&\r
-        av.alignment.findGroup(av.alignment.getSequenceAt(seq)) != null)\r
-    {\r
-\r
-      SequenceGroup selection = new SequenceGroup();\r
-      SequenceGroup sg = av.alignment.findGroup(av.alignment.getSequenceAt(seq));\r
-      selection.setStartRes(0);\r
-      selection.setEndRes(av.alignment.getWidth() - 1);\r
-      for (int i = 0; i < sg.getSize(); i++)\r
-      {\r
-        selection.addSequence(sg.getSequenceAt(i), true);\r
-      }\r
-\r
-      av.setSelectionGroup(selection);\r
-      return;\r
-    }\r
 \r
-    if (av.getSelectionGroup() == null ||\r
-        (!e.isControlDown() && av.getSelectionGroup() != null))\r
+    if ((av.getSelectionGroup() == null) ||\r
+            ((!e.isControlDown() && !e.isShiftDown()) && av.getSelectionGroup() != null))\r
     {\r
       av.setSelectionGroup(new SequenceGroup());\r
+      av.getSelectionGroup().setStartRes(0);\r
+      av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);\r
     }\r
 \r
-    av.getSelectionGroup().setStartRes(0);\r
-    av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);\r
 \r
     if (e.isShiftDown() && lastid != -1)\r
     {\r