After merge
[jalview.git] / src / jalview / gui / SeqPanel.java
index f827fba..3209960 100755 (executable)
  */\r
 package jalview.gui;\r
 \r
-import java.util.*;\r
+import jalview.datamodel.*;\r
+\r
+import jalview.schemes.*;\r
 \r
 import java.awt.*;\r
 import java.awt.event.*;\r
-import javax.swing.*;\r
 \r
-import jalview.analysis.*;\r
-import jalview.datamodel.*;\r
-import jalview.schemes.*;\r
-\r
-public class SeqPanel\r
-    extends JPanel\r
-{\r
-  public SeqCanvas seqCanvas;\r
-  public AlignmentPanel ap;\r
-  protected int lastres;\r
-  protected int startseq;\r
-  int startEdit = -1;\r
-  int endEdit = -1;\r
-  protected AlignViewport av;\r
-\r
-  // if character is inserted or deleted, we will need to recalculate the conservation\r
-  int seqEditOccurred = -1;\r
-  ScrollThread scrollThread = null;\r
-  boolean mouseDragging = false;\r
-  boolean editingSeqs = false;\r
-  boolean groupEditing = false;\r
-\r
-  //////////////////////////////////////////\r
-  /////Everything below this is for defining the boundary of the rubberband\r
-  //////////////////////////////////////////\r
-  int oldSeq = -1;\r
-  boolean changeEndSeq = false;\r
-  boolean changeStartSeq = false;\r
-  boolean changeEndRes = false;\r
-  boolean changeStartRes = false;\r
-  SequenceGroup stretchGroup = null;\r
-  boolean remove = false;\r
-\r
-  public SeqPanel(AlignViewport avp, AlignmentPanel p)\r
-  {\r
-    ToolTipManager.sharedInstance().registerComponent(this);\r
-    ToolTipManager.sharedInstance().setInitialDelay(0);\r
-    ToolTipManager.sharedInstance().setDismissDelay(10000);\r
-    this.av = avp;\r
-    setBackground(Color.white);\r
-\r
-    seqCanvas = new SeqCanvas(avp);\r
-    setLayout(new BorderLayout());\r
-    add(seqCanvas, BorderLayout.CENTER);\r
-\r
-    ap = p;\r
-\r
-    addMouseMotionListener(new MouseMotionAdapter()\r
-    {\r
-      public void mouseMoved(MouseEvent evt)\r
-      {\r
-        if (av.getWrapAlignment())\r
-        {\r
-          return;\r
-        }\r
+import java.util.*;\r
 \r
-        doMouseMoved(evt);\r
-      }\r
+import javax.swing.*;\r
 \r
-      public void mouseDragged(MouseEvent evt)\r
-      {\r
-        if (av.getWrapAlignment())\r
-        {\r
-          return;\r
-        }\r
 \r
-        if (editingSeqs)\r
-        {\r
-          doMouseDragged(evt);\r
-        }\r
-        else\r
-        {\r
-          doMouseDraggedDefineMode(evt);\r
-        }\r
-      }\r
-    });\r
+/**\r
+ * DOCUMENT ME!\r
+ *\r
+ * @author $author$\r
+ * @version $Revision$\r
+ */\r
+public class SeqPanel extends JPanel\r
+{\r
+    /** DOCUMENT ME!! */\r
+    public SeqCanvas seqCanvas;\r
+\r
+    /** DOCUMENT ME!! */\r
+    public AlignmentPanel ap;\r
+    protected int lastres;\r
+    protected int startseq;\r
+    int startEdit = -1;\r
+    int endEdit = -1;\r
+    protected AlignViewport av;\r
+\r
+    // if character is inserted or deleted, we will need to recalculate the conservation\r
+    int seqEditOccurred = -1;\r
+    ScrollThread scrollThread = null;\r
+    boolean mouseDragging = false;\r
+    boolean editingSeqs = false;\r
+    boolean groupEditing = false;\r
+\r
+    //////////////////////////////////////////\r
+    /////Everything below this is for defining the boundary of the rubberband\r
+    //////////////////////////////////////////\r
+    int oldSeq = -1;\r
+    boolean changeEndSeq = false;\r
+    boolean changeStartSeq = false;\r
+    boolean changeEndRes = false;\r
+    boolean changeStartRes = false;\r
+    SequenceGroup stretchGroup = null;\r
+    boolean remove = false;\r
+\r
+    boolean mouseWheelPressed = false;\r
+\r
+    /**\r
+     * Creates a new SeqPanel object.\r
+     *\r
+     * @param avp DOCUMENT ME!\r
+     * @param p DOCUMENT ME!\r
+     */\r
+    public SeqPanel(AlignViewport avp, AlignmentPanel p)\r
+    {\r
+        ToolTipManager.sharedInstance().registerComponent(this);\r
+        ToolTipManager.sharedInstance().setInitialDelay(0);\r
+        ToolTipManager.sharedInstance().setDismissDelay(10000);\r
+        this.av = avp;\r
+        setBackground(Color.white);\r
+\r
+        seqCanvas = new SeqCanvas(avp);\r
+        setLayout(new BorderLayout());\r
+        add(seqCanvas, BorderLayout.CENTER);\r
+\r
+        ap = p;\r
+\r
+\r
+        addMouseMotionListener(new MouseMotionAdapter()\r
+            {\r
+                public void mouseMoved(MouseEvent evt)\r
+                {\r
+                    doMouseMoved(evt);\r
+                    if (editingSeqs)\r
+                    {\r
+                      // This is because MacOSX creates a mouseMoved\r
+                      // If control is down\r
+                      if(!av.isDataset())\r
+                        doMouseDragged(evt);\r
+                    }\r
+                }\r
+\r
+                public void mouseDragged(MouseEvent evt)\r
+                {\r
+                    if (editingSeqs)\r
+                    {\r
+                      if(!av.isDataset())\r
+                        doMouseDragged(evt);\r
+                    }\r
+                    else\r
+                    {\r
+                      if(!av.isDataset())\r
+                        doMouseDraggedDefineMode(evt);\r
+                    }\r
+                }\r
+            });\r
+\r
+       addMouseWheelListener(new MouseWheelListener()\r
+       {\r
+         public void mouseWheelMoved(MouseWheelEvent e)\r
+         {\r
+\r
+           if (mouseWheelPressed)\r
+           {\r
+             Font font = av.getFont();\r
+             int fontSize = font.getSize();\r
+             if (e.getWheelRotation() > 0 && fontSize < 51)\r
+               fontSize++;\r
+             else if (fontSize > 1)\r
+               fontSize--;\r
+\r
+             av.setFont(new Font(font.getName(), font.getStyle(), fontSize));\r
+             ap.fontChanged();\r
+           }\r
+           else\r
+           {\r
+             if (e.getWheelRotation() > 0)\r
+               ap.scrollUp(false);\r
+             else\r
+               ap.scrollUp(true);\r
+           }\r
+\r
+         }\r
+       });\r
+\r
+\r
+       if(!av.isDataset())\r
+       {\r
+         addMouseListener(new MouseAdapter()\r
+         {\r
+           public void mouseReleased(MouseEvent evt)\r
+           {\r
+             mouseWheelPressed = false;\r
+\r
+             if (editingSeqs)\r
+             {\r
+               doMouseReleased(evt);\r
+             }\r
+             else\r
+             {\r
+               doMouseReleasedDefineMode(evt);\r
+             }\r
+           }\r
+\r
+           public void mousePressed(MouseEvent evt)\r
+           {\r
+             if (javax.swing.SwingUtilities.isMiddleMouseButton(evt))\r
+             {\r
+               mouseWheelPressed = true;\r
+               return;\r
+             }\r
+\r
+             if (evt.isShiftDown() || evt.isAltDown() ||\r
+                 evt.isControlDown())\r
+             {\r
+               if (evt.isAltDown() || evt.isControlDown())\r
+               {\r
+                 groupEditing = true;\r
+\r
+               }\r
+\r
+               editingSeqs = true;\r
+               doMousePressed(evt);\r
+             }\r
+             else\r
+             {\r
+               doMousePressedDefineMode(evt);\r
+             }\r
+           }\r
+\r
+           public void mouseExited(MouseEvent evt)\r
+           {\r
+             if (editingSeqs)\r
+             {\r
+               return;\r
+             }\r
+\r
+             doMouseExitedDefineMode(evt);\r
+           }\r
+\r
+           public void mouseEntered(MouseEvent evt)\r
+           {\r
+             if (editingSeqs)\r
+             {\r
+               return;\r
+             }\r
+\r
+             doMouseEnteredDefineMode(evt);\r
+           }\r
+         });\r
+       }\r
+    }\r
+\r
+    int startWrapBlock=-1;\r
+    int wrappedBlock=-1;\r
+    int findRes(MouseEvent evt)\r
+   {\r
+     int res = 0;\r
+     int x = evt.getX();\r
 \r
-    addMouseListener(new MouseAdapter()\r
+    if (av.wrapAlignment)\r
     {\r
-      public void mouseReleased(MouseEvent evt)\r
-      {\r
-        if (av.getWrapAlignment())\r
-        {\r
-          return;\r
-        }\r
 \r
-        if (editingSeqs)\r
-        {\r
-          doMouseReleased(evt);\r
-        }\r
-        else\r
-        {\r
-          doMouseReleasedDefineMode(evt);\r
-        }\r
-      }\r
+      int hgap = av.charHeight;\r
+      if (av.scaleAboveWrapped)\r
+        hgap += av.charHeight;\r
 \r
-      public void mousePressed(MouseEvent evt)\r
-      {\r
-        if (av.getWrapAlignment())\r
-        {\r
-          return;\r
-        }\r
-\r
-        if (evt.isShiftDown() || evt.isAltDown() ||\r
-            evt.isControlDown())\r
-        {\r
-          if (evt.isAltDown() || evt.isControlDown())\r
-          {\r
-            groupEditing = true;\r
-          }\r
-\r
-          editingSeqs = true;\r
-          doMousePressed(evt);\r
-        }\r
-        else\r
-        {\r
-          doMousePressedDefineMode(evt);\r
-        }\r
-      }\r
+      int cHeight = av.getAlignment().getHeight() * av.charHeight\r
+          + hgap + seqCanvas.getAnnotationHeight();\r
 \r
-      public void mouseExited(MouseEvent evt)\r
-      {\r
-        if (av.getWrapAlignment() || editingSeqs)\r
-        {\r
-          return;\r
-        }\r
+        int y = evt.getY();\r
+        y -= hgap;\r
+        x -= seqCanvas.LABEL_WEST;\r
 \r
-        doMouseExitedDefineMode(evt);\r
-      }\r
 \r
-      public void mouseEntered(MouseEvent evt)\r
-      {\r
-        if (av.getWrapAlignment() || editingSeqs)\r
-        {\r
-          return;\r
-        }\r
+        int cwidth = seqCanvas.getWrappedCanvasWidth(this.getWidth());\r
 \r
-        doMouseEnteredDefineMode(evt);\r
-      }\r
-    });\r
-  }\r
+        wrappedBlock = y / cHeight;\r
+        wrappedBlock += av.getStartRes() / cwidth;\r
 \r
+        res = wrappedBlock * cwidth + x / av.getCharWidth();\r
 \r
-  public void doMouseReleased(MouseEvent evt)\r
-  {\r
-    if (seqEditOccurred > -1)\r
-    {\r
-      editOccurred(seqEditOccurred);\r
-    }\r
-\r
-    startseq = -1;\r
-    lastres = -1;\r
-    seqEditOccurred = -1;\r
-    editingSeqs = false;\r
-    groupEditing = false;\r
-\r
-    ap.repaint();\r
-  }\r
-\r
-  public void doMousePressed(MouseEvent evt)\r
-  {\r
-    ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",\r
-                                                 av.alignment, HistoryItem.EDIT));\r
-\r
-    int seq;\r
-    int res;\r
-\r
-    int x = evt.getX();\r
-    int y = evt.getY();\r
-\r
-    res = (x / av.getCharWidth()) + av.getStartRes();\r
-    seq = (y / av.getCharHeight()) + av.getStartSeq();\r
-\r
-    if ( (seq < av.getAlignment().getHeight()) &&\r
-        (res < av.getAlignment().getSequenceAt(seq).getLength()))\r
-    {\r
-      startseq = seq;\r
-      lastres = res;\r
     }\r
     else\r
     {\r
-      startseq = -1;\r
-      lastres = -1;\r
+        res = (x / av.getCharWidth()) + av.getStartRes();\r
     }\r
 \r
-    startEdit = lastres;\r
-    endEdit = lastres;\r
+    return res;\r
 \r
-    return;\r
-  }\r
+   }\r
 \r
-  public void doMouseMoved(MouseEvent evt)\r
-  {\r
-    int res = 0;\r
-    int seq = 0;\r
-    int x = evt.getX();\r
-    int y = evt.getY();\r
+   int findSeq(MouseEvent evt)\r
+   {\r
 \r
-    if (av.wrapAlignment)\r
-    {\r
-      y -= (2 * av.charHeight);\r
+     int seq = 0;\r
+     int y = evt.getY();\r
 \r
-      int chunkHeight = (av.getAlignment().getHeight() + 2) * av.charHeight;\r
+     if (av.wrapAlignment)\r
+     {\r
+       int hgap = av.charHeight;\r
+       if (av.scaleAboveWrapped)\r
+         hgap += av.charHeight;\r
 \r
-      res = (int) ( (y / chunkHeight) * (getWidth() / av.charWidth)) +\r
-          (x / av.getCharWidth()) + av.getStartRes();\r
+       int cHeight = av.getAlignment().getHeight() * av.charHeight\r
+           + hgap + seqCanvas.getAnnotationHeight();\r
 \r
-      y %= chunkHeight;\r
-      seq = (y / av.getCharHeight()) + av.getStartSeq();\r
-    }\r
-    else\r
-    {\r
-      res = (x / av.getCharWidth()) + av.getStartRes();\r
-      seq = (y / av.getCharHeight()) + av.getStartSeq();\r
-    }\r
-\r
-    if (seq >= av.getAlignment().getHeight())\r
-    {\r
-      return;\r
-    }\r
+         y -= hgap;\r
 \r
-    SequenceI sequence = av.getAlignment().getSequenceAt(seq);\r
+       seq = ( (y % cHeight) / av.getCharHeight());\r
+     }\r
+     else\r
+     {\r
+       seq = (y / av.getCharHeight()) + av.getStartSeq();\r
+     }\r
 \r
-    if (res > sequence.getLength())\r
-    {\r
-      return;\r
-    }\r
+     return seq;\r
+   }\r
 \r
-    Object obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) +\r
-                                                  "");\r
-    String aa = "";\r
 \r
-    if (obj != null)\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void doMouseReleased(MouseEvent evt)\r
     {\r
-      aa = obj.toString();\r
-    }\r
+        if (seqEditOccurred > -1)\r
+        {\r
+            editOccurred(seqEditOccurred);\r
+        }\r
 \r
-    StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +\r
-                                         sequence.getName());\r
+        startseq = -1;\r
+        lastres = -1;\r
+        seqEditOccurred = -1;\r
+        editingSeqs = false;\r
+        groupEditing = false;\r
 \r
-    if (aa != "")\r
-    {\r
-      text.append("  Residue: " + aa + " (" +\r
-                  av.getAlignment().getSequenceAt(seq).findPosition(res) + ")");\r
+        ap.repaint();\r
     }\r
 \r
-    ap.alignFrame.statusBar.setText(text.toString());\r
-\r
-    // use aa to see if the mouse pointer is on a\r
-    if (av.showSequenceFeatures)\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void doMousePressed(MouseEvent evt)\r
     {\r
-      Vector features = sequence.getSequenceFeatures();\r
-      Enumeration e = features.elements();\r
-      StringBuffer sbuffer = new StringBuffer();\r
+      ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",\r
+                                                   av.alignment, HistoryItem.EDIT));\r
 \r
-      while (e.hasMoreElements())\r
-      {\r
-        SequenceFeature sf = (SequenceFeature) e.nextElement();\r
+      int seq = findSeq(evt);\r
+      int res = findRes(evt);\r
 \r
-        if ( (sf.getStart() <= sequence.findPosition(res)) &&\r
-            (sf.getEnd() >= sequence.findPosition(res)))\r
-        {\r
-          if (sbuffer.length() > 0)\r
-          {\r
-            sbuffer.append("; ");\r
-          }\r
-\r
-          sbuffer.append(sf.getType() + " " + sf.getDescription());\r
+      if(seq<0 || res<0)\r
+        return;\r
 \r
-          if (sf.getStatus().length() > 0)\r
-          {\r
-            sbuffer.append(" (" + sf.getStatus() + ")");\r
-          }\r
+        if ((seq < av.getAlignment().getHeight()) &&\r
+                (res < av.getAlignment().getSequenceAt(seq).getLength()))\r
+        {\r
+            startseq = seq;\r
+            lastres = res;\r
+        }\r
+        else\r
+        {\r
+            startseq = -1;\r
+            lastres = -1;\r
         }\r
-      }\r
-\r
-      this.setToolTipText(sbuffer.toString());\r
-    }\r
-  }\r
 \r
-  public void doMouseDragged(MouseEvent evt)\r
-  {\r
-    // If we're dragging we're editing\r
-    int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
+        startEdit = lastres;\r
+        endEdit = lastres;\r
 \r
-    if (res < 0)\r
-    {\r
-      res = 0;\r
+        return;\r
     }\r
 \r
-    if ( (lastres == -1) || (lastres == res))\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void doMouseMoved(MouseEvent evt)\r
     {\r
-      return;\r
-    }\r
+      int res = findRes(evt);\r
+      int seq = findSeq(evt);\r
 \r
-    boolean dragRight = true;\r
+      if(res<0 || seq<0 || seq >= av.getAlignment().getHeight())\r
+            return;\r
 \r
-    if ( (res < av.getAlignment().getWidth()) && (res < lastres))\r
-    {\r
-      dragRight = false;\r
-    }\r
+      SequenceI sequence = av.getAlignment().getSequenceAt(seq);\r
 \r
-    if (res != lastres)\r
-    {\r
-      // Group editing\r
-      if (groupEditing)\r
+      if (res > sequence.getLength())\r
       {\r
-        SequenceGroup sg = av.getSelectionGroup();\r
+        return;\r
+      }\r
 \r
-        if (sg == null)\r
-        {\r
-          lastres = -1;\r
+      if(seqCanvas.pdbCanvas!=null && sequence==seqCanvas.pdbCanvas.sequence)\r
+      {\r
+        seqCanvas.pdbCanvas.highlightRes(sequence.findPosition(res));\r
+      }\r
 \r
-          return;\r
-        }\r
 \r
-        // drag to right\r
-        if (dragRight)\r
+        StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +\r
+                sequence.getName());\r
+\r
+        Object obj = null;\r
+        if (av.alignment.isNucleotide())\r
         {\r
-          sg.setEndRes(sg.getEndRes() + (res - lastres));\r
+          obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res) +\r
+              "");\r
+          if(obj!=null)\r
+            text.append(" Nucleotide: ");\r
         }\r
-        // drag to left\r
         else\r
         {\r
-          /// Are we able to delete?\r
-          // ie are all columns blank?\r
-          boolean deleteAllowed = false;\r
+          obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) + "");\r
+          if(obj!=null)\r
+            text.append("  Residue: ");\r
+        }\r
+\r
+        if (obj != null)\r
+        {\r
 \r
-          for (int s = 0; s < sg.getSize(); s++)\r
+          if (obj != "")\r
           {\r
-            SequenceI seq = sg.getSequenceAt(s);\r
+            text.append( obj + " (" +\r
+                        av.getAlignment().getSequenceAt(seq).findPosition(res) + ")");\r
+          }\r
+        }\r
+\r
+        ap.alignFrame.statusBar.setText(text.toString());\r
 \r
-            for (int j = res; j < lastres; j++)\r
+        // use aa to see if the mouse pointer is on a\r
+        if (av.showSequenceFeatures)\r
+        {\r
+            Vector features = sequence.getDatasetSequence().getSequenceFeatures();\r
+            if(features!=null)\r
             {\r
-              if (seq.getSequence().length() <= j)\r
-              {\r
-                continue;\r
-              }\r
+              StringBuffer sbuffer = new StringBuffer("<html>");\r
 \r
-              if (!jalview.util.Comparison.isGap(\r
-                  seq.getSequence().charAt(j)))\r
+              for (int i = 0; i < features.size(); i++)\r
               {\r
-                // Not a gap, block edit not valid\r
-                res = j + 1;\r
-                deleteAllowed = false;\r
+                SequenceFeature sf = (SequenceFeature) features.elementAt(i);\r
+\r
+                if ( (sf.getBegin() <= sequence.findPosition(res)) &&\r
+                    (sf.getEnd() >= sequence.findPosition(res)))\r
+                {\r
+                  if (sf.getType().equals("disulfide bond"))\r
+                  {\r
+                    if (sf.getBegin() == sequence.findPosition(res)\r
+                        || sf.getEnd() == sequence.findPosition(res))\r
+                    {\r
+                      if (sbuffer.length() > 6)\r
+                        sbuffer.append("<br>");\r
+                      sbuffer.append("disulfide bond " + sf.getBegin() + ":" +\r
+                                     sf.getEnd());\r
+                    }\r
+                  }\r
+                  else\r
+                  {\r
+                    if (sbuffer.length() > 6)\r
+                      sbuffer.append("<br>");\r
+                    sbuffer.append(sf.getType());\r
+                    if (sf.getDescription() != null)\r
+                      sbuffer.append(" " + sf.getDescription());\r
+\r
+                    if (sf.getStatus() != null)\r
+                    {\r
+                      sbuffer.append(" (" + sf.getStatus() + ")");\r
+                    }\r
+                  }\r
+                }\r
 \r
-                continue;\r
               }\r
 \r
-              deleteAllowed = true;\r
+              sbuffer.append("</html>");\r
+              if(sbuffer.length()==13) // <html></html>\r
+                setToolTipText("");\r
+              else\r
+               setToolTipText(sbuffer.toString());\r
             }\r
-          }\r
-\r
-          if (!deleteAllowed)\r
-          {\r
-            lastres = -1;\r
+            else\r
+              setToolTipText("");\r
+        }\r
+    }\r
 \r
-            return;\r
-          }\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void doMouseDragged(MouseEvent evt)\r
+    {\r
+        // If we're dragging we're editing\r
+        int res = findRes(evt);\r
 \r
-          sg.setEndRes(sg.getEndRes() - (lastres - res));\r
+        if (res < 0)\r
+        {\r
+            res = 0;\r
         }\r
 \r
-        for (int i = 0; i < sg.getSize(); i++)\r
+        if ((lastres == -1) || (lastres == res))\r
         {\r
-          SequenceI s = sg.getSequenceAt(i);\r
-          int k = av.alignment.findIndex(s);\r
-\r
-          // drag to right\r
-          if (dragRight)\r
-          {\r
-            for (int j = lastres; j < res; j++)\r
-            {\r
-              insertChar(j, k);\r
-            }\r
-          }\r
-          // drag to left\r
-          else\r
-          {\r
-            for (int j = res; j < lastres; j++)\r
-            {\r
-              if (s.getLength() > j)\r
-              {\r
-                deleteChar(res, k);\r
-              }\r
-            }\r
-          }\r
+            return;\r
         }\r
-      }\r
-      else /////Editing a single sequence///////////\r
-      {\r
-        if ( (res < av.getAlignment().getWidth()) && (res > lastres))\r
+\r
+        boolean dragRight = true;\r
+\r
+        if ((res < av.getAlignment().getWidth()) && (res < lastres))\r
         {\r
-          // dragging to the right\r
-          for (int j = lastres; j < res; j++)\r
-          {\r
-            insertChar(j, startseq);\r
-          }\r
+            dragRight = false;\r
         }\r
-        else if ( (res < av.getAlignment().getWidth()) &&\r
-                 (res < lastres))\r
+\r
+        if (res != lastres)\r
         {\r
-          // dragging to the left\r
-          for (int j = lastres; j > res; j--)\r
-          {\r
-            if (jalview.util.Comparison.isGap(\r
-                av.alignment.getSequenceAt(startseq)\r
-                .getSequence().charAt(res)))\r
+            // Group editing\r
+            if (groupEditing)\r
             {\r
-              deleteChar(res, startseq);\r
+                SequenceGroup sg = av.getSelectionGroup();\r
+\r
+                if (sg == null)\r
+                {\r
+                    lastres = -1;\r
+\r
+                    return;\r
+                }\r
+\r
+                // drag to right\r
+                if (dragRight)\r
+                {\r
+                    sg.setEndRes(sg.getEndRes() + (res - lastres));\r
+                }\r
+\r
+                // drag to left\r
+                else\r
+                {\r
+                    /// Are we able to delete?\r
+                    // ie are all columns blank?\r
+                    boolean deleteAllowed = false;\r
+\r
+                    for (int s = 0; s < sg.getSize(); s++)\r
+                    {\r
+                        SequenceI seq = sg.getSequenceAt(s);\r
+\r
+                        for (int j = res; j < lastres; j++)\r
+                        {\r
+                            if (seq.getSequence().length() <= j)\r
+                            {\r
+                                continue;\r
+                            }\r
+\r
+                            if (!jalview.util.Comparison.isGap(\r
+                                        seq.getSequence().charAt(j)))\r
+                            {\r
+                                // Not a gap, block edit not valid\r
+                                res = j + 1;\r
+                                deleteAllowed = false;\r
+\r
+                                continue;\r
+                            }\r
+\r
+                            deleteAllowed = true;\r
+                        }\r
+                    }\r
+\r
+                    if (!deleteAllowed)\r
+                    {\r
+                        lastres = -1;\r
+\r
+                        return;\r
+                    }\r
+\r
+                    sg.setEndRes(sg.getEndRes() - (lastres - res));\r
+                }\r
+\r
+                for (int i = 0; i < sg.getSize(); i++)\r
+                {\r
+                    SequenceI s = sg.getSequenceAt(i);\r
+                    int k = av.alignment.findIndex(s);\r
+\r
+                    // drag to right\r
+                    if (dragRight)\r
+                    {\r
+                        for (int j = lastres; j < res; j++)\r
+                        {\r
+                            insertChar(j, k);\r
+                        }\r
+                    }\r
+\r
+                    // drag to left\r
+                    else\r
+                    {\r
+                        for (int j = res; j < lastres; j++)\r
+                        {\r
+                            if (s.getLength() > j)\r
+                            {\r
+                                deleteChar(res, k);\r
+                            }\r
+                        }\r
+                    }\r
+                }\r
             }\r
-            else\r
+            else /////Editing a single sequence///////////\r
             {\r
-              break;\r
+                if ((res < av.getAlignment().getWidth()) && (res > lastres))\r
+                {\r
+                    // dragging to the right\r
+                    for (int j = lastres; j < res; j++)\r
+                    {\r
+                        insertChar(j, startseq);\r
+                    }\r
+                }\r
+                else if ((res < av.getAlignment().getWidth()) &&\r
+                        (res < lastres))\r
+                {\r
+                    // dragging to the left\r
+                    for (int j = lastres; j > res; j--)\r
+                    {\r
+                        if (jalview.util.Comparison.isGap(\r
+                                    av.alignment.getSequenceAt(startseq)\r
+                                                    .getSequence().charAt(res)))\r
+                        {\r
+                            deleteChar(res, startseq);\r
+                        }\r
+                        else\r
+                        {\r
+                            break;\r
+                        }\r
+                    }\r
+                }\r
             }\r
-          }\r
         }\r
-      }\r
+\r
+        endEdit = res;\r
+        lastres = res;\r
+        seqCanvas.repaint();\r
     }\r
 \r
-    endEdit = res;\r
-    lastres = res;\r
-    seqCanvas.repaint();\r
-  }\r
-\r
-  public void drawChars(int seqstart, int seqend, int start)\r
-  {\r
-    seqCanvas.drawPanel(seqCanvas.gg, start, av.getEndRes(), seqstart,\r
-                        seqend, av.getStartRes(), av.getStartSeq(), 0);\r
-    seqCanvas.repaint();\r
-  }\r
-\r
-  public void insertChar(int j, int seq)\r
-  {\r
-    av.alignment.getSequenceAt(seq).insertCharAt(j, av.getGapCharacter());\r
-    seqEditOccurred = seq;\r
-  }\r
-\r
-  public void deleteChar(int j, int seq)\r
-  {\r
-    av.alignment.getSequenceAt(seq).deleteCharAt(j);\r
-    seqEditOccurred = seq;\r
-\r
-    av.alignment.getWidth();\r
-    seqCanvas.repaint();\r
-  }\r
-\r
-  void editOccurred(int i)\r
-  {\r
-    if (endEdit == startEdit)\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param seqstart DOCUMENT ME!\r
+     * @param seqend DOCUMENT ME!\r
+     * @param start DOCUMENT ME!\r
+     */\r
+    public void drawChars(int seqstart, int seqend, int start)\r
     {\r
-      ap.alignFrame.historyList.pop();\r
-      ap.alignFrame.updateEditMenuBar();\r
+        seqCanvas.drawPanel(seqCanvas.gg, start, av.getEndRes(), seqstart,\r
+            seqend, av.getStartRes(), av.getStartSeq(), 0);\r
+        seqCanvas.repaint();\r
     }\r
 \r
-    av.updateConservation();\r
-    av.updateConsensus();\r
-\r
-    // Y O Y CLUSTALX\r
-    ColourSchemeI cs = av.getGlobalColourScheme();\r
-\r
-    if(av.getSelectionGroup()!=null)\r
-      av.getSelectionGroup().recalcConservation();\r
-\r
-\r
-    if (cs instanceof ConservationColourScheme)\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param j DOCUMENT ME!\r
+     * @param seq DOCUMENT ME!\r
+     */\r
+    public void insertChar(int j, int seq)\r
     {\r
-      ConservationColourScheme ccs = (ConservationColourScheme) cs;\r
-      Conservation c = new Conservation("All",\r
-                                        ResidueProperties.propHash, 3,\r
-                                        av.alignment.getSequences(), 0,\r
-                                        av.alignment.getWidth() - 1);\r
-      c.calculate();\r
-      c.verdict(false, av.ConsPercGaps);\r
-\r
-      if (ccs.cs instanceof ClustalxColourScheme)\r
-      {\r
-\r
-        ClustalxColourScheme cxs = (ClustalxColourScheme) ccs.cs;\r
-        cxs.resetClustalX(av.alignment.getSequences(),\r
-                          av.alignment.getWidth());\r
-        ccs = new ConservationColourScheme(c, cxs);\r
-        av.setGlobalColourScheme(ccs);\r
-      }\r
-      else\r
-      {\r
-        ccs = new ConservationColourScheme(c, ccs.cs);\r
-        av.setGlobalColourScheme(ccs);\r
-      }\r
+        av.alignment.getSequenceAt(seq).insertCharAt(j, av.getGapCharacter());\r
+        seqEditOccurred = seq;\r
     }\r
 \r
-    if (cs instanceof ClustalxColourScheme)\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param j DOCUMENT ME!\r
+     * @param seq DOCUMENT ME!\r
+     */\r
+    public void deleteChar(int j, int seq)\r
     {\r
-      ( (ClustalxColourScheme) cs).resetClustalX(av.alignment.getSequences(),\r
-                                                 av.alignment.getWidth());\r
-      av.setGlobalColourScheme(cs);\r
+        av.alignment.getSequenceAt(seq).deleteCharAt(j);\r
+        seqEditOccurred = seq;\r
+\r
+        av.alignment.getWidth();\r
+        seqCanvas.repaint();\r
     }\r
-  }\r
 \r
-  public void doMousePressedDefineMode(MouseEvent evt)\r
-  {\r
-    int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
-    int seq = (evt.getY() / av.getCharHeight()) + av.getStartSeq();\r
-    oldSeq = seq;\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param i DOCUMENT ME!\r
+     */\r
+    void editOccurred(int i)\r
+    {\r
+      if (endEdit == startEdit)\r
+      {\r
+        ap.alignFrame.historyList.pop();\r
+        ap.alignFrame.updateEditMenuBar();\r
+      }\r
 \r
-    SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);\r
+      av.firePropertyChange("alignment", null,av.getAlignment().getSequences());\r
 \r
-    if ( (sequence == null) || (res > sequence.getLength()))\r
-    {\r
-      return;\r
     }\r
 \r
-    stretchGroup = av.getSelectionGroup();\r
-\r
-    if (stretchGroup == null)\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void doMousePressedDefineMode(MouseEvent evt)\r
     {\r
-      stretchGroup = av.alignment.findGroup(sequence);\r
+      int res = findRes(evt);\r
+      int seq = findSeq(evt);\r
+      oldSeq = seq;\r
 \r
-      if ( (stretchGroup != null) && (res > stretchGroup.getStartRes()) &&\r
-          (res < stretchGroup.getEndRes()))\r
+      startWrapBlock=wrappedBlock;\r
+\r
+      if(av.wrapAlignment && seq>av.alignment.getHeight())\r
       {\r
-        av.setSelectionGroup(stretchGroup);\r
+          JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
+              "Cannot edit annotations in wrapped view.",\r
+              "Wrapped view - no edit",\r
+              JOptionPane.WARNING_MESSAGE);\r
+        return;\r
       }\r
-      else\r
-      {\r
-        stretchGroup = null;\r
-      }\r
-    }\r
-    else if (!stretchGroup.sequences.contains(sequence) ||\r
-             (stretchGroup.getStartRes() > res) ||\r
-             (stretchGroup.getEndRes() < res))\r
-    {\r
-      stretchGroup = null;\r
 \r
-      SequenceGroup[] allGroups = av.alignment.findAllGroups(sequence);\r
+      if(seq<0 || res<0)\r
+            return;\r
 \r
-      if (allGroups != null)\r
-      {\r
-        for (int i = 0; i < allGroups.length; i++)\r
-        {\r
-          if ( (allGroups[i].getStartRes() <= res) &&\r
-              (allGroups[i].getEndRes() >= res))\r
-          {\r
-            stretchGroup = allGroups[i];\r
-            av.setSelectionGroup(stretchGroup);\r
 \r
-            break;\r
-          }\r
+        SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);\r
+\r
+        if ((sequence == null) || (res > sequence.getLength()))\r
+        {\r
+            return;\r
         }\r
-      }\r
-    }\r
 \r
-    if (stretchGroup == null)\r
-    {\r
-      // define a new group here\r
-      SequenceGroup sg = new SequenceGroup();\r
-      sg.setStartRes(res);\r
-      sg.setEndRes(res);\r
-      sg.addSequence(sequence, false);\r
-      av.setSelectionGroup(sg);\r
-      stretchGroup = sg;\r
-\r
-      if (av.getConservationSelected())\r
-      {\r
-        SliderPanel.setConservationSlider(ap,\r
-                                          av.getGlobalColourScheme(),\r
-                                          "Background");\r
-      }\r
+        stretchGroup = av.getSelectionGroup();\r
 \r
-      if (av.getAbovePIDThreshold())\r
-      {\r
-        SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),\r
-                                       "Background");\r
-      }\r
-    }\r
-    else if (javax.swing.SwingUtilities.isRightMouseButton(evt))\r
-    {\r
-      jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null);\r
-      pop.show(this, evt.getX(), evt.getY());\r
+        if (stretchGroup == null)\r
+        {\r
+            stretchGroup = av.alignment.findGroup(sequence);\r
 \r
-      // edit the properties of existing group\r
-    }\r
+            if ((stretchGroup != null) && (res > stretchGroup.getStartRes()) &&\r
+                    (res < stretchGroup.getEndRes()))\r
+            {\r
+                av.setSelectionGroup(stretchGroup);\r
+            }\r
+            else\r
+            {\r
+                stretchGroup = null;\r
+            }\r
+        }\r
+        else if (!stretchGroup.sequences.contains(sequence) ||\r
+                (stretchGroup.getStartRes() > res) ||\r
+                (stretchGroup.getEndRes() < res))\r
+        {\r
+            stretchGroup = null;\r
 \r
-    if ( (stretchGroup != null) && (stretchGroup.getEndRes() == res))\r
-    {\r
-      // Edit end res position of selected group\r
-      changeEndRes = true;\r
-    }\r
-    else if ( (stretchGroup != null) && (stretchGroup.getStartRes() == res))\r
-    {\r
-      // Edit end res position of selected group\r
-      changeStartRes = true;\r
-    }\r
+            SequenceGroup[] allGroups = av.alignment.findAllGroups(sequence);\r
 \r
-    stretchGroup.getWidth();\r
+            if (allGroups != null)\r
+            {\r
+                for (int i = 0; i < allGroups.length; i++)\r
+                {\r
+                    if ((allGroups[i].getStartRes() <= res) &&\r
+                            (allGroups[i].getEndRes() >= res))\r
+                    {\r
+                        stretchGroup = allGroups[i];\r
+                        av.setSelectionGroup(stretchGroup);\r
+\r
+                        break;\r
+                    }\r
+                }\r
+            }\r
+        }\r
 \r
-    seqCanvas.repaint();\r
-  }\r
+        if (stretchGroup == null)\r
+        {\r
+            // define a new group here\r
+            SequenceGroup sg = new SequenceGroup();\r
+            sg.setStartRes(res);\r
+            sg.setEndRes(res);\r
+            sg.addSequence(sequence, false);\r
+            av.setSelectionGroup(sg);\r
+            stretchGroup = sg;\r
+\r
+            if (av.getConservationSelected())\r
+            {\r
+                SliderPanel.setConservationSlider(ap,\r
+                    av.getGlobalColourScheme(), "Background");\r
+            }\r
 \r
-  public void doMouseReleasedDefineMode(MouseEvent evt)\r
-  {\r
-    if(mouseDragging)\r
-    {\r
-      stretchGroup.recalcConservation();\r
-      mouseDragging = false;\r
-    }\r
+            if (av.getAbovePIDThreshold())\r
+            {\r
+                SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),\r
+                    "Background");\r
+            }\r
+        }\r
+        else if (javax.swing.SwingUtilities.isRightMouseButton(evt))\r
+        {\r
+            jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null);\r
+            pop.show(this, evt.getX(), evt.getY());\r
 \r
-    if (stretchGroup == null)\r
-    {\r
-      return;\r
-    }\r
+            // edit the properties of existing group\r
+        }\r
 \r
-    if (stretchGroup.cs instanceof ClustalxColourScheme)\r
-    {\r
-      ( (ClustalxColourScheme) stretchGroup.cs).resetClustalX(stretchGroup.sequences,\r
-                                                     stretchGroup.getWidth());\r
-    }\r
+        if ((stretchGroup != null) && (stretchGroup.getEndRes() == res))\r
+        {\r
+            // Edit end res position of selected group\r
+            changeEndRes = true;\r
+        }\r
+        else if ((stretchGroup != null) && (stretchGroup.getStartRes() == res))\r
+        {\r
+            // Edit end res position of selected group\r
+            changeStartRes = true;\r
+        }\r
 \r
-    if (stretchGroup.cs instanceof ConservationColourScheme)\r
-    {\r
-      ConservationColourScheme ccs = (ConservationColourScheme) stretchGroup.cs;\r
-      stretchGroup.cs = ccs;\r
-      SliderPanel.setConservationSlider(ap, stretchGroup.cs,\r
-                                        stretchGroup.getName());\r
+        stretchGroup.getWidth();\r
 \r
+        seqCanvas.repaint();\r
     }\r
-    else\r
+\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void doMouseReleasedDefineMode(MouseEvent evt)\r
     {\r
-      SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,\r
-                                     stretchGroup.getName());\r
-    }\r
+        if (mouseDragging)\r
+        {\r
+            stretchGroup.recalcConservation();\r
+            mouseDragging = false;\r
+        }\r
 \r
-    changeEndRes = false;\r
-    changeStartRes = false;\r
-    stretchGroup = null;\r
-    seqCanvas.repaint();\r
-    ap.idPanel.repaint();\r
-  }\r
+        if (stretchGroup == null)\r
+        {\r
+            return;\r
+        }\r
 \r
-  public void doMouseDraggedDefineMode(MouseEvent evt)\r
-  {\r
-    int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
-    int y = (evt.getY() / av.getCharHeight()) + av.getStartSeq();\r
+        if(stretchGroup.cs!=null)\r
+        {\r
+          if (stretchGroup.cs instanceof ClustalxColourScheme)\r
+          {\r
+            ( (ClustalxColourScheme) stretchGroup.cs).resetClustalX(stretchGroup.\r
+                sequences,\r
+                stretchGroup.getWidth());\r
+          }\r
 \r
-    if (stretchGroup == null)\r
-    {\r
-      return;\r
+          if (stretchGroup.cs.conservationApplied())\r
+          {\r
+            SliderPanel.setConservationSlider(ap, stretchGroup.cs,\r
+                                              stretchGroup.getName());\r
+          }\r
+          else\r
+          {\r
+            SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,\r
+                                           stretchGroup.getName());\r
+          }\r
+        }\r
+        changeEndRes = false;\r
+        changeStartRes = false;\r
+        stretchGroup = null;\r
+        PaintRefresher.Refresh(av.alignment);\r
     }\r
 \r
-    if (res > av.alignment.getWidth())\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param evt DOCUMENT ME!\r
+     */\r
+    public void doMouseDraggedDefineMode(MouseEvent evt)\r
     {\r
-      res = av.alignment.getWidth() - 1;\r
-    }\r
+      int res = findRes(evt);\r
+      int y = findSeq(evt);\r
 \r
-    if (stretchGroup.getEndRes() == res)\r
-    {\r
-      // Edit end res position of selected group\r
-      changeEndRes = true;\r
-    }\r
-    else if (stretchGroup.getStartRes() == res)\r
-    {\r
-      // Edit start res position of selected group\r
-      changeStartRes = true;\r
-    }\r
+      if(wrappedBlock!=startWrapBlock)\r
+        return;\r
 \r
-    if (res < av.getStartRes())\r
-    {\r
-      res = av.getStartRes();\r
-    }\r
-    else if (res > av.getEndRes())\r
-    {\r
-      res = av.getEndRes();\r
-    }\r
-\r
-    if (changeEndRes)\r
-    {\r
-      if (res > (stretchGroup.getStartRes() - 1))\r
+      if (stretchGroup == null)\r
       {\r
-        stretchGroup.setEndRes(res);\r
-      }\r
-    }\r
-    else if (changeStartRes)\r
-    {\r
-      if (res < (stretchGroup.getEndRes() + 1))\r
-      {\r
-        stretchGroup.setStartRes(res);\r
-      }\r
-    }\r
+            return;\r
+        }\r
 \r
-    int dragDirection = 0;\r
+        if (res > av.alignment.getWidth())\r
+        {\r
+            res = av.alignment.getWidth() - 1;\r
+        }\r
 \r
-    if (y > oldSeq)\r
-    {\r
-      dragDirection = 1;\r
-    }\r
-    else if (y < oldSeq)\r
-    {\r
-      dragDirection = -1;\r
-    }\r
+        if (stretchGroup.getEndRes() == res)\r
+        {\r
+            // Edit end res position of selected group\r
+            changeEndRes = true;\r
+        }\r
+        else if (stretchGroup.getStartRes() == res)\r
+        {\r
+            // Edit start res position of selected group\r
+            changeStartRes = true;\r
+        }\r
 \r
-    while ( (y != oldSeq) && (oldSeq > 0) && (y < av.alignment.getHeight()))\r
-    {\r
-      // This routine ensures we don't skip any sequences, as the\r
-      // selection is quite slow.\r
-      Sequence seq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);\r
+        if (res < av.getStartRes())\r
+        {\r
+            res = av.getStartRes();\r
+        }\r
+        else if (res > av.getEndRes() && !av.getWrapAlignment())\r
+        {\r
+            res = av.getEndRes();\r
+        }\r
 \r
-      oldSeq += dragDirection;\r
+        if (changeEndRes)\r
+        {\r
+            if (res > (stretchGroup.getStartRes() - 1))\r
+            {\r
+                stretchGroup.setEndRes(res);\r
+            }\r
+        }\r
+        else if (changeStartRes)\r
+        {\r
+            if (res < (stretchGroup.getEndRes() + 1))\r
+            {\r
+                stretchGroup.setStartRes(res);\r
+            }\r
+        }\r
 \r
-      Sequence nextSeq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);\r
+        int dragDirection = 0;\r
 \r
-      if (stretchGroup.sequences.contains(nextSeq))\r
-      {\r
-          stretchGroup.deleteSequence(seq, false);\r
-      }\r
-      else\r
-      {\r
-        if (seq != null)\r
+        if (y > oldSeq)\r
         {\r
-          stretchGroup.addSequence(seq, false);\r
+            dragDirection = 1;\r
+        }\r
+        else if (y < oldSeq)\r
+        {\r
+            dragDirection = -1;\r
         }\r
-        stretchGroup.addSequence(nextSeq, false);\r
-      }\r
-    }\r
 \r
-    oldSeq = y;\r
-    mouseDragging = true;\r
+        while ((y != oldSeq) && (oldSeq > 0) && (y < av.alignment.getHeight()))\r
+        {\r
+            // This routine ensures we don't skip any sequences, as the\r
+            // selection is quite slow.\r
+            Sequence seq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);\r
 \r
-    if (scrollThread != null)\r
-    {\r
-      scrollThread.setEvent(evt);\r
-    }\r
+            oldSeq += dragDirection;\r
 \r
-    seqCanvas.repaint();\r
-  }\r
+            Sequence nextSeq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);\r
 \r
-  public void doMouseEnteredDefineMode(MouseEvent e)\r
-  {\r
-    if (scrollThread != null)\r
-    {\r
-      scrollThread.running = false;\r
-    }\r
-  }\r
+            if (stretchGroup.sequences.contains(nextSeq))\r
+            {\r
+                stretchGroup.deleteSequence(seq, false);\r
+            }\r
+            else\r
+            {\r
+                if (seq != null)\r
+                {\r
+                    stretchGroup.addSequence(seq, false);\r
+                }\r
 \r
-  public void doMouseExitedDefineMode(MouseEvent e)\r
-  {\r
-    if (av.getWrapAlignment())\r
-    {\r
-      return;\r
-    }\r
+                stretchGroup.addSequence(nextSeq, false);\r
+            }\r
+        }\r
 \r
-    if (mouseDragging)\r
-    {\r
-      scrollThread = new ScrollThread();\r
-    }\r
-  }\r
+        oldSeq = y;\r
+        mouseDragging = true;\r
 \r
-  // this class allows scrolling off the bottom of the visible alignment\r
-  class ScrollThread\r
-      extends Thread\r
-  {\r
-    MouseEvent evt;\r
-    boolean running = false;\r
+        if (scrollThread != null)\r
+        {\r
+            scrollThread.setEvent(evt);\r
+        }\r
 \r
-    public ScrollThread()\r
-    {\r
-      start();\r
+        seqCanvas.repaint();\r
     }\r
 \r
-    public void setEvent(MouseEvent e)\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void doMouseEnteredDefineMode(MouseEvent e)\r
     {\r
-      evt = e;\r
+        if (scrollThread != null)\r
+        {\r
+            scrollThread.running = false;\r
+        }\r
     }\r
 \r
-    public void stopScrolling()\r
+    /**\r
+     * DOCUMENT ME!\r
+     *\r
+     * @param e DOCUMENT ME!\r
+     */\r
+    public void doMouseExitedDefineMode(MouseEvent e)\r
     {\r
-      running = false;\r
+        if (av.getWrapAlignment())\r
+        {\r
+            return;\r
+        }\r
+\r
+        if (mouseDragging)\r
+        {\r
+            scrollThread = new ScrollThread();\r
+        }\r
     }\r
 \r
-    public void run()\r
+    // this class allows scrolling off the bottom of the visible alignment\r
+    class ScrollThread extends Thread\r
     {\r
-      running = true;\r
+        MouseEvent evt;\r
+        boolean running = false;\r
 \r
-      while (running)\r
-      {\r
-        if (evt != null)\r
+        public ScrollThread()\r
         {\r
-          if (mouseDragging && (evt.getY() < 0) &&\r
-              (av.getStartSeq() > 0))\r
-          {\r
-            running = ap.scrollUp(true);\r
-          }\r
-\r
-          if (mouseDragging && (evt.getY() >= getHeight()) &&\r
-              (av.alignment.getHeight() > av.getEndSeq()))\r
-          {\r
-            running = ap.scrollUp(false);\r
-          }\r
+            start();\r
+        }\r
 \r
-          if (mouseDragging && (evt.getX() < 0))\r
-          {\r
-            running = ap.scrollRight(true);\r
-          }\r
-          else if (mouseDragging && (evt.getX() >= getWidth()))\r
-          {\r
-            running = ap.scrollRight(false);\r
-          }\r
+        public void setEvent(MouseEvent e)\r
+        {\r
+            evt = e;\r
         }\r
 \r
-        try\r
+        public void stopScrolling()\r
         {\r
-          Thread.sleep(75);\r
+            running = false;\r
         }\r
-        catch (Exception ex)\r
+\r
+        public void run()\r
         {\r
+            running = true;\r
+\r
+            while (running)\r
+            {\r
+                if (evt != null)\r
+                {\r
+                    if (mouseDragging && (evt.getY() < 0) &&\r
+                            (av.getStartSeq() > 0))\r
+                    {\r
+                        running = ap.scrollUp(true);\r
+                    }\r
+\r
+                    if (mouseDragging && (evt.getY() >= getHeight()) &&\r
+                            (av.alignment.getHeight() > av.getEndSeq()))\r
+                    {\r
+                        running = ap.scrollUp(false);\r
+                    }\r
+\r
+                    if (mouseDragging && (evt.getX() < 0))\r
+                    {\r
+                        running = ap.scrollRight(true);\r
+                    }\r
+                    else if (mouseDragging && (evt.getX() >= getWidth()))\r
+                    {\r
+                        running = ap.scrollRight(false);\r
+                    }\r
+                }\r
+\r
+                try\r
+                {\r
+                    Thread.sleep(20);\r
+                }\r
+                catch (Exception ex)\r
+                {\r
+                }\r
+            }\r
         }\r
-      }\r
     }\r
-  }\r
 }\r