header updated

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

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 93bca05..5e2f243 100755 (executable)
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/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
@@ -1141,15 +1141,6 @@ public class SeqPanel
       av.setSelectionGroup(stretchGroup);\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
 \r
     // DETECT RIGHT MOUSE BUTTON IN AWT\r
     if ( (evt.getModifiers() & InputEvent.BUTTON3_MASK) ==\r
@@ -1178,9 +1169,17 @@ public class SeqPanel
       this.add(popup);\r
       popup.show(this, evt.getX(), evt.getY());\r
       ap.repaint();\r
+      return;\r
     }\r
-    else\r
+\r
+    if (av.cursorMode)\r
     {\r
+      seqCanvas.cursorX = findRes(evt);\r
+      seqCanvas.cursorY = findSeq(evt);\r
+      seqCanvas.repaint();\r
+      return;\r
+    }\r
+\r
       //Only if left mouse button do we want to change group sizes\r
 \r
       if (stretchGroup == null)\r
@@ -1205,19 +1204,6 @@ public class SeqPanel
         }\r
 \r
       }\r
-\r
-      if (stretchGroup != null && stretchGroup.getEndRes() == res)\r
-      {\r
-        // Edit end res position of selected group\r
-        changeEndRes = true;\r
-      }\r
-\r
-      else if (stretchGroup != null && stretchGroup.getStartRes() == res)\r
-      {\r
-        // Edit end res position of selected group\r
-        changeStartRes = true;\r
-      }\r
-    }\r
   }\r
 \r
   public void doMouseReleasedDefineMode(MouseEvent evt)\r