header updated

[jalview.git] / src / jalview / gui / SeqPanel.java

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index d47d89d..b1895ef 100755 (executable)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 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
@@ -1033,8 +1033,6 @@ public class SeqPanel extends JPanel implements MouseListener,
 \r
       if (blankColumn <= j)\r
       {\r
-        System.out.println("END HERE "+seq.getName()+" "+seq.getLength()+" "+j+" "\r
-            +blankColumn+" "+fixedColumn);\r
         blankColumn = fixedColumn;\r
         endEditing();\r
         return;\r
@@ -1245,14 +1243,6 @@ public class SeqPanel extends JPanel implements MouseListener,
 \r
         }\r
 \r
-        if (av.cursorMode)\r
-        {\r
-          seqCanvas.cursorX = findRes(evt);\r
-          seqCanvas.cursorY = findSeq(evt);\r
-          seqCanvas.repaint();\r
-          return;\r
-        }\r
-\r
 \r
         if (javax.swing.SwingUtilities.isRightMouseButton(evt))\r
         {\r
@@ -1273,9 +1263,18 @@ public class SeqPanel extends JPanel implements MouseListener,
 \r
             jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null, links);\r
             pop.show(this, evt.getX(), evt.getY());\r
+            return;\r
+        }\r
 \r
+        if (av.cursorMode)\r
+        {\r
+          seqCanvas.cursorX = findRes(evt);\r
+          seqCanvas.cursorY = findSeq(evt);\r
+          seqCanvas.repaint();\r
+          return;\r
         }\r
-        else if (stretchGroup == null)\r
+\r
+        if (stretchGroup == null)\r
         {\r
           //Only if left mouse button do we want to change group sizes\r
 \r