X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=a5ffb80110540b0d1170bed98ed2ab343c38ed6b;hb=b0123c396580412f9c2218caedfc173696cd0fe5;hp=3f49cc49ca923ab2972778efa65f26fc3e9a3c15;hpb=99f3f01792321efb671ac7ad946efffc3a3319a4;p=jalview.git

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 3f49cc4..a5ffb80 100755
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,15 +18,16 @@
  */
 package jalview.gui;
 
-import jalview.datamodel.*;
-
-import jalview.schemes.*;
+import java.util.*;
 
 import java.awt.*;
 import java.awt.event.*;
-
 import javax.swing.*;
 
+import jalview.commands.*;
+import jalview.datamodel.*;
+import jalview.schemes.*;
+import jalview.structure.*;
 
 /**
  * DOCUMENT ME!
@@ -34,1296 +35,1744 @@ import javax.swing.*;
  * @author $author$
  * @version $Revision$
  */
-public class SeqPanel extends JPanel implements MouseListener,
-    MouseMotionListener, MouseWheelListener
+public class SeqPanel
+    extends JPanel implements MouseListener,
+    MouseMotionListener, MouseWheelListener, SequenceListener
 
 {
-    /** DOCUMENT ME!! */
-    public SeqCanvas seqCanvas;
-
-    /** DOCUMENT ME!! */
-    public AlignmentPanel ap;
-    protected int lastres;
-    protected int startseq;
-    protected AlignViewport av;
-
-    // if character is inserted or deleted, we will need to recalculate the conservation
-    boolean seqEditOccurred = false;
-    ScrollThread scrollThread = null;
-    boolean mouseDragging = false;
-    boolean editingSeqs = false;
-    boolean groupEditing = false;
-
-    //////////////////////////////////////////
-    /////Everything below this is for defining the boundary of the rubberband
-    //////////////////////////////////////////
-    int oldSeq = -1;
-    boolean changeEndSeq = false;
-    boolean changeStartSeq = false;
-    boolean changeEndRes = false;
-    boolean changeStartRes = false;
-    SequenceGroup stretchGroup = null;
-    boolean remove = false;
-
-    boolean mouseWheelPressed = false;
-
-    /**
-     * Creates a new SeqPanel object.
-     *
-     * @param avp DOCUMENT ME!
-     * @param p DOCUMENT ME!
-     */
-    public SeqPanel(AlignViewport avp, AlignmentPanel p)
-    {
-        ToolTipManager.sharedInstance().registerComponent(this);
-        ToolTipManager.sharedInstance().setInitialDelay(0);
-        ToolTipManager.sharedInstance().setDismissDelay(10000);
-        this.av = avp;
-        setBackground(Color.white);
-
-        seqCanvas = new SeqCanvas(avp);
-        setLayout(new BorderLayout());
-        add(seqCanvas, BorderLayout.CENTER);
-
-        ap = p;
-
-        if(!av.isDataset())
-        {
-          addMouseMotionListener(this);
-          addMouseListener(this);
-          addMouseWheelListener(this);
-        }
+  /** DOCUMENT ME!! */
+  public SeqCanvas seqCanvas;
+
+  /** DOCUMENT ME!! */
+  public AlignmentPanel ap;
+  protected int lastres;
+  protected int startseq;
+  protected AlignViewport av;
+
+  ScrollThread scrollThread = null;
+  boolean mouseDragging = false;
+  boolean editingSeqs = false;
+  boolean groupEditing = false;
+
+  //////////////////////////////////////////
+  /////Everything below this is for defining the boundary of the rubberband
+  //////////////////////////////////////////
+  int oldSeq = -1;
+  boolean changeEndSeq = false;
+  boolean changeStartSeq = false;
+  boolean changeEndRes = false;
+  boolean changeStartRes = false;
+  SequenceGroup stretchGroup = null;
+  boolean remove = false;
+
+  Point lastMousePress;
+  boolean mouseWheelPressed = false;
+  StringBuffer keyboardNo1;
+  StringBuffer keyboardNo2;
+
+  java.net.URL linkImageURL;
+
+  StringBuffer tooltipText = new StringBuffer("<html>");
+  String tmpString;
+
+  EditCommand editCommand;
+
+  StructureSelectionManager ssm;
+
+
+  /**
+   * Creates a new SeqPanel object.
+   *
+   * @param avp DOCUMENT ME!
+   * @param p DOCUMENT ME!
+   */
+  public SeqPanel(AlignViewport avp, AlignmentPanel p)
+  {
+    linkImageURL = getClass().getResource("/images/link.gif");
+    ToolTipManager.sharedInstance().registerComponent(this);
+    ToolTipManager.sharedInstance().setInitialDelay(0);
+    ToolTipManager.sharedInstance().setDismissDelay(10000);
+    this.av = avp;
+    setBackground(Color.white);
+
+    seqCanvas = new SeqCanvas(avp);
+    setLayout(new BorderLayout());
+    add(seqCanvas, BorderLayout.CENTER);
+
+    ap = p;
+
+    if (!av.isDataset())
+    {
+      addMouseMotionListener(this);
+      addMouseListener(this);
+      addMouseWheelListener(this);
+      ssm = StructureSelectionManager.getStructureSelectionManager();
+      ssm.addStructureViewerListener(this);
     }
+  }
 
-    int startWrapBlock=-1;
-    int wrappedBlock=-1;
-    int findRes(MouseEvent evt)
-   {
-     int res = 0;
-     int x = evt.getX();
+  int startWrapBlock = -1;
+  int wrappedBlock = -1;
+  int findRes(MouseEvent evt)
+  {
+    int res = 0;
+    int x = evt.getX();
 
     if (av.wrapAlignment)
     {
 
       int hgap = av.charHeight;
       if (av.scaleAboveWrapped)
+      {
         hgap += av.charHeight;
+      }
 
       int cHeight = av.getAlignment().getHeight() * av.charHeight
           + hgap + seqCanvas.getAnnotationHeight();
 
-        int y = evt.getY();
-        y -= hgap;
-        x -= seqCanvas.LABEL_WEST;
-
+      int y = evt.getY();
+      y -= hgap;
+      x -= seqCanvas.LABEL_WEST;
 
-        int cwidth = seqCanvas.getWrappedCanvasWidth(this.getWidth());
+      int cwidth = seqCanvas.getWrappedCanvasWidth(this.getWidth());
+      if (cwidth < 1)
+      {
+        return 0;
+      }
 
-        wrappedBlock = y / cHeight;
-        wrappedBlock += av.getStartRes() / cwidth;
+      wrappedBlock = y / cHeight;
+      wrappedBlock += av.getStartRes() / cwidth;
 
-        res = wrappedBlock * cwidth + x / av.getCharWidth();
+      res = wrappedBlock * cwidth + x / av.getCharWidth();
 
     }
     else
     {
-        res = (x / av.getCharWidth()) + av.getStartRes();
+      res = (x / av.getCharWidth()) + av.getStartRes();
     }
 
-    if(av.hasHiddenColumns)
-          res = av.getColumnSelection().adjustForHiddenColumns(res);
+    if (av.hasHiddenColumns)
+    {
+      res = av.getColumnSelection().adjustForHiddenColumns(res);
+    }
 
     return res;
 
-   }
+  }
 
-   int findSeq(MouseEvent evt)
-   {
+  int findSeq(MouseEvent evt)
+  {
+    int seq = 0;
+    int y = evt.getY();
 
-     int seq = 0;
-     int y = evt.getY();
-
-     if (av.wrapAlignment)
-     {
-       int hgap = av.charHeight;
-       if (av.scaleAboveWrapped)
-         hgap += av.charHeight;
-
-       int cHeight = av.getAlignment().getHeight() * av.charHeight
-           + hgap + seqCanvas.getAnnotationHeight();
-
-         y -= hgap;
+    if (av.wrapAlignment)
+    {
+      int hgap = av.charHeight;
+      if (av.scaleAboveWrapped)
+      {
+        hgap += av.charHeight;
+      }
 
-       seq = ( (y % cHeight) / av.getCharHeight());
-     }
-     else
-     {
-       seq = (y / av.getCharHeight()) + av.getStartSeq();
-     }
+      int cHeight = av.getAlignment().getHeight() * av.charHeight
+          + hgap + seqCanvas.getAnnotationHeight();
 
-     return seq;
-   }
+      y -= hgap;
 
-   void endEditing()
-   {
-     startseq = -1;
-     lastres = -1;
-     seqEditOccurred = false;
-     editingSeqs = false;
-     groupEditing = false;
-     keyboardGaps = null;
+      seq = Math.min( (y % cHeight) / av.getCharHeight(),
+                     av.alignment.getHeight() - 1);
     }
-
-
-    void moveCursor(int dx, int dy)
+    else
     {
-      seqCanvas.cursorX += dx;
-      seqCanvas.cursorY += dy;
-
-      if(seqCanvas.cursorX<0)
-        seqCanvas.cursorX = 0;
-      else if(seqCanvas.cursorX>av.alignment.getWidth()-1)
-        seqCanvas.cursorX = av.alignment.getWidth()-1;
-      if(seqCanvas.cursorX<av.startRes)
-        ap.scrollRight(false);
-      else if(seqCanvas.cursorX>av.endRes)
-        ap.scrollRight(true);
-
-      if(seqCanvas.cursorY<0)
-        seqCanvas.cursorY=0;
-      else if(seqCanvas.cursorY>av.alignment.getHeight()-1)
-        seqCanvas.cursorY = av.alignment.getHeight()-1;
-      if(seqCanvas.cursorY<av.startSeq)
-        ap.scrollUp(true);
-      else if(seqCanvas.cursorY+1>av.endSeq)
-        ap.scrollUp(false);
-
-      setStatusMessage(av.alignment.getSequenceAt(seqCanvas.cursorY),
-                       seqCanvas.cursorX, seqCanvas.cursorY);
-      seqCanvas.repaint();
+      seq = Math.min( (y / av.getCharHeight()) + av.getStartSeq(),
+                     av.alignment.getHeight() - 1);
     }
 
-    void setSelectionAreaAtCursor(boolean topLeft)
-    {
-      SequenceI sequence =
-          (Sequence) av.getAlignment().getSequenceAt(seqCanvas.cursorY);
+    return seq;
+  }
 
-      if(av.getSelectionGroup()!=null)
+  SequenceFeature[] findFeaturesAtRes(SequenceI sequence, int res)
+  {
+    Vector tmp = new Vector();
+    SequenceFeature[] features = sequence.getSequenceFeatures();
+    if (features != null)
+    {
+      for (int i = 0; i < features.length; i++)
       {
-        SequenceGroup sg = av.selectionGroup;
-        //Find the top and bottom of this group
-        int min = av.alignment.getHeight(), max = 0;
-        for(int i=0; i<sg.getSize(); i++)
-        {
-          int index = av.alignment.findIndex( sg.getSequenceAt(i) );
-          if(index > max)
-            max = index;
-          if(index < min)
-            min = index;
-        }
-
-        max ++;
-
-        if(topLeft)
-        {
-          sg.setStartRes(seqCanvas.cursorX);
-          if(sg.getEndRes()<seqCanvas.cursorX)
-            sg.setEndRes(seqCanvas.cursorX);
-
-          min = seqCanvas.cursorY;
-        }
-        else
+        if (av.featuresDisplayed == null
+            || !av.featuresDisplayed.containsKey(features[i].getType()))
         {
-          sg.setEndRes(seqCanvas.cursorX);
-          if(sg.getStartRes()>seqCanvas.cursorX)
-            sg.setStartRes(seqCanvas.cursorX);
-
-          max = seqCanvas.cursorY+1;
+          continue;
         }
 
-        if(min>max)
-        {
-          // Only the user can do this
-          av.setSelectionGroup(null);
-        }
-        else
+        if ( (features[i].getBegin() <= res) &&
+            (features[i].getEnd() >= res))
         {
-          // Now add any sequences between min and max
-          sg.sequences.clear();
-          for (int i = min; i < max; i++)
-          {
-            sg.addSequence(av.alignment.getSequenceAt(i), false);
-          }
+          tmp.addElement(features[i]);
         }
       }
+    }
 
-      if (av.getSelectionGroup() == null)
-      {
-        SequenceGroup sg = new SequenceGroup();
-        sg.setStartRes(seqCanvas.cursorX);
-        sg.setEndRes(seqCanvas.cursorX);
-        sg.addSequence(sequence, false);
-        av.setSelectionGroup(sg);
-      }
+    features = new SequenceFeature[tmp.size()];
+    tmp.copyInto(features);
 
+    return features;
+  }
 
-      ap.repaint();
-    }
 
-    void insertGapAtCursor(boolean group)
+  void endEditing()
+  {
+    if (editCommand != null && editCommand.getSize() > 0)
     {
-      ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",
-                                                   av.alignment, HistoryItem.EDIT));
-      groupEditing = group;
-      startseq = seqCanvas.cursorY;
-      lastres = seqCanvas.cursorX;
-      editSequence(true, seqCanvas.cursorX+getKeyboardGaps());
-      editOccurred();
+      ap.alignFrame.addHistoryItem(editCommand);
+      av.firePropertyChange("alignment", null,
+                            av.getAlignment().getSequences());
     }
 
-    void deleteGapAtCursor(boolean group)
+    startseq = -1;
+    lastres = -1;
+    editingSeqs = false;
+    groupEditing = false;
+    keyboardNo1 = null;
+    keyboardNo2 = null;
+    editCommand = null;
+  }
+
+  void setCursorRow()
+  {
+    seqCanvas.cursorY = getKeyboardNo1() - 1;
+    scrollToVisible();
+  }
+
+  void setCursorColumn()
+  {
+    seqCanvas.cursorX = getKeyboardNo1() - 1;
+    scrollToVisible();
+  }
+
+  void setCursorRowAndColumn()
+  {
+    if (keyboardNo2 == null)
     {
-      ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",
-                                                   av.alignment, HistoryItem.EDIT));
-      groupEditing = group;
-      startseq = seqCanvas.cursorY;
-      lastres = seqCanvas.cursorX+getKeyboardGaps();
-      editSequence(false, seqCanvas.cursorX);
-      editOccurred();
+      keyboardNo2 = new StringBuffer();
     }
-
-    void numberPressed(char value)
+    else
     {
-      if(keyboardGaps==null)
-        keyboardGaps = new StringBuffer();
-
-      keyboardGaps.append(value);
+      seqCanvas.cursorX = getKeyboardNo1() - 1;
+      seqCanvas.cursorY = getKeyboardNo2() - 1;
+      scrollToVisible();
     }
-
-    StringBuffer keyboardGaps;
-    int getKeyboardGaps()
+  }
+
+  void setCursorPosition()
+  {
+    SequenceI sequence =
+        (Sequence) av.getAlignment().getSequenceAt(seqCanvas.cursorY);
+
+    seqCanvas.cursorX = sequence.findIndex(
+        getKeyboardNo1() - 1
+        );
+    scrollToVisible();
+  }
+
+  void moveCursor(int dx, int dy)
+  {
+    seqCanvas.cursorX += dx;
+    seqCanvas.cursorY += dy;
+    if (av.hasHiddenColumns && !av.colSel.isVisible(seqCanvas.cursorX))
     {
-      if(keyboardGaps==null)
-        return 1;
-      else
-        return Integer.parseInt(keyboardGaps.toString());
-    }
-
+      int original = seqCanvas.cursorX - dx;
+      int maxWidth = av.alignment.getWidth();
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void mouseReleased(MouseEvent evt)
-    {
-      mouseDragging = false;
-      mouseWheelPressed = false;
+      while (!av.colSel.isVisible(seqCanvas.cursorX)
+             && seqCanvas.cursorX < maxWidth
+             && seqCanvas.cursorX > 0)
+      {
+        seqCanvas.cursorX += dx;
+      }
 
-      if (!editingSeqs)
+      if (seqCanvas.cursorX >= maxWidth
+          || !av.colSel.isVisible(seqCanvas.cursorX))
       {
-         doMouseReleasedDefineMode(evt);
-         return;
+        seqCanvas.cursorX = original;
       }
+    }
 
-       editOccurred();
+    scrollToVisible();
+  }
 
-       endEditing();
-       ap.repaint();
+  void scrollToVisible()
+  {
+    if (seqCanvas.cursorX < 0)
+    {
+      seqCanvas.cursorX = 0;
+    }
+    else if (seqCanvas.cursorX > av.alignment.getWidth() - 1)
+    {
+      seqCanvas.cursorX = av.alignment.getWidth() - 1;
     }
 
+    if (seqCanvas.cursorY < 0)
+    {
+      seqCanvas.cursorY = 0;
+    }
+    else if (seqCanvas.cursorY > av.alignment.getHeight() - 1)
+    {
+      seqCanvas.cursorY = av.alignment.getHeight() - 1;
+    }
 
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void mousePressed(MouseEvent evt)
+    endEditing();
+    if (av.wrapAlignment)
+    {
+      ap.scrollToWrappedVisible(seqCanvas.cursorX);
+    }
+    else
     {
-      if (javax.swing.SwingUtilities.isMiddleMouseButton(evt))
+      while (seqCanvas.cursorY < av.startSeq)
       {
-        mouseWheelPressed = true;
-        return;
+        ap.scrollUp(true);
       }
-
-      if (evt.isShiftDown() || evt.isAltDown() ||
-          evt.isControlDown())
+      while (seqCanvas.cursorY + 1 > av.endSeq)
       {
-        if (evt.isAltDown() || evt.isControlDown())
-        {
-          groupEditing = true;
-        }
-        editingSeqs = true;
+        ap.scrollUp(false);
       }
-      else
+      if (!av.wrapAlignment)
       {
-        doMousePressedDefineMode(evt);
-        return;
-      }
-
-
-
-      int seq = findSeq(evt);
-      int res = findRes(evt);
-
-      if(seq<0 || res<0)
-        return;
-
-      ap.alignFrame.addHistoryItem(new HistoryItem("Edit Sequence",
-                                                         av.alignment, HistoryItem.EDIT));
-
-        if ((seq < av.getAlignment().getHeight()) &&
-                (res < av.getAlignment().getSequenceAt(seq).getLength()))
+        while (seqCanvas.cursorX < av.colSel.adjustForHiddenColumns(av.startRes))
         {
-            startseq = seq;
-            lastres = res;
+          if (!ap.scrollRight(false))
+          {
+            break;
+          }
         }
-        else
+        while (seqCanvas.cursorX > av.colSel.adjustForHiddenColumns(av.endRes))
         {
-            startseq = -1;
-            lastres = -1;
+          if (!ap.scrollRight(true))
+          {
+            break;
+          }
         }
-
-        return;
+      }
     }
+    setStatusMessage(av.alignment.getSequenceAt(seqCanvas.cursorY),
+                     seqCanvas.cursorX, seqCanvas.cursorY);
+
+    seqCanvas.repaint();
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void mouseMoved(MouseEvent evt)
+  void setSelectionAreaAtCursor(boolean topLeft)
+  {
+    SequenceI sequence =
+        (Sequence) av.getAlignment().getSequenceAt(seqCanvas.cursorY);
+
+    if (av.getSelectionGroup() != null)
     {
-      if (editingSeqs)
+      SequenceGroup sg = av.selectionGroup;
+      //Find the top and bottom of this group
+      int min = av.alignment.getHeight(), max = 0;
+      for (int i = 0; i < sg.getSize(); i++)
       {
-       // This is because MacOSX creates a mouseMoved
-       // If control is down, other platforms will not.
-       mouseDragged(evt);
+        int index = av.alignment.findIndex(sg.getSequenceAt(i));
+        if (index > max)
+        {
+          max = index;
+        }
+        if (index < min)
+        {
+          min = index;
+        }
       }
 
-      int res = findRes(evt);
-      int seq = findSeq(evt);
-
+      max++;
 
-      if(res<0 || seq<0 || seq >= av.getAlignment().getHeight())
-            return;
-
-      SequenceI sequence = av.getAlignment().getSequenceAt(seq);
+      if (topLeft)
+      {
+        sg.setStartRes(seqCanvas.cursorX);
+        if (sg.getEndRes() < seqCanvas.cursorX)
+        {
+          sg.setEndRes(seqCanvas.cursorX);
+        }
 
-      if (res > sequence.getLength())
+        min = seqCanvas.cursorY;
+      }
+      else
       {
-        return;
+        sg.setEndRes(seqCanvas.cursorX);
+        if (sg.getStartRes() > seqCanvas.cursorX)
+        {
+          sg.setStartRes(seqCanvas.cursorX);
+        }
+
+        max = seqCanvas.cursorY + 1;
       }
 
-      if(seqCanvas.pdbCanvas!=null && sequence==seqCanvas.pdbCanvas.sequence)
+      if (min > max)
       {
-        seqCanvas.pdbCanvas.highlightRes(sequence.findPosition(res));
+        // Only the user can do this
+        av.setSelectionGroup(null);
       }
-
-      setStatusMessage(sequence, res, seq);
-
-        // use aa to see if the mouse pointer is on a
-        if (av.showSequenceFeatures)
+      else
+      {
+        // Now add any sequences between min and max
+        sg.getSequences(null).clear();
+        for (int i = min; i < max; i++)
         {
-            SequenceFeature [] features = sequence.getDatasetSequence().getSequenceFeatures();
-            if(features!=null)
-            {
-              StringBuffer sbuffer = new StringBuffer("<html>");
+          sg.addSequence(av.alignment.getSequenceAt(i), false);
+        }
+      }
+    }
 
-              for (int i = 0; i < features.length; i++)
-              {
+    if (av.getSelectionGroup() == null)
+    {
+      SequenceGroup sg = new SequenceGroup();
+      sg.setStartRes(seqCanvas.cursorX);
+      sg.setEndRes(seqCanvas.cursorX);
+      sg.addSequence(sequence, false);
+      av.setSelectionGroup(sg);
+    }
 
-                if ( (features[i].getBegin() <= sequence.findPosition(res)) &&
-                    (features[i].getEnd() >= sequence.findPosition(res)))
-                {
-                  if(av.featuresDisplayed==null
-                    || !av.featuresDisplayed.containsKey(features[i].getType()))
-                  continue;
-
-
-                  if (features[i].getType().equals("disulfide bond"))
-                  {
-                    if (features[i].getBegin() == sequence.findPosition(res)
-                        || features[i].getEnd() == sequence.findPosition(res))
-                    {
-                      if (sbuffer.length() > 6)
-                        sbuffer.append("<br>");
-                      sbuffer.append("disulfide bond " + features[i].getBegin() + ":" +
-                                     features[i].getEnd());
-                    }
-                  }
-                  else
-                  {
-                    if (sbuffer.length() > 6)
-                      sbuffer.append("<br>");
-                    if(features[i].featureGroup!=null)
-                      sbuffer.append(features[i].featureGroup+";");
-
-                    sbuffer.append(features[i].getType());
-
-                    if (features[i].getDescription() != null
-                        && !features[i].description.equals(features[i].getType()))
-                      sbuffer.append("; " + features[i].getDescription());
-
-                    if (features[i].getStatus() != null && features[i].getStatus().length()>0)
-                    {
-                      sbuffer.append("; (" + features[i].getStatus() + ")");
-                    }
-                  }
-                }
+    ap.paintAlignment(false);
+  }
+
+  void insertGapAtCursor(boolean group)
+  {
+    groupEditing = group;
+    startseq = seqCanvas.cursorY;
+    lastres = seqCanvas.cursorX;
+    editSequence(true, seqCanvas.cursorX + getKeyboardNo1());
+    endEditing();
+  }
+
+  void deleteGapAtCursor(boolean group)
+  {
+    groupEditing = group;
+    startseq = seqCanvas.cursorY;
+    lastres = seqCanvas.cursorX + getKeyboardNo1();
+    editSequence(false, seqCanvas.cursorX);
+    endEditing();
+  }
+
+  void numberPressed(char value)
+  {
+    if (keyboardNo1 == null)
+    {
+      keyboardNo1 = new StringBuffer();
+    }
 
-              }
+    if (keyboardNo2 != null)
+    {
+      keyboardNo2.append(value);
+    }
+    else
+    {
+      keyboardNo1.append(value);
+    }
+  }
 
-              sbuffer.append("</html>");
-              if(sbuffer.length()==13) // <html></html>
-                setToolTipText("");
-              else
-               setToolTipText(sbuffer.toString());
-            }
-            else
-              setToolTipText("");
-        }
+  int getKeyboardNo1()
+  {
+    if (keyboardNo1 == null)
+      return 1;
+    else
+    {
+      int value = Integer.parseInt(keyboardNo1.toString());
+      keyboardNo1 = null;
+      return value;
     }
+  }
 
-    void setStatusMessage(SequenceI sequence, int res, int seq)
+  int getKeyboardNo2()
+  {
+    if (keyboardNo2 == null)
+      return 1;
+    else
+    {
+      int value = Integer.parseInt(keyboardNo2.toString());
+      keyboardNo2 = null;
+      return value;
+    }
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param evt DOCUMENT ME!
+   */
+  public void mouseReleased(MouseEvent evt)
+  {
+    mouseDragging = false;
+    mouseWheelPressed = false;
+
+    if (!editingSeqs)
     {
-      StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +
-                                           sequence.getName());
+      doMouseReleasedDefineMode(evt);
+      return;
+    }
 
-      Object obj = null;
-      if (av.alignment.isNucleotide())
-      {
-        obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res) +
-                                                   "");
-        if (obj != null)
-          text.append(" Nucleotide: ");
-      }
-      else
-      {
-        obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) + "");
-        if (obj != null)
-          text.append("  Residue: ");
-      }
+    endEditing();
 
-      if (obj != null)
-      {
+    ap.paintAlignment(true);
+  }
 
-        if (obj != "")
-        {
-          text.append(obj + " (" + sequence.findPosition(res) +
-                      ")");
-        }
-      }
-      ap.alignFrame.statusBar.setText(text.toString());
+  /**
+   * DOCUMENT ME!
+   *
+   * @param evt DOCUMENT ME!
+   */
+  public void mousePressed(MouseEvent evt)
+  {
+    lastMousePress = evt.getPoint();
 
+    if (javax.swing.SwingUtilities.isMiddleMouseButton(evt))
+    {
+      mouseWheelPressed = true;
+      return;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void mouseDragged(MouseEvent evt)
+    if (evt.isShiftDown() || evt.isAltDown() ||
+        evt.isControlDown())
     {
-      if (!editingSeqs)
+      if (evt.isAltDown() || evt.isControlDown())
       {
-        doMouseDraggedDefineMode(evt);
-        return;
+        groupEditing = true;
       }
+      editingSeqs = true;
+    }
+    else
+    {
+      doMousePressedDefineMode(evt);
+      return;
+    }
 
-        int res = findRes(evt);
+    int seq = findSeq(evt);
+    int res = findRes(evt);
 
-        if (res < 0)
-        {
-            res = 0;
-        }
+    if (seq < 0 || res < 0)
+    {
+      return;
+    }
 
-        if ((lastres == -1) || (lastres == res))
-        {
-            return;
-        }
+    if ( (seq < av.getAlignment().getHeight()) &&
+        (res < av.getAlignment().getSequenceAt(seq).getLength()))
+    {
+      startseq = seq;
+      lastres = res;
+    }
+    else
+    {
+      startseq = -1;
+      lastres = -1;
+    }
 
-        if ( (res < av.getAlignment().getWidth()) && (res < lastres))
-        {
-          // dragLeft, delete gap
-          editSequence(false, res);
-        }
-        else
-          editSequence(true, res);
+    return;
+  }
 
-        mouseDragging = true;
-        if(scrollThread!=null)
-          scrollThread.setEvent(evt);
+  String lastMessage;
+  public void mouseOverSequence(SequenceI sequence, int index)
+  {
+    String tmp = sequence.hashCode()+index+"";
+    if (lastMessage == null || !lastMessage.equals(tmp))
+      ssm.mouseOverSequence(sequence, index);
+
+    lastMessage = tmp;
+  }
 
-    }
 
-    void editSequence(boolean insertGap, int startres)
+  public void highlightSequence(jalview.datamodel.SequenceI seq, int index)
+  {
+    if(av.alignment.findIndex(seq)>-1)
+    {
+      SearchResults highlight = new SearchResults();
+      highlight.addResult(seq,index,index);
+      seqCanvas.highlightSearchResults(highlight);
+    }
+  }
+
+  public void updateColours(SequenceI seq, int index)
+  {
+    System.out.println("update the seqPanel colours");
+    //repaint();
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param evt DOCUMENT ME!
+   */
+  public void mouseMoved(MouseEvent evt)
+  {
+    if (editingSeqs)
     {
-      int fixedLeft = -1;
-      int fixedRight = -1;
-      boolean fixedColumns = false;
+      // This is because MacOSX creates a mouseMoved
+      // If control is down, other platforms will not.
+      mouseDragged(evt);
+    }
 
-       if(insertGap && av.hasHiddenColumns)
-        {
-          //Stop editing if the user has dragged beyond hiddenBoundary
-          fixedRight = av.getColumnSelection().getHiddenRegionBoundary(lastres);
-          if( fixedRight < lastres)
-          {
-            if(lastres!=fixedRight)
-            {
-              endEditing();
-              return;
-            }
-          }
-        }
+    int res = findRes(evt);
+    int seq = findSeq(evt);
 
-        if (!groupEditing && av.hasHiddenRows)
-        {
-          if (av.alignment.getSequenceAt(startseq).getHiddenSequences() != null)
-          {
-            groupEditing = true;
-          }
-        }
+    if (res < 0 || seq < 0 || seq >= av.getAlignment().getHeight())
+    {
+      return;
+    }
 
+    SequenceI sequence = av.getAlignment().getSequenceAt(seq);
 
-        SequenceI seq = av.alignment.getSequenceAt(startseq);
-        StringBuffer message = new StringBuffer();
-        if (groupEditing)
-          message.append("Edit group:");
-       else
-            message.append("Edit sequence: "+seq.getName());
+    if (res > sequence.getLength())
+    {
+      return;
+    }
 
-       if(insertGap)
-         message.append(" insert ");
-       else
-         message.append(" delete ");
+    if (ssm != null)
+      mouseOverSequence(sequence, sequence.findPosition(res));
 
-       message.append(Math.abs(startres-lastres)+" gaps.");
-       ap.alignFrame.statusBar.setText(message.toString());
+    setStatusMessage(sequence, res, seq);
 
+    tooltipText.setLength(6); // Cuts the buffer back to <html>
 
-        //Are we editing within a selection group?
-        if (groupEditing
-            || (av.getSelectionGroup() != null &&
-                av.getSelectionGroup().sequences.contains(seq)))
+    SequenceGroup[] groups = av.alignment.findAllGroups(sequence);
+    if (groups != null)
+    {
+      for (int g = 0; g < groups.length; g++)
+      {
+        if (groups[g].getStartRes() <= res && groups[g].getEndRes() >= res)
         {
-          fixedColumns = true;
-
-          fixedLeft = av.getSelectionGroup().getStartRes();
-          fixedRight = av.getSelectionGroup().getEndRes();
-
-          if (   (startres < fixedLeft && lastres >= fixedLeft)
-              || (startres >= fixedLeft && lastres < fixedLeft)
-              || (startres > fixedRight && lastres <=fixedRight)
-              || (startres <= fixedRight && lastres > fixedRight))
+          if (tooltipText.length() > 6)
           {
-            endEditing();
-            return;
+            tooltipText.append("<br>");
           }
 
-          if (fixedLeft > startres)
+          if (!groups[g].getName().startsWith("JTreeGroup") &&
+              !groups[g].getName().startsWith("JGroup"))
           {
-            fixedRight = fixedLeft - 1;
-            fixedLeft = 0;
+            tooltipText.append(groups[g].getName());
           }
-          else if (fixedRight < startres)
+
+          if (groups[g].getDescription() != null)
           {
-            fixedLeft = fixedRight;
-            fixedRight = -1;
+            tooltipText.append(": " + groups[g].getDescription());
           }
         }
+      }
+    }
+
+    // use aa to see if the mouse pointer is on a
+    if (av.showSequenceFeatures)
+    {
+      SequenceFeature[] features = findFeaturesAtRes(
+          sequence.getDatasetSequence(), sequence.findPosition(res));
 
-        if (groupEditing)
+      if (features != null)
+      {
+        for (int i = 0; i < features.length; i++)
         {
-          SequenceGroup sg = av.getSelectionGroup();
-          if(fixedLeft>sg.getEndRes()
-          ||fixedRight<sg.getStartRes())
-       {
-         endEditing();
-         return;
-       }
-
-          if (av.hasHiddenRows)
+          if (features[i].getType().equals("disulfide bond"))
           {
-            //sg might be null as the user may only see 1 sequence
-            if (sg == null)
-            {
-              sg = new SequenceGroup();
-              sg.addSequence(av.alignment.getSequenceAt(startseq), false);
-            }
-
-            SequenceGroup tmp = new SequenceGroup();
-
-            //Do any of the sequences have hidden associates?
-            for (int s = 0; s < sg.getSize(); s++)
+            if (features[i].getBegin() == sequence.findPosition(res)
+                || features[i].getEnd() == sequence.findPosition(res))
             {
-              seq = sg.getSequenceAt(s);
-              tmp.addSequence(seq, false);
-              if (seq.getHiddenSequences() != null)
+              if (tooltipText.length() > 6)
+              {
+                tooltipText.append("<br>");
+              }
+              tooltipText.append("disulfide bond " + features[i].getBegin() +
+                                 ":" +
+                                 features[i].getEnd());
+              if (features[i].links != null)
               {
-                for (int h = 0; h < seq.getHiddenSequences().getSize(); h++)
-                  tmp.addSequence(seq.getHiddenSequences().getSequenceAt(h),
-                                  false);
+                tooltipText.append(" <img src=\"" + linkImageURL + "\">");
               }
             }
-
-            sg = tmp;
           }
-
-          if (sg == null)
-          {
-            endEditing();
-            return;
-          }
-
-         // int blankColumn = -1;
-
-          // drag to right
-          if (insertGap)
+          else
           {
-            // Is it valid??
-            // Find the next gap before the end
-            // of the visible region boundary
-            if (av.hasHiddenColumns)
+            if (tooltipText.length() > 6)
             {
-             // int lastCol = av.getColumnSelection().
-             //     getHiddenRegionBoundary(res);
+              tooltipText.append("<br>");
+            }
 
+            tooltipText.append(features[i].getType() + " " +
+                               features[i].begin);
+            if (features[i].begin != features[i].end)
+            {
+              tooltipText.append(" " + features[i].end);
             }
 
-              if (fixedRight != startres && fixedRight<av.alignment.getWidth()-1)
+            if (features[i].getDescription() != null
+                && !features[i].description.equals(features[i].getType()))
+            {
+              tmpString = features[i].getDescription();
+              int startTag = tmpString.toUpperCase().indexOf("<HTML>");
+              if (startTag > -1)
               {
-                for (fixedRight = fixedRight;
-                     fixedRight > lastres;
-                     fixedRight --)
-                {
-                  boolean blank = true;
-                  for (int s = 0; s < sg.getSize(); s++)
-                  {
-                    seq = sg.getSequenceAt(s);
-
-                    if (seq.getSequence().length() <= fixedRight)
-                    {
-                      continue;
-                    }
-
-                    if (!jalview.util.Comparison.isGap(
-                        seq.getCharAt(fixedRight)))
-                    {
-                      blank = false;
-                      continue;
-                    }
-                  }
-                  if (blank)
-                    break;
-                }
+                tmpString = tmpString.substring(startTag + 6);
               }
-
-              if (fixedRight <= startres)
+              int endTag = tmpString.toUpperCase().indexOf("</BODY>");
+              if (endTag > -1)
               {
-                endEditing();
-                return;
+                tmpString = tmpString.substring(0, endTag);
+              }
+              endTag = tmpString.toUpperCase().indexOf("</HTML>");
+              if (endTag > -1)
+              {
+                tmpString = tmpString.substring(0, endTag);
               }
-            }
 
+              if (startTag > -1)
+              {
+                tooltipText.append("; " + tmpString);
+              }
+              else
+              {
+                if (tmpString.indexOf("<") > -1 || tmpString.indexOf(">") > -1)
+                {
+                  //The description does not specify html is to
+                  //be used, so we must remove < > symbols
+                  tmpString = tmpString.replaceAll("<", "&lt;");
+                  tmpString = tmpString.replaceAll(">", "&gt;");
 
-          // drag to left
-          else
-          {
-            /// Are we able to delete?
-            // ie are all columns blank?
+                  tooltipText.append("; ");
+                  tooltipText.append(tmpString);
 
-            for (int s = 0; s < sg.getSize(); s++)
-            {
-              seq = sg.getSequenceAt(s);
-
-              for (int j = startres; j < lastres; j++)
-              {
-                if (seq.getSequence().length() <= j)
-                {
-                  continue;
                 }
-
-                if (!jalview.util.Comparison.isGap(
-                    seq.getSequence().charAt(j)))
-                {
-                  // Not a gap, block edit not valid
-                  endEditing();
-                  return;
-                }
-              }
-            }
-          }
-
-
-          for (int i = 0; i < sg.getSize(); i++)
-          {
-            seq = sg.getSequenceAt(i);
-
-            if (insertGap)
-            {
-              // dragging to the right
-              for (int j = lastres; j < startres; j++)
-              {
-                if (fixedColumns && fixedRight != -1)
+                else
                 {
-                  insertChar(j, seq, fixedRight);
+                  tooltipText.append("; " + tmpString);
                 }
-                else
-                  insertChar(j, seq);
               }
             }
-            else
+            if (features[i].getValue("status") != null)
             {
-              // dragging to the left
-              for (int j = lastres; j > startres; j--)
+              String status = features[i].getValue("status").toString();
+              if (status.length() > 0)
               {
-                if (fixedColumns && fixedRight != -1)
-                {
-                  deleteChar(startres, seq, fixedRight);
-                }
-                else
-                {
-                  deleteChar(startres, seq);
-                }
+                tooltipText.append("; (" + features[i].getValue("status") + ")");
               }
             }
-          }
-        }
-        else /////Editing a single sequence///////////
-        {
 
-          if (insertGap)
-          {
-            // dragging to the right
-            for (int j = lastres; j < startres; j++)
+            if (features[i].links != null)
             {
-              if (fixedColumns && fixedRight != -1)
-                insertChar(j, seq, fixedRight);
-              else
-                insertChar(j, seq);
-            }
-          }
-          else
-          {
-            // dragging to the left
-            for (int j = lastres; j > startres; j--)
-            {
-              if (fixedColumns && fixedRight != -1)
-              {
-                deleteChar(startres, seq, fixedRight);
-              }
-              else
-              {
-                deleteChar(startres, seq);
-              }
+              tooltipText.append(" <img src=\"" + linkImageURL + "\">");
             }
+
           }
         }
-
-        lastres = startres;
-        seqCanvas.repaint();
+      }
     }
 
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param j DOCUMENT ME!
-     * @param seq DOCUMENT ME!
-     */
-    void insertChar(int j, SequenceI seq)
+    if (tooltipText.length() == 6) // <html></html>
     {
-        seq.insertCharAt(j, av.getGapCharacter());
-        seqEditOccurred = true;
+      setToolTipText(null);
     }
-
-    void insertChar(int j, SequenceI seq, int fixedColumn)
-    {
-      //Find the next gap before the end of the visible region boundary
-      //If lastCol > j, theres a boundary after the gap insertion
-      int blankColumn = fixedColumn;
-      for (blankColumn = fixedColumn; blankColumn > j; blankColumn--)
-      {
-        if (jalview.util.Comparison.isGap(seq.getCharAt(blankColumn)))
+    else
     {
-          //Theres a space, so break and insert the gap
-          break;
-        }
-      }
+      tooltipText.append("</html>");
+      setToolTipText(tooltipText.toString());
+    }
+    // else
+    //  setToolTipText(null);
+  }
 
-      if (blankColumn <= j)
-      {
-        endEditing();
-        return;
-      }
+  void setStatusMessage(SequenceI sequence, int res, int seq)
+  {
+    StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +
+                                         sequence.getName());
 
-      if (!jalview.util.Comparison.isGap(seq.getCharAt(blankColumn)))
+    Object obj = null;
+    if (av.alignment.isNucleotide())
+    {
+      obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res) +
+                                                 "");
+      if (obj != null)
       {
-        //Just Checking
-        System.out.println("Tried removing residue (INSERT)"+seq.getCharAt(fixedColumn));
-        return;
+        text.append(" Nucleotide: ");
       }
-
-      seq.deleteCharAt(blankColumn);
-      seq.insertCharAt(j, av.getGapCharacter());
-      seqEditOccurred = true;
     }
-
-    void deleteChar(int j, SequenceI seq, int fixedColumn)
+    else
     {
-      if (!jalview.util.Comparison.isGap(seq.getCharAt(j)))
+      obj = ResidueProperties.aa2Triplet.get(sequence.getCharAt(res) + "");
+      if (obj != null)
       {
-        ap.alignFrame.statusBar.setText(
-            "End editing: Tried removing residue " + seq.getCharAt(j));
-        return;
+        text.append("  Residue: ");
       }
-
-      seq.deleteCharAt(j);
-      seq.insertCharAt(fixedColumn, av.getGapCharacter());
-      seqEditOccurred = true;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param j DOCUMENT ME!
-     * @param seq DOCUMENT ME!
-     */
-    void deleteChar(int j, SequenceI seq)
+    if (obj != null)
     {
-      if (!jalview.util.Comparison.isGap(seq.getCharAt(j)))
+
+      if (obj != "")
       {
-        ap.alignFrame.statusBar.setText(
-            "End editing: Tried removing residue " + seq.getCharAt(j));
-        return;
+        text.append(obj + " (" + sequence.findPosition(res) +
+                    ")");
       }
-
-        seq.deleteCharAt(j);
-        seqEditOccurred = true;
-        seqCanvas.repaint();
     }
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    public void mouseEntered(MouseEvent e)
+    ap.alignFrame.statusBar.setText(text.toString());
+
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param evt DOCUMENT ME!
+   */
+  public void mouseDragged(MouseEvent evt)
+  {
+    if (mouseWheelPressed)
     {
-        if(oldSeq < 0)
-          oldSeq = 0;
+      int oldWidth = av.charWidth;
 
-        if (scrollThread != null)
+      //Which is bigger, left-right or up-down?
+      if (Math.abs(evt.getY() - lastMousePress.getY())
+          > Math.abs(evt.getX() - lastMousePress.getX()))
+      {
+        int fontSize = av.font.getSize();
+
+        if (evt.getY() < lastMousePress.getY())
         {
-            scrollThread.running = false;
-            scrollThread = null;
+          fontSize--;
+        }
+        else if (evt.getY() > lastMousePress.getY())
+        {
+          fontSize++;
         }
-    }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    public void mouseExited(MouseEvent e)
-    {
-        if (av.getWrapAlignment())
+        if (fontSize < 1)
         {
-            return;
+          fontSize = 1;
         }
 
-        if (mouseDragging)
+        av.setFont(new Font(av.font.getName(), av.font.getStyle(), fontSize));
+        av.charWidth = oldWidth;
+        ap.fontChanged();
+      }
+      else
+      {
+        if (evt.getX() < lastMousePress.getX() && av.charWidth > 1)
         {
-            scrollThread = new ScrollThread();
+          av.charWidth--;
         }
+        else if (evt.getX() > lastMousePress.getX())
+        {
+          av.charWidth++;
+        }
+
+        ap.paintAlignment(false);
+      }
+
+      FontMetrics fm = getFontMetrics(av.getFont());
+      av.validCharWidth = fm.charWidth('M') <= av.charWidth;
+
+      lastMousePress = evt.getPoint();
+
+      return;
+    }
+
+    if (!editingSeqs)
+    {
+      doMouseDraggedDefineMode(evt);
+      return;
     }
 
-    public void mouseClicked(MouseEvent evt)
-    {}
+    int res = findRes(evt);
 
-    public void mouseWheelMoved(MouseWheelEvent e)
+    if (res < 0)
+    {
+      res = 0;
+    }
+
+    if ( (lastres == -1) || (lastres == res))
+    {
+      return;
+    }
+
+    if ( (res < av.getAlignment().getWidth()) && (res < lastres))
+    {
+      // dragLeft, delete gap
+      editSequence(false, res);
+    }
+    else
     {
-      e.consume();
-      if (mouseWheelPressed)
+      editSequence(true, res);
+    }
+
+    mouseDragging = true;
+    if (scrollThread != null)
+    {
+      scrollThread.setEvent(evt);
+    }
+  }
+
+
+
+  synchronized void editSequence(boolean insertGap, int startres)
+  {
+    int fixedLeft = -1;
+    int fixedRight = -1;
+    boolean fixedColumns = false;
+    SequenceGroup sg = av.getSelectionGroup();
+
+    SequenceI seq = av.alignment.getSequenceAt(startseq);
+
+    //No group, but the sequence may represent a group
+    if (!groupEditing && av.hasHiddenRows)
+    {
+      if (av.hiddenRepSequences != null
+          && av.hiddenRepSequences.containsKey(seq))
       {
-        Font font = av.getFont();
-        int fontSize = font.getSize();
-        if (e.getWheelRotation() > 0 && fontSize < 51)
-          fontSize++;
-        else if (fontSize > 1)
-          fontSize--;
+        sg = (SequenceGroup) av.hiddenRepSequences.get(seq);
+        groupEditing = true;
+      }
+    }
 
-        av.setFont(new Font(font.getName(), font.getStyle(), fontSize));
-        ap.fontChanged();
+    StringBuffer message = new StringBuffer();
+    if (groupEditing)
+    {
+      message.append("Edit group:");
+      if (editCommand == null)
+      {
+        editCommand = new EditCommand("Edit Group");
       }
-      else
+    }
+    else
+    {
+      message.append("Edit sequence: " + seq.getName());
+      String label = seq.getName();
+      if (label.length() > 10)
       {
-        if (e.getWheelRotation() > 0)
-          ap.scrollUp(false);
-        else
-          ap.scrollUp(true);
+        label = label.substring(0, 10);
+      }
+      if (editCommand == null)
+      {
+        editCommand = new EditCommand("Edit " + label);
       }
-
     }
 
+    if (insertGap)
+    {
+      message.append(" insert ");
+    }
+    else
+    {
+      message.append(" delete ");
+    }
 
+    message.append(Math.abs(startres - lastres) + " gaps.");
+    ap.alignFrame.statusBar.setText(message.toString());
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param i DOCUMENT ME!
-     */
-    void editOccurred()
+    //Are we editing within a selection group?
+    if (groupEditing
+        || (sg != null && sg.getSequences(av.hiddenRepSequences).contains(seq)))
     {
-      if (!seqEditOccurred)
+      fixedColumns = true;
+
+      //sg might be null as the user may only see 1 sequence,
+      //but the sequence represents a group
+      if (sg == null)
       {
-        ap.alignFrame.historyList.pop();
-        ap.alignFrame.updateEditMenuBar();
+        if (av.hiddenRepSequences == null
+            || !av.hiddenRepSequences.containsKey(seq))
+        {
+          endEditing();
+          return;
+        }
+        sg = (SequenceGroup) av.hiddenRepSequences.get(seq);
       }
 
-      endEditing();
+      fixedLeft = sg.getStartRes();
+      fixedRight = sg.getEndRes();
 
-      av.firePropertyChange("alignment", null,av.getAlignment().getSequences());
+      if ( (startres < fixedLeft && lastres >= fixedLeft)
+          || (startres >= fixedLeft && lastres < fixedLeft)
+          || (startres > fixedRight && lastres <= fixedRight)
+          || (startres <= fixedRight && lastres > fixedRight))
+      {
+        endEditing();
+        return;
+      }
 
+      if (fixedLeft > startres)
+      {
+        fixedRight = fixedLeft - 1;
+        fixedLeft = 0;
+      }
+      else if (fixedRight < startres)
+      {
+        fixedLeft = fixedRight;
+        fixedRight = -1;
+      }
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void doMousePressedDefineMode(MouseEvent evt)
+    if (av.hasHiddenColumns)
     {
-      int res = findRes(evt);
-      int seq = findSeq(evt);
-      oldSeq = seq;
-
-      startWrapBlock=wrappedBlock;
+      fixedColumns = true;
+      int y1 = av.getColumnSelection().getHiddenBoundaryLeft(startres);
+      int y2 = av.getColumnSelection().getHiddenBoundaryRight(startres);
 
-      if(av.wrapAlignment && seq>av.alignment.getHeight())
+      if ( (insertGap && startres > y1 && lastres < y1)
+          || (!insertGap && startres < y2 && lastres > y2))
       {
-          JOptionPane.showInternalMessageDialog(Desktop.desktop,
-              "Cannot edit annotations in wrapped view.",
-              "Wrapped view - no edit",
-              JOptionPane.WARNING_MESSAGE);
+        endEditing();
         return;
       }
 
-      if(seq<0 || res<0)
-            return;
+      //System.out.print(y1+" "+y2+" "+fixedLeft+" "+fixedRight+"~~");
+      //Selection spans a hidden region
+      if (fixedLeft < y1 && (fixedRight > y2 || fixedRight == -1))
+      {
+        if (startres >= y2)
+        {
+          fixedLeft = y2;
+        }
+        else
+        {
+          fixedRight = y2 - 1;
+        }
+      }
+    }
 
-        SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);
+    if (groupEditing)
+    {
+      Vector vseqs = sg.getSequences(av.hiddenRepSequences);
+      int g, groupSize = vseqs.size();
+      SequenceI[] groupSeqs = new SequenceI[groupSize];
+      for (g = 0; g < groupSeqs.length; g++)
+      {
+        groupSeqs[g] = (SequenceI) vseqs.elementAt(g);
+      }
 
-        if ((sequence == null) || (res > sequence.getLength()))
+      // drag to right
+      if (insertGap)
+      {
+        //If the user has selected the whole sequence, and is dragging to
+        // the right, we can still extend the alignment and selectionGroup
+        if (sg.getStartRes() == 0
+            && sg.getEndRes() == fixedRight
+            && sg.getEndRes() == av.alignment.getWidth() - 1
+            )
         {
-            return;
+          sg.setEndRes(av.alignment.getWidth() + startres - lastres);
+          fixedRight = sg.getEndRes();
         }
 
-        stretchGroup = av.getSelectionGroup();
-
-        if (stretchGroup == null)
+        // Is it valid with fixed columns??
+        // Find the next gap before the end
+        // of the visible region boundary
+        boolean blank = false;
+        for (fixedRight = fixedRight;
+             fixedRight > lastres;
+             fixedRight--)
         {
-            stretchGroup = av.alignment.findGroup(sequence);
+          blank = true;
 
-            if ((stretchGroup != null) && (res > stretchGroup.getStartRes()) &&
-                    (res < stretchGroup.getEndRes()))
-            {
-                av.setSelectionGroup(stretchGroup);
-            }
-            else
+          for (g = 0; g < groupSize; g++)
+          {
+            for (int j = 0; j < startres - lastres; j++)
             {
-                stretchGroup = null;
+              if (!jalview.util.Comparison.isGap(
+                  groupSeqs[g].getCharAt(fixedRight - j)))
+              {
+                blank = false;
+                break;
+              }
             }
+          }
+          if (blank)
+          {
+            break;
+          }
         }
-        else if (!stretchGroup.sequences.contains(sequence) ||
-                (stretchGroup.getStartRes() > res) ||
-                (stretchGroup.getEndRes() < res))
-        {
-            stretchGroup = null;
 
-            SequenceGroup[] allGroups = av.alignment.findAllGroups(sequence);
-
-            if (allGroups != null)
+        if (!blank)
+        {
+          if (sg.getSize() == av.alignment.getHeight())
+          {
+            if ( (av.hasHiddenColumns
+                  &&
+                  startres < av.getColumnSelection().getHiddenBoundaryRight(startres)))
             {
-                for (int i = 0; i < allGroups.length; i++)
-                {
-                    if ((allGroups[i].getStartRes() <= res) &&
-                            (allGroups[i].getEndRes() >= res))
-                    {
-                        stretchGroup = allGroups[i];
-                        av.setSelectionGroup(stretchGroup);
-
-                        break;
-                    }
-                }
+              endEditing();
+              return;
             }
-        }
 
-        if (av.cursorMode)
-        {
-          seqCanvas.cursorX = findRes(evt);
-          seqCanvas.cursorY = findSeq(evt);
-          seqCanvas.repaint();
-          return;
+            int alWidth = av.alignment.getWidth();
+            if (av.hasHiddenRows)
+            {
+              int hwidth = av.alignment.getHiddenSequences().getWidth();
+              if (hwidth > alWidth)
+              {
+                alWidth = hwidth;
+              }
+            }
+            //We can still insert gaps if the selectionGroup
+            //contains all the sequences
+            sg.setEndRes(sg.getEndRes() + startres - lastres);
+            fixedRight = alWidth + startres - lastres;
+          }
+          else
+          {
+            endEditing();
+            return;
+          }
         }
+      }
 
+      // drag to left
+      else if (!insertGap)
+      {
+        /// Are we able to delete?
+        // ie are all columns blank?
 
-        if (stretchGroup == null)
+        for (g = 0; g < groupSize; g++)
         {
-            // define a new group here
-            SequenceGroup sg = new SequenceGroup();
-            sg.setStartRes(res);
-            sg.setEndRes(res);
-            sg.addSequence(sequence, false);
-            av.setSelectionGroup(sg);
-            stretchGroup = sg;
-
-            if (av.getConservationSelected())
+          for (int j = startres; j < lastres; j++)
+          {
+            if (groupSeqs[g].getLength() <= j)
             {
-                SliderPanel.setConservationSlider(ap,
-                    av.getGlobalColourScheme(), "Background");
+              continue;
             }
 
-            if (av.getAbovePIDThreshold())
+            if (!jalview.util.Comparison.isGap(
+                groupSeqs[g].getCharAt(j)))
             {
-                SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),
-                    "Background");
+              // Not a gap, block edit not valid
+              endEditing();
+              return;
             }
+          }
         }
-        else if (javax.swing.SwingUtilities.isRightMouseButton(evt))
-        {
-            jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null);
-            pop.show(this, evt.getX(), evt.getY());
+      }
 
-            // edit the properties of existing group
+      if (insertGap)
+      {
+        // dragging to the right
+        if (fixedColumns && fixedRight != -1)
+        {
+          for (int j = lastres; j < startres; j++)
+          {
+            insertChar(j, groupSeqs, fixedRight);
+          }
         }
-
-        if ((stretchGroup != null) && (stretchGroup.getEndRes() == res))
+        else
         {
-            // Edit end res position of selected group
-            changeEndRes = true;
+          editCommand.appendEdit(EditCommand.INSERT_GAP,
+                                 groupSeqs,
+                                 startres, startres - lastres,
+                                 av.alignment,
+                                 true);
         }
-        else if ((stretchGroup != null) && (stretchGroup.getStartRes() == res))
+      }
+      else
+      {
+        // dragging to the left
+        if (fixedColumns && fixedRight != -1)
         {
-            // Edit end res position of selected group
-            changeStartRes = true;
+          for (int j = lastres; j > startres; j--)
+          {
+            deleteChar(startres, groupSeqs, fixedRight);
+          }
+        }
+        else
+        {
+          editCommand.appendEdit(EditCommand.DELETE_GAP,
+                                 groupSeqs,
+                                 startres, lastres - startres,
+                                 av.alignment,
+                                 true);
         }
 
-        stretchGroup.getWidth();
-
-        seqCanvas.repaint();
+      }
     }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void doMouseReleasedDefineMode(MouseEvent evt)
+    else /////Editing a single sequence///////////
     {
-        if (stretchGroup == null)
+      if (insertGap)
+      {
+        // dragging to the right
+        if (fixedColumns && fixedRight != -1)
         {
-            return;
+          for (int j = lastres; j < startres; j++)
+          {
+            insertChar(j, new SequenceI[]
+                       {seq}, fixedRight);
+          }
         }
-
-
-        if(stretchGroup.cs!=null)
+        else
+        {
+          editCommand.appendEdit(EditCommand.INSERT_GAP,
+                                 new SequenceI[]
+                                 {seq},
+                                 lastres, startres - lastres,
+                                 av.alignment,
+                                 true);
+        }
+      }
+      else
+      {
+        // dragging to the left
+        if (fixedColumns && fixedRight != -1)
         {
-          if (stretchGroup.cs instanceof ClustalxColourScheme)
+          for (int j = lastres; j > startres; j--)
           {
-            ( (ClustalxColourScheme) stretchGroup.cs).resetClustalX(stretchGroup.
-                sequences,
-                stretchGroup.getWidth());
+            if (!jalview.util.Comparison.isGap(seq.getCharAt(startres)))
+            {
+              endEditing();
+              break;
+            }
+            deleteChar(startres, new SequenceI[]
+                       {seq}, fixedRight);
           }
-
-          if (stretchGroup.cs.conservationApplied())
+        }
+        else
+        {
+          //could be a keyboard edit trying to delete none gaps
+          int max = 0;
+          for (int m = startres; m < lastres; m++)
           {
-            SliderPanel.setConservationSlider(ap, stretchGroup.cs,
-                                              stretchGroup.getName());
-            stretchGroup.recalcConservation();
+            if (!jalview.util.Comparison.isGap(seq.getCharAt(m)))
+            {
+              break;
+            }
+            max++;
           }
-          else
+
+          if (max > 0)
           {
-            SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,
-                                           stretchGroup.getName());
+            editCommand.appendEdit(EditCommand.DELETE_GAP,
+                                   new SequenceI[]
+                                   {seq},
+                                   startres, max,
+                                   av.alignment,
+                                   true);
           }
         }
-        changeEndRes = false;
-        changeStartRes = false;
-        stretchGroup = null;
-        PaintRefresher.Refresh(av.alignment);
+      }
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void doMouseDraggedDefineMode(MouseEvent evt)
+    lastres = startres;
+    seqCanvas.repaint();
+  }
+
+  void insertChar(int j, SequenceI[] seq, int fixedColumn)
+  {
+    int blankColumn = fixedColumn;
+    for (int s = 0; s < seq.length; s++)
     {
-      int res = findRes(evt);
-      int y = findSeq(evt);
+      //Find the next gap before the end of the visible region boundary
+      //If lastCol > j, theres a boundary after the gap insertion
+
+      for (blankColumn = fixedColumn; blankColumn > j; blankColumn--)
+      {
+        if (jalview.util.Comparison.isGap(seq[s].getCharAt(blankColumn)))
+        {
+          //Theres a space, so break and insert the gap
+          break;
+        }
+      }
 
-      if(wrappedBlock!=startWrapBlock)
+      if (blankColumn <= j)
+      {
+        blankColumn = fixedColumn;
+        endEditing();
         return;
+      }
+    }
 
-       if (stretchGroup == null)
-       {
-            return;
-       }
+    editCommand.appendEdit(EditCommand.DELETE_GAP,
+                           seq,
+                           blankColumn, 1, av.alignment, true);
+
+    editCommand.appendEdit(EditCommand.INSERT_GAP,
+                           seq,
+                           j, 1, av.alignment,
+                           true);
+
+  }
+
+  void deleteChar(int j, SequenceI[] seq, int fixedColumn)
+  {
+
+    editCommand.appendEdit(EditCommand.DELETE_GAP,
+                           seq,
+                           j, 1, av.alignment, true);
+
+    editCommand.appendEdit(EditCommand.INSERT_GAP,
+                           seq,
+                           fixedColumn, 1, av.alignment, true);
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param e DOCUMENT ME!
+   */
+  public void mouseEntered(MouseEvent e)
+  {
+    if (oldSeq < 0)
+    {
+      oldSeq = 0;
+    }
 
+    if (scrollThread != null)
+    {
+      scrollThread.running = false;
+      scrollThread = null;
+    }
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param e DOCUMENT ME!
+   */
+  public void mouseExited(MouseEvent e)
+  {
+    if (av.getWrapAlignment())
+    {
+      return;
+    }
 
-        if(y > av.alignment.getHeight())
-        {
-          y = av.alignment.getHeight() -1;
-        }
+    if (mouseDragging)
+    {
+      scrollThread = new ScrollThread();
+    }
+  }
 
-        if (stretchGroup.getEndRes() == res)
-        {
-            // Edit end res position of selected group
-            changeEndRes = true;
-        }
-        else if (stretchGroup.getStartRes() == res)
-        {
-            // Edit start res position of selected group
-            changeStartRes = true;
-        }
+  public void mouseClicked(MouseEvent evt)
+  {
+    SequenceI sequence = av.alignment.getSequenceAt(findSeq(evt));
+    if (evt.getClickCount() > 1)
+    {
+      if (av.getSelectionGroup().getSize() == 1
+          && av.getSelectionGroup().getEndRes()
+          - av.getSelectionGroup().getStartRes() < 2)
+      {
+        av.setSelectionGroup(null);
+      }
 
-        if (res < av.getStartRes())
-        {
-            res = av.getStartRes();
-        }
+      SequenceFeature[] features = findFeaturesAtRes(
+          sequence.getDatasetSequence(),
+          sequence.findPosition(findRes(evt))
+          );
 
-        if (changeEndRes)
-        {
-            if (res > (stretchGroup.getStartRes() - 1))
-            {
-                stretchGroup.setEndRes(res);
-            }
-        }
-        else if (changeStartRes)
-        {
-            if (res < (stretchGroup.getEndRes() + 1))
-            {
-                stretchGroup.setStartRes(res);
-            }
-        }
+      if (features != null && features.length > 0)
+      {
+        SearchResults highlight = new SearchResults();
+        highlight.addResult(sequence,
+                            features[0].getBegin(),
+                            features[0].getEnd());
+        seqCanvas.highlightSearchResults(highlight);
+      }
+      if (features != null && features.length > 0)
+      {
+        seqCanvas.getFeatureRenderer().amendFeatures(
+            new SequenceI[]
+            {sequence}, features, false, ap);
 
-        int dragDirection = 0;
+        seqCanvas.highlightSearchResults(null);
+      }
+    }
+  }
 
-        if (y > oldSeq)
+  public void mouseWheelMoved(MouseWheelEvent e)
+  {
+    e.consume();
+      if (e.getWheelRotation() > 0)
+      {
+        ap.scrollUp(false);
+      }
+      else
+      {
+        ap.scrollUp(true);
+      }
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param evt DOCUMENT ME!
+   */
+  public void doMousePressedDefineMode(MouseEvent evt)
+  {
+    int res = findRes(evt);
+    int seq = findSeq(evt);
+    oldSeq = seq;
+
+    startWrapBlock = wrappedBlock;
+
+    if (av.wrapAlignment && seq > av.alignment.getHeight())
+    {
+      JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                                            "Cannot edit annotations in wrapped view.",
+                                            "Wrapped view - no edit",
+                                            JOptionPane.WARNING_MESSAGE);
+      return;
+    }
+
+    if (seq < 0 || res < 0)
+    {
+      return;
+    }
+
+    SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);
+
+    if ( (sequence == null) || (res > sequence.getLength()))
+    {
+      return;
+    }
+
+    stretchGroup = av.getSelectionGroup();
+
+    if (stretchGroup == null)
+    {
+      stretchGroup = av.alignment.findGroup(sequence);
+
+      if ( (stretchGroup != null) && (res > stretchGroup.getStartRes()) &&
+          (res < stretchGroup.getEndRes()))
+      {
+        av.setSelectionGroup(stretchGroup);
+      }
+      else
+      {
+        stretchGroup = null;
+      }
+    }
+    else if (!stretchGroup.getSequences(null).contains(sequence) ||
+             (stretchGroup.getStartRes() > res) ||
+             (stretchGroup.getEndRes() < res))
+    {
+      stretchGroup = null;
+
+      SequenceGroup[] allGroups = av.alignment.findAllGroups(sequence);
+
+      if (allGroups != null)
+      {
+        for (int i = 0; i < allGroups.length; i++)
         {
-            dragDirection = 1;
+          if ( (allGroups[i].getStartRes() <= res) &&
+              (allGroups[i].getEndRes() >= res))
+          {
+            stretchGroup = allGroups[i];
+            break;
+          }
         }
-        else if (y < oldSeq)
+      }
+
+      av.setSelectionGroup(stretchGroup);
+
+    }
+
+    if (javax.swing.SwingUtilities.isRightMouseButton(evt))
+    {
+      SequenceFeature [] allFeatures = findFeaturesAtRes(sequence.getDatasetSequence(),
+                                               sequence.findPosition(res));
+      Vector links = new Vector();
+      for (int i = 0; i < allFeatures.length; i++)
+      {
+        if (allFeatures[i].links != null)
         {
-            dragDirection = -1;
+          for (int j = 0; j < allFeatures[i].links.size(); j++)
+          {
+            links.addElement(allFeatures[i].links.elementAt(j));
+          }
         }
+      }
 
+      jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null, links);
+      pop.show(this, evt.getX(), evt.getY());
+      return;
+    }
 
-        while ((y != oldSeq) && (oldSeq > -1) && (y < av.alignment.getHeight()))
-        {
-            // This routine ensures we don't skip any sequences, as the
-            // selection is quite slow.
-            Sequence seq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);
+    if (av.cursorMode)
+    {
+      seqCanvas.cursorX = findRes(evt);
+      seqCanvas.cursorY = findSeq(evt);
+      seqCanvas.repaint();
+      return;
+    }
 
-            oldSeq += dragDirection;
+    if (stretchGroup == null)
+    {
+      //Only if left mouse button do we want to change group sizes
 
-            if(oldSeq<0)
-              break;
+      // define a new group here
+      SequenceGroup sg = new SequenceGroup();
+      sg.setStartRes(res);
+      sg.setEndRes(res);
+      sg.addSequence(sequence, false);
+      av.setSelectionGroup(sg);
+      stretchGroup = sg;
 
-            Sequence nextSeq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);
+      if (av.getConservationSelected())
+      {
+        SliderPanel.setConservationSlider(ap,
+                                          av.getGlobalColourScheme(),
+                                          "Background");
+      }
 
-            if (stretchGroup.sequences.contains(nextSeq))
-            {
-                stretchGroup.deleteSequence(seq, false);
-            }
-            else
-            {
-                if (seq != null)
-                {
-                    stretchGroup.addSequence(seq, false);
-                }
+      if (av.getAbovePIDThreshold())
+      {
+        SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),
+                                       "Background");
+      }
+      if ( (stretchGroup != null) && (stretchGroup.getEndRes() == res))
+      {
+        // Edit end res position of selected group
+        changeEndRes = true;
+      }
+      else if ( (stretchGroup != null) &&
+               (stretchGroup.getStartRes() == res))
+      {
+        // Edit end res position of selected group
+        changeStartRes = true;
+      }
+      stretchGroup.getWidth();
+    }
 
-                stretchGroup.addSequence(nextSeq, false);
-            }
-        }
+    seqCanvas.repaint();
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param evt DOCUMENT ME!
+   */
+  public void doMouseReleasedDefineMode(MouseEvent evt)
+  {
+    if (stretchGroup == null)
+    {
+      return;
+    }
 
-        if(oldSeq < 0)
-          oldSeq = -1;
+    if (stretchGroup.cs != null)
+    {
+      if (stretchGroup.cs instanceof ClustalxColourScheme)
+      {
+        ( (ClustalxColourScheme) stretchGroup.cs).resetClustalX(
+            stretchGroup.getSequences(av.hiddenRepSequences),
+            stretchGroup.getWidth());
+      }
 
-        mouseDragging = true;
+      if (stretchGroup.cs instanceof Blosum62ColourScheme
+          || stretchGroup.cs instanceof PIDColourScheme
+          || stretchGroup.cs.conservationApplied()
+          || stretchGroup.cs.getThreshold() > 0)
+      {
+        stretchGroup.recalcConservation();
+      }
 
-        if (scrollThread != null)
-        {
-            scrollThread.setEvent(evt);
-        }
+      if (stretchGroup.cs.conservationApplied())
+      {
+        SliderPanel.setConservationSlider(ap, stretchGroup.cs,
+                                          stretchGroup.getName());
+      }
+      else
+      {
+        SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,
+                                       stretchGroup.getName());
+      }
+    }
+    changeEndRes = false;
+    changeStartRes = false;
+    stretchGroup = null;
+
+    PaintRefresher.Refresh(this, av.getSequenceSetId());
+    ap.paintAlignment(true);
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param evt DOCUMENT ME!
+   */
+  public void doMouseDraggedDefineMode(MouseEvent evt)
+  {
+    int res = findRes(evt);
+    int y = findSeq(evt);
+
+    if (wrappedBlock != startWrapBlock)
+    {
+      return;
+    }
 
-        seqCanvas.repaint();
+    if (stretchGroup == null)
+    {
+      return;
     }
 
+    if (res >= av.alignment.getWidth())
+    {
+      res = av.alignment.getWidth() - 1;
+    }
 
+    if (stretchGroup.getEndRes() == res)
+    {
+      // Edit end res position of selected group
+      changeEndRes = true;
+    }
+    else if (stretchGroup.getStartRes() == res)
+    {
+      // Edit start res position of selected group
+      changeStartRes = true;
+    }
 
-    // this class allows scrolling off the bottom of the visible alignment
-    class ScrollThread extends Thread
+    if (res < av.getStartRes())
     {
-        MouseEvent evt;
-        boolean running = false;
+      res = av.getStartRes();
+    }
 
-        public ScrollThread()
+    if (changeEndRes)
+    {
+      if (res > (stretchGroup.getStartRes() - 1))
+      {
+        stretchGroup.setEndRes(res);
+      }
+    }
+    else if (changeStartRes)
+    {
+      if (res < (stretchGroup.getEndRes() + 1))
+      {
+        stretchGroup.setStartRes(res);
+      }
+    }
+
+    int dragDirection = 0;
+
+    if (y > oldSeq)
+    {
+      dragDirection = 1;
+    }
+    else if (y < oldSeq)
+    {
+      dragDirection = -1;
+    }
+
+    while ( (y != oldSeq) && (oldSeq > -1) && (y < av.alignment.getHeight()))
+    {
+      // This routine ensures we don't skip any sequences, as the
+      // selection is quite slow.
+      Sequence seq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);
+
+      oldSeq += dragDirection;
+
+      if (oldSeq < 0)
+      {
+        break;
+      }
+
+      Sequence nextSeq = (Sequence) av.getAlignment().getSequenceAt(oldSeq);
+
+      if (stretchGroup.getSequences(null).contains(nextSeq))
+      {
+        stretchGroup.deleteSequence(seq, false);
+      }
+      else
+      {
+        if (seq != null)
         {
-            start();
+          stretchGroup.addSequence(seq, false);
         }
 
-        public void setEvent(MouseEvent e)
+        stretchGroup.addSequence(nextSeq, false);
+      }
+    }
+
+    if (oldSeq < 0)
+    {
+      oldSeq = -1;
+    }
+
+    mouseDragging = true;
+
+    if (scrollThread != null)
+    {
+      scrollThread.setEvent(evt);
+    }
+
+    seqCanvas.repaint();
+  }
+
+  void scrollCanvas(MouseEvent evt)
+  {
+    if (evt == null)
+    {
+      if (scrollThread != null)
+      {
+        scrollThread.running = false;
+        scrollThread = null;
+      }
+      mouseDragging = false;
+    }
+    else
+    {
+      if (scrollThread == null)
+      {
+        scrollThread = new ScrollThread();
+      }
+
+      mouseDragging = true;
+      scrollThread.setEvent(evt);
+    }
+
+  }
+
+  // this class allows scrolling off the bottom of the visible alignment
+  class ScrollThread
+      extends Thread
+  {
+    MouseEvent evt;
+    boolean running = false;
+
+    public ScrollThread()
+    {
+      start();
+    }
+
+    public void setEvent(MouseEvent e)
+    {
+      evt = e;
+    }
+
+    public void stopScrolling()
+    {
+      running = false;
+    }
+
+    public void run()
+    {
+      running = true;
+
+      while (running)
+      {
+        if (evt != null)
         {
-            evt = e;
+          if (mouseDragging && (evt.getY() < 0) &&
+              (av.getStartSeq() > 0))
+          {
+            running = ap.scrollUp(true);
+          }
+
+          if (mouseDragging && (evt.getY() >= getHeight()) &&
+              (av.alignment.getHeight() > av.getEndSeq()))
+          {
+            running = ap.scrollUp(false);
+          }
+
+          if (mouseDragging && (evt.getX() < 0))
+          {
+            running = ap.scrollRight(false);
+          }
+          else if (mouseDragging && (evt.getX() >= getWidth()))
+          {
+            running = ap.scrollRight(true);
+          }
         }
 
-        public void stopScrolling()
+        try
         {
-            running = false;
+          Thread.sleep(20);
         }
-
-        public void run()
+        catch (Exception ex)
         {
-            running = true;
-
-            while (running)
-            {
-                if (evt != null)
-                {
-                    if (mouseDragging && (evt.getY() < 0) &&
-                            (av.getStartSeq() > 0))
-                    {
-                        running = ap.scrollUp(true);
-                    }
-
-                    if (mouseDragging && (evt.getY() >= getHeight()) &&
-                            (av.alignment.getHeight() > av.getEndSeq()))
-                    {
-                        running = ap.scrollUp(false);
-                    }
-
-                    if (mouseDragging && (evt.getX() < 0))
-                    {
-                        running = ap.scrollRight(false);
-                    }
-                    else if (mouseDragging && (evt.getX() >= getWidth()))
-                    {
-                        running = ap.scrollRight(true);
-                    }
-                }
-
-                try
-                {
-                    Thread.sleep(20);
-                }
-                catch (Exception ex)
-                {
-                }
-            }
         }
+      }
     }
+  }
 }