merge from 2_4_Release branch
[jalview.git] / src / jalview / gui / SeqPanel.java
index 7d451da..bdfcef4 100755 (executable)
@@ -1,17 +1,17 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
+ * Copyright (C) 2008 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
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
@@ -31,13 +31,12 @@ import jalview.structure.*;
 
 /**
  * DOCUMENT ME!
- *
+ * 
  * @author $author$
  * @version $Revision$
  */
-public class SeqPanel
-    extends JPanel implements MouseListener,
-    MouseMotionListener, MouseWheelListener, SequenceListener
+public class SeqPanel extends JPanel implements MouseListener,
+        MouseMotionListener, MouseWheelListener, SequenceListener
 
 {
   /** DOCUMENT ME!! */
@@ -45,46 +44,63 @@ public class SeqPanel
 
   /** 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
-  //////////////////////////////////////////
+  // ////////////////////////////////////////
+  // ///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!
+   * 
+   * @param avp
+   *                DOCUMENT ME!
+   * @param p
+   *                DOCUMENT ME!
    */
   public SeqPanel(AlignViewport av, AlignmentPanel ap)
   {
@@ -112,7 +128,9 @@ public class SeqPanel
   }
 
   int startWrapBlock = -1;
+
   int wrappedBlock = -1;
+
   int findRes(MouseEvent evt)
   {
     int res = 0;
@@ -127,8 +145,8 @@ public class SeqPanel
         hgap += av.charHeight;
       }
 
-      int cHeight = av.getAlignment().getHeight() * av.charHeight
-          + hgap + seqCanvas.getAnnotationHeight();
+      int cHeight = av.getAlignment().getHeight() * av.charHeight + hgap
+              + seqCanvas.getAnnotationHeight();
 
       int y = evt.getY();
       y -= hgap;
@@ -173,18 +191,18 @@ public class SeqPanel
         hgap += av.charHeight;
       }
 
-      int cHeight = av.getAlignment().getHeight() * av.charHeight
-          + hgap + seqCanvas.getAnnotationHeight();
+      int cHeight = av.getAlignment().getHeight() * av.charHeight + hgap
+              + seqCanvas.getAnnotationHeight();
 
       y -= hgap;
 
-      seq = Math.min( (y % cHeight) / av.getCharHeight(),
-                     av.alignment.getHeight() - 1);
+      seq = Math.min((y % cHeight) / av.getCharHeight(), av.alignment
+              .getHeight() - 1);
     }
     else
     {
-      seq = Math.min( (y / av.getCharHeight()) + av.getStartSeq(),
-                     av.alignment.getHeight() - 1);
+      seq = Math.min((y / av.getCharHeight()) + av.getStartSeq(),
+              av.alignment.getHeight() - 1);
     }
 
     return seq;
@@ -199,20 +217,21 @@ public class SeqPanel
       for (int i = 0; i < features.length; i++)
       {
         if (av.featuresDisplayed == null
-            || !av.featuresDisplayed.containsKey(features[i].getType()))
+                || !av.featuresDisplayed.containsKey(features[i].getType()))
         {
           continue;
         }
 
         if (features[i].featureGroup != null
-           && seqCanvas.fr.featureGroups!=null
-            && seqCanvas.fr.featureGroups.containsKey(features[i].featureGroup)
-            && !((Boolean)seqCanvas.fr.featureGroups.get(features[i].featureGroup)).booleanValue())
+                && seqCanvas.fr.featureGroups != null
+                && seqCanvas.fr.featureGroups
+                        .containsKey(features[i].featureGroup)
+                && !((Boolean) seqCanvas.fr.featureGroups
+                        .get(features[i].featureGroup)).booleanValue())
           continue;
 
-
-        if ( (features[i].getBegin() <= res) &&
-            (features[i].getEnd() >= res))
+        if ((features[i].getBegin() <= res)
+                && (features[i].getEnd() >= res))
         {
           tmp.addElement(features[i]);
         }
@@ -225,14 +244,13 @@ public class SeqPanel
     return features;
   }
 
-
   void endEditing()
   {
     if (editCommand != null && editCommand.getSize() > 0)
     {
       ap.alignFrame.addHistoryItem(editCommand);
-      av.firePropertyChange("alignment", null,
-                            av.getAlignment().getSequences());
+      av.firePropertyChange("alignment", null, av.getAlignment()
+              .getSequences());
     }
 
     startseq = -1;
@@ -272,12 +290,10 @@ public class SeqPanel
 
   void setCursorPosition()
   {
-    SequenceI sequence =
-        (Sequence) av.getAlignment().getSequenceAt(seqCanvas.cursorY);
+    SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(
+            seqCanvas.cursorY);
 
-    seqCanvas.cursorX = sequence.findIndex(
-        getKeyboardNo1() - 1
-        );
+    seqCanvas.cursorX = sequence.findIndex(getKeyboardNo1() - 1);
     scrollToVisible();
   }
 
@@ -291,14 +307,13 @@ public class SeqPanel
       int maxWidth = av.alignment.getWidth();
 
       while (!av.colSel.isVisible(seqCanvas.cursorX)
-             && seqCanvas.cursorX < maxWidth
-             && seqCanvas.cursorX > 0)
+              && seqCanvas.cursorX < maxWidth && seqCanvas.cursorX > 0)
       {
         seqCanvas.cursorX += dx;
       }
 
       if (seqCanvas.cursorX >= maxWidth
-          || !av.colSel.isVisible(seqCanvas.cursorX))
+              || !av.colSel.isVisible(seqCanvas.cursorX))
       {
         seqCanvas.cursorX = original;
       }
@@ -344,14 +359,16 @@ public class SeqPanel
       }
       if (!av.wrapAlignment)
       {
-        while (seqCanvas.cursorX < av.colSel.adjustForHiddenColumns(av.startRes))
+        while (seqCanvas.cursorX < av.colSel
+                .adjustForHiddenColumns(av.startRes))
         {
           if (!ap.scrollRight(false))
           {
             break;
           }
         }
-        while (seqCanvas.cursorX > av.colSel.adjustForHiddenColumns(av.endRes))
+        while (seqCanvas.cursorX > av.colSel
+                .adjustForHiddenColumns(av.endRes))
         {
           if (!ap.scrollRight(true))
           {
@@ -361,20 +378,20 @@ public class SeqPanel
       }
     }
     setStatusMessage(av.alignment.getSequenceAt(seqCanvas.cursorY),
-                     seqCanvas.cursorX, seqCanvas.cursorY);
+            seqCanvas.cursorX, seqCanvas.cursorY);
 
     seqCanvas.repaint();
   }
 
   void setSelectionAreaAtCursor(boolean topLeft)
   {
-    SequenceI sequence =
-        (Sequence) av.getAlignment().getSequenceAt(seqCanvas.cursorY);
+    SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(
+            seqCanvas.cursorY);
 
     if (av.getSelectionGroup() != null)
     {
       SequenceGroup sg = av.selectionGroup;
-      //Find the top and bottom of this group
+      // Find the top and bottom of this group
       int min = av.alignment.getHeight(), max = 0;
       for (int i = 0; i < sg.getSize(); i++)
       {
@@ -501,8 +518,9 @@ public class SeqPanel
 
   /**
    * DOCUMENT ME!
-   *
-   * @param evt DOCUMENT ME!
+   * 
+   * @param evt
+   *                DOCUMENT ME!
    */
   public void mouseReleased(MouseEvent evt)
   {
@@ -520,8 +538,9 @@ public class SeqPanel
 
   /**
    * DOCUMENT ME!
-   *
-   * @param evt DOCUMENT ME!
+   * 
+   * @param evt
+   *                DOCUMENT ME!
    */
   public void mousePressed(MouseEvent evt)
   {
@@ -533,8 +552,7 @@ public class SeqPanel
       return;
     }
 
-    if (evt.isShiftDown() || evt.isAltDown() ||
-        evt.isControlDown())
+    if (evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())
     {
       if (evt.isAltDown() || evt.isControlDown())
       {
@@ -556,8 +574,8 @@ public class SeqPanel
       return;
     }
 
-    if ( (seq < av.getAlignment().getHeight()) &&
-        (res < av.getAlignment().getSequenceAt(seq).getLength()))
+    if ((seq < av.getAlignment().getHeight())
+            && (res < av.getAlignment().getSequenceAt(seq).getLength()))
     {
       startseq = seq;
       lastres = res;
@@ -572,10 +590,11 @@ public class SeqPanel
   }
 
   String lastMessage;
+
   public void mouseOverSequence(SequenceI sequence, int index, int pos)
   {
-    String tmp = sequence.hashCode()+" "+index+" "+pos;
-    
+    String tmp = sequence.hashCode() + " " + index + " " + pos;
+
     if (lastMessage == null || !lastMessage.equals(tmp))
     {
       // System.err.println("mouseOver Sequence: "+tmp);
@@ -584,22 +603,22 @@ public class SeqPanel
     lastMessage = tmp;
   }
 
-
   public void highlightSequence(SearchResults results)
   {
-      seqCanvas.highlightSearchResults(results);
+    seqCanvas.highlightSearchResults(results);
   }
 
   public void updateColours(SequenceI seq, int index)
   {
     System.out.println("update the seqPanel colours");
-    //repaint();
+    // repaint();
   }
 
   /**
    * DOCUMENT ME!
-   *
-   * @param evt DOCUMENT ME!
+   * 
+   * @param evt
+   *                DOCUMENT ME!
    */
   public void mouseMoved(MouseEvent evt)
   {
@@ -626,10 +645,9 @@ public class SeqPanel
     }
 
     pos = setStatusMessage(sequence, res, seq);
-    if (ssm != null && pos>-1)
+    if (ssm != null && pos > -1)
       mouseOverSequence(sequence, res, pos);
 
-
     tooltipText.setLength(6); // Cuts the buffer back to <html>
 
     SequenceGroup[] groups = av.alignment.findAllGroups(sequence);
@@ -644,8 +662,8 @@ public class SeqPanel
             tooltipText.append("<br>");
           }
 
-          if (!groups[g].getName().startsWith("JTreeGroup") &&
-              !groups[g].getName().startsWith("JGroup"))
+          if (!groups[g].getName().startsWith("JTreeGroup")
+                  && !groups[g].getName().startsWith("JGroup"))
           {
             tooltipText.append(groups[g].getName());
           }
@@ -661,8 +679,8 @@ public class SeqPanel
     // use aa to see if the mouse pointer is on a
     if (av.showSequenceFeatures)
     {
-      SequenceFeature[] features = findFeaturesAtRes(
-          sequence.getDatasetSequence(), sequence.findPosition(res));
+      SequenceFeature[] features = findFeaturesAtRes(sequence
+              .getDatasetSequence(), sequence.findPosition(res));
 
       if (features != null)
       {
@@ -671,15 +689,14 @@ public class SeqPanel
           if (features[i].getType().equals("disulfide bond"))
           {
             if (features[i].getBegin() == sequence.findPosition(res)
-                || features[i].getEnd() == sequence.findPosition(res))
+                    || features[i].getEnd() == sequence.findPosition(res))
             {
               if (tooltipText.length() > 6)
               {
                 tooltipText.append("<br>");
               }
-              tooltipText.append("disulfide bond " + features[i].getBegin() +
-                                 ":" +
-                                 features[i].getEnd());
+              tooltipText.append("disulfide bond " + features[i].getBegin()
+                      + ":" + features[i].getEnd());
               if (features[i].links != null)
               {
                 tooltipText.append(" <img src=\"" + linkImageURL + "\">");
@@ -693,15 +710,16 @@ public class SeqPanel
               tooltipText.append("<br>");
             }
 
-            tooltipText.append(features[i].getType() + " " +
-                               features[i].begin);
+            tooltipText.append(features[i].getType() + " "
+                    + features[i].begin);
             if (features[i].begin != features[i].end)
             {
               tooltipText.append(" " + features[i].end);
             }
 
             if (features[i].getDescription() != null
-                && !features[i].description.equals(features[i].getType()))
+                    && !features[i].description.equals(features[i]
+                            .getType()))
             {
               tmpString = features[i].getDescription();
               int startTag = tmpString.toUpperCase().indexOf("<HTML>");
@@ -726,10 +744,11 @@ public class SeqPanel
               }
               else
               {
-                if (tmpString.indexOf("<") > -1 || tmpString.indexOf(">") > -1)
+                if (tmpString.indexOf("<") > -1
+                        || tmpString.indexOf(">") > -1)
                 {
-                  //The description does not specify html is to
-                  //be used, so we must remove < > symbols
+                  // The description does not specify html is to
+                  // be used, so we must remove < > symbols
                   tmpString = tmpString.replaceAll("<", "&lt;");
                   tmpString = tmpString.replaceAll(">", "&gt;");
 
@@ -748,7 +767,8 @@ public class SeqPanel
               String status = features[i].getValue("status").toString();
               if (status.length() > 0)
               {
-                tooltipText.append("; (" + features[i].getValue("status") + ")");
+                tooltipText.append("; (" + features[i].getValue("status")
+                        + ")");
               }
             }
 
@@ -769,33 +789,39 @@ public class SeqPanel
     else
     {
       tooltipText.append("</html>");
-      if (lastTooltip == null || !lastTooltip.equals(tooltipText.toString()))
+      if (lastTooltip == null
+              || !lastTooltip.equals(tooltipText.toString()))
         setToolTipText(tooltipText.toString());
 
       lastTooltip = tooltipText.toString();
     }
 
   }
+
   String lastTooltip;
 
   /**
    * Set status message in alignment panel
-   * @param sequence aligned sequence object
-   * @param res alignment column
-   * @param seq index of sequence in alignment
+   * 
+   * @param sequence
+   *                aligned sequence object
+   * @param res
+   *                alignment column
+   * @param seq
+   *                index of sequence in alignment
    * @return position of res in sequence
    */
   int setStatusMessage(SequenceI sequence, int res, int seq)
   {
-    int pos=-1;
-    StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: " +
-                                         sequence.getName());
+    int pos = -1;
+    StringBuffer text = new StringBuffer("Sequence " + (seq + 1) + " ID: "
+            + sequence.getName());
 
     Object obj = null;
     if (av.alignment.isNucleotide())
     {
-      obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res) +
-                                                 "");
+      obj = ResidueProperties.nucleotideName.get(sequence.getCharAt(res)
+              + "");
       if (obj != null)
       {
         text.append(" Nucleotide: ");
@@ -812,11 +838,10 @@ public class SeqPanel
 
     if (obj != null)
     {
-      pos=sequence.findPosition(res);
+      pos = sequence.findPosition(res);
       if (obj != "")
       {
-        text.append(obj + " (" + pos +
-                    ")");
+        text.append(obj + " (" + pos + ")");
       }
     }
     ap.alignFrame.statusBar.setText(text.toString());
@@ -825,8 +850,9 @@ public class SeqPanel
 
   /**
    * DOCUMENT ME!
-   *
-   * @param evt DOCUMENT ME!
+   * 
+   * @param evt
+   *                DOCUMENT ME!
    */
   public void mouseDragged(MouseEvent evt)
   {
@@ -834,9 +860,10 @@ public class SeqPanel
     {
       int oldWidth = av.charWidth;
 
-      //Which is bigger, left-right or up-down?
-      if (Math.abs(evt.getY() - lastMousePress.getY())
-          > Math.abs(evt.getX() - lastMousePress.getX()))
+      // 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();
 
@@ -854,7 +881,9 @@ public class SeqPanel
           fontSize = 1;
         }
 
-        av.setFont(new Font(av.font.getName(), av.font.getStyle(), fontSize));
+        av
+                .setFont(new Font(av.font.getName(), av.font.getStyle(),
+                        fontSize));
         av.charWidth = oldWidth;
         ap.fontChanged();
       }
@@ -893,12 +922,12 @@ public class SeqPanel
       res = 0;
     }
 
-    if ( (lastres == -1) || (lastres == res))
+    if ((lastres == -1) || (lastres == res))
     {
       return;
     }
 
-    if ( (res < av.getAlignment().getWidth()) && (res < lastres))
+    if ((res < av.getAlignment().getWidth()) && (res < lastres))
     {
       // dragLeft, delete gap
       editSequence(false, res);
@@ -915,8 +944,6 @@ public class SeqPanel
     }
   }
 
-
-
   synchronized void editSequence(boolean insertGap, int startres)
   {
     int fixedLeft = -1;
@@ -926,11 +953,11 @@ public class SeqPanel
 
     SequenceI seq = av.alignment.getSequenceAt(startseq);
 
-    //No group, but the sequence may represent a group
+    // No group, but the sequence may represent a group
     if (!groupEditing && av.hasHiddenRows)
     {
       if (av.hiddenRepSequences != null
-          && av.hiddenRepSequences.containsKey(seq))
+              && av.hiddenRepSequences.containsKey(seq))
       {
         sg = (SequenceGroup) av.hiddenRepSequences.get(seq);
         groupEditing = true;
@@ -972,18 +999,19 @@ public class SeqPanel
     message.append(Math.abs(startres - lastres) + " gaps.");
     ap.alignFrame.statusBar.setText(message.toString());
 
-    //Are we editing within a selection group?
+    // Are we editing within a selection group?
     if (groupEditing
-        || (sg != null && sg.getSequences(av.hiddenRepSequences).contains(seq)))
+            || (sg != null && sg.getSequences(av.hiddenRepSequences)
+                    .contains(seq)))
     {
       fixedColumns = true;
 
-      //sg might be null as the user may only see 1 sequence,
-      //but the sequence represents a group
+      // sg might be null as the user may only see 1 sequence,
+      // but the sequence represents a group
       if (sg == null)
       {
         if (av.hiddenRepSequences == null
-            || !av.hiddenRepSequences.containsKey(seq))
+                || !av.hiddenRepSequences.containsKey(seq))
         {
           endEditing();
           return;
@@ -994,10 +1022,10 @@ public class SeqPanel
       fixedLeft = sg.getStartRes();
       fixedRight = sg.getEndRes();
 
-      if ( (startres < fixedLeft && lastres >= fixedLeft)
-          || (startres >= fixedLeft && lastres < fixedLeft)
-          || (startres > fixedRight && lastres <= fixedRight)
-          || (startres <= fixedRight && lastres > fixedRight))
+      if ((startres < fixedLeft && lastres >= fixedLeft)
+              || (startres >= fixedLeft && lastres < fixedLeft)
+              || (startres > fixedRight && lastres <= fixedRight)
+              || (startres <= fixedRight && lastres > fixedRight))
       {
         endEditing();
         return;
@@ -1021,15 +1049,15 @@ public class SeqPanel
       int y1 = av.getColumnSelection().getHiddenBoundaryLeft(startres);
       int y2 = av.getColumnSelection().getHiddenBoundaryRight(startres);
 
-      if ( (insertGap && startres > y1 && lastres < y1)
-          || (!insertGap && startres < y2 && lastres > y2))
+      if ((insertGap && startres > y1 && lastres < y1)
+              || (!insertGap && startres < y2 && lastres > y2))
       {
         endEditing();
         return;
       }
 
-      //System.out.print(y1+" "+y2+" "+fixedLeft+" "+fixedRight+"~~");
-      //Selection spans a hidden region
+      // System.out.print(y1+" "+y2+" "+fixedLeft+" "+fixedRight+"~~");
+      // Selection spans a hidden region
       if (fixedLeft < y1 && (fixedRight > y2 || fixedRight == -1))
       {
         if (startres >= y2)
@@ -1056,12 +1084,10 @@ public class SeqPanel
       // drag to right
       if (insertGap)
       {
-        //If the user has selected the whole sequence, and is dragging to
+        // 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
-            )
+        if (sg.getStartRes() == 0 && sg.getEndRes() == fixedRight
+                && sg.getEndRes() == av.alignment.getWidth() - 1)
         {
           sg.setEndRes(av.alignment.getWidth() + startres - lastres);
           fixedRight = sg.getEndRes();
@@ -1071,9 +1097,7 @@ public class SeqPanel
         // Find the next gap before the end
         // of the visible region boundary
         boolean blank = false;
-        for (fixedRight = fixedRight;
-             fixedRight > lastres;
-             fixedRight--)
+        for (fixedRight = fixedRight; fixedRight > lastres; fixedRight--)
         {
           blank = true;
 
@@ -1081,8 +1105,8 @@ public class SeqPanel
           {
             for (int j = 0; j < startres - lastres; j++)
             {
-              if (!jalview.util.Comparison.isGap(
-                  groupSeqs[g].getCharAt(fixedRight - j)))
+              if (!jalview.util.Comparison.isGap(groupSeqs[g]
+                      .getCharAt(fixedRight - j)))
               {
                 blank = false;
                 break;
@@ -1099,9 +1123,8 @@ public class SeqPanel
         {
           if (sg.getSize() == av.alignment.getHeight())
           {
-            if ( (av.hasHiddenColumns
-                  &&
-                  startres < av.getColumnSelection().getHiddenBoundaryRight(startres)))
+            if ((av.hasHiddenColumns && startres < av.getColumnSelection()
+                    .getHiddenBoundaryRight(startres)))
             {
               endEditing();
               return;
@@ -1116,8 +1139,8 @@ public class SeqPanel
                 alWidth = hwidth;
               }
             }
-            //We can still insert gaps if the selectionGroup
-            //contains all the sequences
+            // We can still insert gaps if the selectionGroup
+            // contains all the sequences
             sg.setEndRes(sg.getEndRes() + startres - lastres);
             fixedRight = alWidth + startres - lastres;
           }
@@ -1132,7 +1155,7 @@ public class SeqPanel
       // drag to left
       else if (!insertGap)
       {
-        /// Are we able to delete?
+        // / Are we able to delete?
         // ie are all columns blank?
 
         for (g = 0; g < groupSize; g++)
@@ -1144,8 +1167,7 @@ public class SeqPanel
               continue;
             }
 
-            if (!jalview.util.Comparison.isGap(
-                groupSeqs[g].getCharAt(j)))
+            if (!jalview.util.Comparison.isGap(groupSeqs[g].getCharAt(j)))
             {
               // Not a gap, block edit not valid
               endEditing();
@@ -1167,11 +1189,8 @@ public class SeqPanel
         }
         else
         {
-          editCommand.appendEdit(EditCommand.INSERT_GAP,
-                                 groupSeqs,
-                                 startres, startres - lastres,
-                                 av.alignment,
-                                 true);
+          editCommand.appendEdit(EditCommand.INSERT_GAP, groupSeqs,
+                  startres, startres - lastres, av.alignment, true);
         }
       }
       else
@@ -1186,16 +1205,14 @@ public class SeqPanel
         }
         else
         {
-          editCommand.appendEdit(EditCommand.DELETE_GAP,
-                                 groupSeqs,
-                                 startres, lastres - startres,
-                                 av.alignment,
-                                 true);
+          editCommand.appendEdit(EditCommand.DELETE_GAP, groupSeqs,
+                  startres, lastres - startres, av.alignment, true);
         }
 
       }
     }
-    else /////Editing a single sequence///////////
+    else
+    // ///Editing a single sequence///////////
     {
       if (insertGap)
       {
@@ -1205,17 +1222,13 @@ public class SeqPanel
           for (int j = lastres; j < startres; j++)
           {
             insertChar(j, new SequenceI[]
-                       {seq}, fixedRight);
+            { seq }, fixedRight);
           }
         }
         else
         {
-          editCommand.appendEdit(EditCommand.INSERT_GAP,
-                                 new SequenceI[]
-                                 {seq},
-                                 lastres, startres - lastres,
-                                 av.alignment,
-                                 true);
+          editCommand.appendEdit(EditCommand.INSERT_GAP, new SequenceI[]
+          { seq }, lastres, startres - lastres, av.alignment, true);
         }
       }
       else
@@ -1231,12 +1244,12 @@ public class SeqPanel
               break;
             }
             deleteChar(startres, new SequenceI[]
-                       {seq}, fixedRight);
+            { seq }, fixedRight);
           }
         }
         else
         {
-          //could be a keyboard edit trying to delete none gaps
+          // could be a keyboard edit trying to delete none gaps
           int max = 0;
           for (int m = startres; m < lastres; m++)
           {
@@ -1249,12 +1262,8 @@ public class SeqPanel
 
           if (max > 0)
           {
-            editCommand.appendEdit(EditCommand.DELETE_GAP,
-                                   new SequenceI[]
-                                   {seq},
-                                   startres, max,
-                                   av.alignment,
-                                   true);
+            editCommand.appendEdit(EditCommand.DELETE_GAP, new SequenceI[]
+            { seq }, startres, max, av.alignment, true);
           }
         }
       }
@@ -1269,14 +1278,14 @@ public class SeqPanel
     int blankColumn = fixedColumn;
     for (int s = 0; s < seq.length; s++)
     {
-      //Find the next gap before the end of the visible region boundary
-      //If lastCol > j, theres a boundary after the gap insertion
+      // 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
+          // Theres a space, so break and insert the gap
           break;
         }
       }
@@ -1289,33 +1298,29 @@ public class SeqPanel
       }
     }
 
-    editCommand.appendEdit(EditCommand.DELETE_GAP,
-                           seq,
-                           blankColumn, 1, av.alignment, true);
+    editCommand.appendEdit(EditCommand.DELETE_GAP, seq, blankColumn, 1,
+            av.alignment, true);
 
-    editCommand.appendEdit(EditCommand.INSERT_GAP,
-                           seq,
-                           j, 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.DELETE_GAP, seq, j, 1, av.alignment,
+            true);
 
-    editCommand.appendEdit(EditCommand.INSERT_GAP,
-                           seq,
-                           fixedColumn, 1, av.alignment, true);
+    editCommand.appendEdit(EditCommand.INSERT_GAP, seq, fixedColumn, 1,
+            av.alignment, true);
   }
 
   /**
    * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
+   * 
+   * @param e
+   *                DOCUMENT ME!
    */
   public void mouseEntered(MouseEvent e)
   {
@@ -1333,8 +1338,9 @@ public class SeqPanel
 
   /**
    * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
+   * 
+   * @param e
+   *                DOCUMENT ME!
    */
   public void mouseExited(MouseEvent e)
   {
@@ -1355,30 +1361,26 @@ public class SeqPanel
     if (evt.getClickCount() > 1)
     {
       if (av.getSelectionGroup().getSize() == 1
-          && av.getSelectionGroup().getEndRes()
-          - av.getSelectionGroup().getStartRes() < 2)
+              && av.getSelectionGroup().getEndRes()
+                      - av.getSelectionGroup().getStartRes() < 2)
       {
         av.setSelectionGroup(null);
       }
 
-      SequenceFeature[] features = findFeaturesAtRes(
-          sequence.getDatasetSequence(),
-          sequence.findPosition(findRes(evt))
-          );
+      SequenceFeature[] features = findFeaturesAtRes(sequence
+              .getDatasetSequence(), sequence.findPosition(findRes(evt)));
 
       if (features != null && features.length > 0)
       {
         SearchResults highlight = new SearchResults();
-        highlight.addResult(sequence,
-                            features[0].getBegin(),
-                            features[0].getEnd());
+        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);
+        seqCanvas.getFeatureRenderer().amendFeatures(new SequenceI[]
+        { sequence }, features, false, ap);
 
         seqCanvas.highlightSearchResults(null);
       }
@@ -1388,20 +1390,21 @@ public class SeqPanel
   public void mouseWheelMoved(MouseWheelEvent e)
   {
     e.consume();
-      if (e.getWheelRotation() > 0)
-      {
-        ap.scrollUp(false);
-      }
-      else
-      {
-        ap.scrollUp(true);
-      }
+    if (e.getWheelRotation() > 0)
+    {
+      ap.scrollUp(false);
+    }
+    else
+    {
+      ap.scrollUp(true);
+    }
   }
 
   /**
    * DOCUMENT ME!
-   *
-   * @param evt DOCUMENT ME!
+   * 
+   * @param evt
+   *                DOCUMENT ME!
    */
   public void doMousePressedDefineMode(MouseEvent evt)
   {
@@ -1414,9 +1417,8 @@ public class SeqPanel
     if (av.wrapAlignment && seq > av.alignment.getHeight())
     {
       JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                                            "Cannot edit annotations in wrapped view.",
-                                            "Wrapped view - no edit",
-                                            JOptionPane.WARNING_MESSAGE);
+              "Cannot edit annotations in wrapped view.",
+              "Wrapped view - no edit", JOptionPane.WARNING_MESSAGE);
       return;
     }
 
@@ -1427,7 +1429,7 @@ public class SeqPanel
 
     SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);
 
-    if ( (sequence == null) || (res > sequence.getLength()))
+    if ((sequence == null) || (res > sequence.getLength()))
     {
       return;
     }
@@ -1438,8 +1440,8 @@ public class SeqPanel
     {
       stretchGroup = av.alignment.findGroup(sequence);
 
-      if ( (stretchGroup != null) && (res > stretchGroup.getStartRes()) &&
-          (res < stretchGroup.getEndRes()))
+      if ((stretchGroup != null) && (res > stretchGroup.getStartRes())
+              && (res < stretchGroup.getEndRes()))
       {
         av.setSelectionGroup(stretchGroup);
       }
@@ -1448,9 +1450,9 @@ public class SeqPanel
         stretchGroup = null;
       }
     }
-    else if (!stretchGroup.getSequences(null).contains(sequence) ||
-             (stretchGroup.getStartRes() > res) ||
-             (stretchGroup.getEndRes() < res))
+    else if (!stretchGroup.getSequences(null).contains(sequence)
+            || (stretchGroup.getStartRes() > res)
+            || (stretchGroup.getEndRes() < res))
     {
       stretchGroup = null;
 
@@ -1460,8 +1462,8 @@ public class SeqPanel
       {
         for (int i = 0; i < allGroups.length; i++)
         {
-          if ( (allGroups[i].getStartRes() <= res) &&
-              (allGroups[i].getEndRes() >= res))
+          if ((allGroups[i].getStartRes() <= res)
+                  && (allGroups[i].getEndRes() >= res))
           {
             stretchGroup = allGroups[i];
             break;
@@ -1475,8 +1477,8 @@ public class SeqPanel
 
     if (javax.swing.SwingUtilities.isRightMouseButton(evt))
     {
-      SequenceFeature [] allFeatures = findFeaturesAtRes(sequence.getDatasetSequence(),
-                                               sequence.findPosition(res));
+      SequenceFeature[] allFeatures = findFeaturesAtRes(sequence
+              .getDatasetSequence(), sequence.findPosition(res));
       Vector links = new Vector();
       for (int i = 0; i < allFeatures.length; i++)
       {
@@ -1504,7 +1506,7 @@ public class SeqPanel
 
     if (stretchGroup == null)
     {
-      //Only if left mouse button do we want to change group sizes
+      // Only if left mouse button do we want to change group sizes
 
       // define a new group here
       SequenceGroup sg = new SequenceGroup();
@@ -1516,23 +1518,22 @@ public class SeqPanel
 
       if (av.getConservationSelected())
       {
-        SliderPanel.setConservationSlider(ap,
-                                          av.getGlobalColourScheme(),
-                                          "Background");
+        SliderPanel.setConservationSlider(ap, av.getGlobalColourScheme(),
+                "Background");
       }
 
       if (av.getAbovePIDThreshold())
       {
         SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),
-                                       "Background");
+                "Background");
       }
-      if ( (stretchGroup != null) && (stretchGroup.getEndRes() == res))
+      if ((stretchGroup != null) && (stretchGroup.getEndRes() == res))
       {
         // Edit end res position of selected group
         changeEndRes = true;
       }
-      else if ( (stretchGroup != null) &&
-               (stretchGroup.getStartRes() == res))
+      else if ((stretchGroup != null)
+              && (stretchGroup.getStartRes() == res))
       {
         // Edit end res position of selected group
         changeStartRes = true;
@@ -1545,8 +1546,9 @@ public class SeqPanel
 
   /**
    * DOCUMENT ME!
-   *
-   * @param evt DOCUMENT ME!
+   * 
+   * @param evt
+   *                DOCUMENT ME!
    */
   public void doMouseReleasedDefineMode(MouseEvent evt)
   {
@@ -1559,28 +1561,28 @@ public class SeqPanel
     {
       if (stretchGroup.cs instanceof ClustalxColourScheme)
       {
-        ( (ClustalxColourScheme) stretchGroup.cs).resetClustalX(
-            stretchGroup.getSequences(av.hiddenRepSequences),
-            stretchGroup.getWidth());
+        ((ClustalxColourScheme) stretchGroup.cs).resetClustalX(stretchGroup
+                .getSequences(av.hiddenRepSequences), stretchGroup
+                .getWidth());
       }
 
       if (stretchGroup.cs instanceof Blosum62ColourScheme
-          || stretchGroup.cs instanceof PIDColourScheme
-          || stretchGroup.cs.conservationApplied()
-          || stretchGroup.cs.getThreshold() > 0)
+              || stretchGroup.cs instanceof PIDColourScheme
+              || stretchGroup.cs.conservationApplied()
+              || stretchGroup.cs.getThreshold() > 0)
       {
         stretchGroup.recalcConservation();
       }
 
       if (stretchGroup.cs.conservationApplied())
       {
-        SliderPanel.setConservationSlider(ap, stretchGroup.cs,
-                                          stretchGroup.getName());
+        SliderPanel.setConservationSlider(ap, stretchGroup.cs, stretchGroup
+                .getName());
       }
       else
       {
-        SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,
-                                       stretchGroup.getName());
+        SliderPanel.setPIDSliderSource(ap, stretchGroup.cs, stretchGroup
+                .getName());
       }
       PaintRefresher.Refresh(this, av.getSequenceSetId());
       ap.paintAlignment(true);
@@ -1594,8 +1596,9 @@ public class SeqPanel
 
   /**
    * DOCUMENT ME!
-   *
-   * @param evt DOCUMENT ME!
+   * 
+   * @param evt
+   *                DOCUMENT ME!
    */
   public void doMouseDraggedDefineMode(MouseEvent evt)
   {
@@ -1659,7 +1662,7 @@ public class SeqPanel
       dragDirection = -1;
     }
 
-    while ( (y != oldSeq) && (oldSeq > -1) && (y < av.alignment.getHeight()))
+    while ((y != oldSeq) && (oldSeq > -1) && (y < av.alignment.getHeight()))
     {
       // This routine ensures we don't skip any sequences, as the
       // selection is quite slow.
@@ -1729,10 +1732,10 @@ public class SeqPanel
   }
 
   // this class allows scrolling off the bottom of the visible alignment
-  class ScrollThread
-      extends Thread
+  class ScrollThread extends Thread
   {
     MouseEvent evt;
+
     boolean running = false;
 
     public ScrollThread()
@@ -1758,14 +1761,13 @@ public class SeqPanel
       {
         if (evt != null)
         {
-          if (mouseDragging && (evt.getY() < 0) &&
-              (av.getStartSeq() > 0))
+          if (mouseDragging && (evt.getY() < 0) && (av.getStartSeq() > 0))
           {
             running = ap.scrollUp(true);
           }
 
-          if (mouseDragging && (evt.getY() >= getHeight()) &&
-              (av.alignment.getHeight() > av.getEndSeq()))
+          if (mouseDragging && (evt.getY() >= getHeight())
+                  && (av.alignment.getHeight() > av.getEndSeq()))
           {
             running = ap.scrollUp(false);
           }
@@ -1783,8 +1785,7 @@ public class SeqPanel
         try
         {
           Thread.sleep(20);
-        }
-        catch (Exception ex)
+        } catch (Exception ex)
         {
         }
       }