Formatting

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

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index 26daf21..2acfa39 100755 (executable)
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -50,7 +50,7 @@ public class IdPanel
     idCanvas.addMouseMotionListener(this);\r
 \r
     String label, url;\r
-    if(av.applet!=null)\r
+    if (av.applet != null)\r
     {\r
       for (int i = 1; i < 10; i++)\r
       {\r
@@ -58,7 +58,9 @@ public class IdPanel
         url = av.applet.getParameter("linkURL_" + i);\r
 \r
         if (label != null && url != null)\r
+        {\r
           links.addElement(label + "|" + url);\r
+        }\r
 \r
       }\r
     }\r
@@ -76,21 +78,27 @@ public class IdPanel
 \r
     SequenceI sequence = av.getAlignment().getSequenceAt(seq);\r
 \r
-    if(sequence.getDescription()==null)\r
+    if (sequence.getDescription() == null)\r
     {\r
-      if(tooltip!=null)\r
+      if (tooltip != null)\r
+      {\r
         tooltip.setVisible(false);\r
+      }\r
       tooltip = null;\r
       return;\r
     }\r
 \r
     if (tooltip == null)\r
+    {\r
       tooltip = new Tooltip(\r
           sequence.getDisplayId(true)\r
           + "\n" + sequence.getDescription(), idCanvas);\r
+    }\r
     else\r
+    {\r
       tooltip.setTip(sequence.getDisplayId(true)\r
                      + "\n" + sequence.getDescription());\r
+    }\r
   }\r
 \r
   public void mouseDragged(MouseEvent e)\r
@@ -115,22 +123,25 @@ public class IdPanel
   public void mouseClicked(MouseEvent e)\r
   {\r
     if (e.getClickCount() < 2)\r
-        return;\r
-\r
+    {\r
+      return;\r
+    }\r
 \r
     //DEFAULT LINK IS FIRST IN THE LINK LIST\r
     int seq = alignPanel.seqPanel.findSeq(e);\r
     String id = av.getAlignment().getSequenceAt(seq).getName();\r
     if (id.indexOf("|") > -1)\r
-        id = id.substring(id.lastIndexOf("|") + 1);\r
+    {\r
+      id = id.substring(id.lastIndexOf("|") + 1);\r
+    }\r
 \r
     String target = links.elementAt(0).toString();\r
     target = target.substring(0, target.indexOf("|"));\r
     String url = links.elementAt(0).toString();\r
-    url = url.substring(url.indexOf("|")+1);\r
+    url = url.substring(url.indexOf("|") + 1);\r
 \r
     int index = url.indexOf("$SEQUENCE_ID$");\r
-    url = url.substring(0, index)+ id + url.substring(index+13);\r
+    url = url.substring(0, index) + id + url.substring(index + 13);\r
 \r
     try\r
     {\r
@@ -172,7 +183,7 @@ public class IdPanel
 \r
   public void mousePressed(MouseEvent e)\r
   {\r
-    if (e.getClickCount() >1 )\r
+    if (e.getClickCount() > 1)\r
     {\r
       return;\r
     }\r
@@ -188,22 +199,22 @@ public class IdPanel
     if ( (e.getModifiers() & InputEvent.BUTTON3_MASK) ==\r
         InputEvent.BUTTON3_MASK)\r
     {\r
-      APopupMenu popup = new APopupMenu(alignPanel, (Sequence) av.getAlignment().getSequenceAt(seq), links);\r
+      APopupMenu popup = new APopupMenu(alignPanel,\r
+                                        (Sequence) av.getAlignment().\r
+                                        getSequenceAt(seq), links);\r
       this.add(popup);\r
       popup.show(this, e.getX(), e.getY());\r
       return;\r
     }\r
 \r
-\r
-    if ((av.getSelectionGroup() == null) ||\r
-            ((!e.isControlDown() && !e.isShiftDown()) && 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
-\r
     if (e.isShiftDown() && lastid != -1)\r
     {\r
       selectSeqs(lastid, seq);\r
@@ -255,8 +266,10 @@ public class IdPanel
       scrollThread.running = false;\r
     }\r
 \r
-    if(av.getSelectionGroup()!=null)\r
+    if (av.getSelectionGroup() != null)\r
+    {\r
       av.getSelectionGroup().recalcConservation();\r
+    }\r
 \r
     mouseDragging = false;\r
     PaintRefresher.Refresh(this, av.getSequenceSetId());\r
@@ -315,12 +328,11 @@ public class IdPanel
           {\r
             selectSeqs(lastid - 1, seq);\r
           }\r
-          else if (seq > lastid && seq<av.alignment.getHeight())\r
+          else if (seq > lastid && seq < av.alignment.getHeight())\r
           {\r
             selectSeqs(lastid + 1, seq);\r
           }\r
 \r
-\r
           lastid = seq;\r
         }\r
         else\r