X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAlignment.java;h=5d97fe3bd3759235e7ad84571297bc079157e568;hb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;hp=588134ae7ca7cdd3e2f0d4c66f66e024d7e337de;hpb=8963cf56e542ec741295e8c4dfcee06ba3e140fb;p=jalview.git

diff --git a/src/jalview/datamodel/Alignment.java b/src/jalview/datamodel/Alignment.java
index 588134a..5d97fe3 100755
--- a/src/jalview/datamodel/Alignment.java
+++ b/src/jalview/datamodel/Alignment.java
@@ -1,819 +1,1515 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 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
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Copyright (C) 2014 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview 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 3 of the License, or (at your option) any later version.
+ *  
+ * Jalview 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 Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.datamodel;
 
-import jalview.analysis.*;
-
-import jalview.util.*;
-
 import java.util.*;
 
-/** Data structure to hold and manipulate a multiple sequence alignment
+/**
+ * Data structure to hold and manipulate a multiple sequence alignment
+ */
+/**
+ * @author JimP
+ * 
  */
 public class Alignment implements AlignmentI
 {
-    protected Alignment dataset;
-    protected Vector sequences;
-    protected Vector groups = new Vector();
-    protected char gapCharacter = '-';
-    protected int type = NUCLEOTIDE;
-    public static final int PROTEIN = 0;
-    public static final int NUCLEOTIDE = 1;
+  protected Alignment dataset;
 
-    /** DOCUMENT ME!! */
-    public AlignmentAnnotation[] annotations;
+  protected List<SequenceI> sequences;
 
-    HiddenSequences hiddenSequences = new HiddenSequences(this);
+  protected List<SequenceGroup> groups = java.util.Collections
+          .synchronizedList(new ArrayList<SequenceGroup>());
 
-    private void initAlignment(SequenceI[] seqs) {
-      int i=0;
+  protected char gapCharacter = '-';
 
-      if( jalview.util.Comparison.isNucleotide(seqs))
-        type = NUCLEOTIDE;
-      else
-        type = PROTEIN;
+  protected int type = NUCLEOTIDE;
 
-      sequences = new Vector();
+  public static final int PROTEIN = 0;
 
-      for (i = 0; i < seqs.length; i++)
-      {
-        sequences.addElement(seqs[i]);
-      }
+  public static final int NUCLEOTIDE = 1;
+
+  public boolean hasRNAStructure = false;
+
+  /** DOCUMENT ME!! */
+  public AlignmentAnnotation[] annotations;
 
+  HiddenSequences hiddenSequences = new HiddenSequences(this);
+
+  public Hashtable alignmentProperties;
+
+  private void initAlignment(SequenceI[] seqs)
+  {
+    int i = 0;
+
+    if (jalview.util.Comparison.isNucleotide(seqs))
+    {
+      type = NUCLEOTIDE;
     }
-    /** Make an alignment from an array of Sequences.
-     *
-     * @param sequences
-     */
-    public Alignment(SequenceI[] seqs)
+    else
     {
-      initAlignment(seqs);
+      type = PROTEIN;
     }
-    /**
-     * Make a new alignment from an array of SeqCigars
-     * @param seqs SeqCigar[]
-     */
-    public Alignment(SeqCigar[] alseqs) {
 
-      SequenceI[] seqs = new SequenceI[alseqs.length];
-      for (int i=0; i<alseqs.length; i++) {
-        seqs[i] = alseqs[i].getSeq(this.gapCharacter);
-      }
-      initAlignment(seqs);
-    }
-    /**
-     * Make a new alignment from an CigarArray
-     * JBPNote - can only do this when compactAlignment does not contain hidden regions.
-     * JBPNote - must also check that compactAlignment resolves to a set of SeqCigars - or construct them appropriately.
-     * @param compactAlignment CigarArray
-     */
-    public Alignment(CigarArray compactAlignment) {
-      throw new Error("Alignment(CigarArray) not yet implemented");
-      // this(compactAlignment.refCigars);
+    sequences = java.util.Collections
+            .synchronizedList(new ArrayList<SequenceI>());
+
+    for (i = 0; i < seqs.length; i++)
+    {
+      sequences.add(seqs[i]);
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public Vector getSequences()
+  }
+
+  /**
+   * Make an alignment from an array of Sequences.
+   * 
+   * @param sequences
+   */
+  public Alignment(SequenceI[] seqs)
+  {
+    initAlignment(seqs);
+  }
+
+  /**
+   * Make a new alignment from an array of SeqCigars
+   * 
+   * @param seqs
+   *          SeqCigar[]
+   */
+  public Alignment(SeqCigar[] alseqs)
+  {
+    SequenceI[] seqs = SeqCigar.createAlignmentSequences(alseqs,
+            gapCharacter, new ColumnSelection(), null);
+    initAlignment(seqs);
+  }
+
+  /**
+   * Make a new alignment from an CigarArray JBPNote - can only do this when
+   * compactAlignment does not contain hidden regions. JBPNote - must also check
+   * that compactAlignment resolves to a set of SeqCigars - or construct them
+   * appropriately.
+   * 
+   * @param compactAlignment
+   *          CigarArray
+   */
+  public static AlignmentI createAlignment(CigarArray compactAlignment)
+  {
+    throw new Error("Alignment(CigarArray) not yet implemented");
+    // this(compactAlignment.refCigars);
+  }
+
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  @Override
+  public List<SequenceI> getSequences()
+  {
+    return sequences;
+  }
+
+  @Override
+  public List<SequenceI> getSequences(
+          Map<SequenceI, SequenceCollectionI> hiddenReps)
+  {
+    // TODO: in jalview 2.8 we don't do anything with hiddenreps - fix design to
+    // work on this.
+    return sequences;
+  }
+
+  @Override
+  public SequenceI[] getSequencesArray()
+  {
+    if (sequences == null)
+      return null;
+    synchronized (sequences)
     {
-        return sequences;
+      return sequences.toArray(new SequenceI[sequences.size()]);
     }
+  }
 
-    public SequenceI [] getSequencesArray()
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param i
+   *          DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  @Override
+  public SequenceI getSequenceAt(int i)
+  {
+    synchronized (sequences)
     {
-      SequenceI [] reply = new SequenceI[sequences.size()];
-      for(int i=0; i<sequences.size(); i++)
+      if (i > -1 && i < sequences.size())
       {
-        reply[i] = (SequenceI)sequences.elementAt(i);
+        return sequences.get(i);
       }
-      return reply;
     }
+    return null;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param i DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public SequenceI getSequenceAt(int i)
+  /**
+   * Adds a sequence to the alignment. Recalculates maxLength and size.
+   * 
+   * @param snew
+   */
+  @Override
+  public void addSequence(SequenceI snew)
+  {
+    if (dataset != null)
     {
-        if (i < sequences.size())
-        {
-            return (SequenceI) sequences.elementAt(i);
-        }
-
-        return null;
+      // maintain dataset integrity
+      if (snew.getDatasetSequence() != null)
+      {
+        getDataset().addSequence(snew.getDatasetSequence());
+      }
+      else
+      {
+        // derive new sequence
+        SequenceI adding = snew.deriveSequence();
+        getDataset().addSequence(adding.getDatasetSequence());
+        snew = adding;
+      }
     }
-
-    /** Adds a sequence to the alignment.  Recalculates maxLength and size.
-     *
-     * @param snew
-     */
-    public void addSequence(SequenceI snew)
+    if (sequences == null)
     {
-      if(dataset!=null)
+      initAlignment(new SequenceI[]
+      { snew });
+    }
+    else
+    {
+      synchronized (sequences)
       {
-        if(snew.getDatasetSequence()!=null)
-        {
-          System.out.println(snew.getName());
-          getDataset().addSequence(snew.getDatasetSequence());
-        }
-        else
-        {
-          Sequence ds = new Sequence(snew.getName(),
-                                     AlignSeq.extractGaps("-. ",
-              snew.getSequence()),
-                                     snew.getStart(),
-                                     snew.getEnd());
-
-          snew.setDatasetSequence(ds);
-          getDataset().addSequence(ds);
-        }
+        sequences.add(snew);
       }
+    }
+    if (hiddenSequences != null)
+      hiddenSequences.adjustHeightSequenceAdded();
+  }
 
-      sequences.addElement(snew);
+  /**
+   * Adds a sequence to the alignment. Recalculates maxLength and size.
+   * 
+   * @param snew
+   */
+  @Override
+  public void setSequenceAt(int i, SequenceI snew)
+  {
+    SequenceI oldseq = getSequenceAt(i);
+    deleteSequence(i);
+    synchronized (sequences)
+    {
+      sequences.set(i, snew);
     }
+  }
 
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  @Override
+  public List<SequenceGroup> getGroups()
+  {
+    return groups;
+  }
 
-    /** Adds a sequence to the alignment.  Recalculates maxLength and size.
-     *
-     * @param snew
-     */
-    public void setSequenceAt(int i, SequenceI snew)
-    {
-        SequenceI oldseq = getSequenceAt(i);
-        deleteSequence(oldseq);
+  @Override
+  public void finalize()
+  {
+    if (getDataset() != null)
+      getDataset().removeAlignmentRef();
+
+    dataset = null;
+    sequences = null;
+    groups = null;
+    annotations = null;
+    hiddenSequences = null;
+  }
 
-        sequences.setElementAt(snew, i);
+  /**
+   * decrement the alignmentRefs counter by one and call finalize if it goes to
+   * zero.
+   */
+  private void removeAlignmentRef()
+  {
+    if (--alignmentRefs == 0)
+    {
+      finalize();
     }
+  }
+
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param s
+   *          DOCUMENT ME!
+   */
+  @Override
+  public void deleteSequence(SequenceI s)
+  {
+    deleteSequence(findIndex(s));
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public Vector getGroups()
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param i
+   *          DOCUMENT ME!
+   */
+  @Override
+  public void deleteSequence(int i)
+  {
+    if (i > -1 && i < getHeight())
     {
-        return groups;
+      synchronized (sequences)
+      {
+        sequences.remove(i);
+      }
+      hiddenSequences.adjustHeightSequenceDeleted(i);
     }
+  }
 
-    /** Takes out columns consisting entirely of gaps (-,.," ")
-     */
-    public void removeGaps()
+  /*
+   * (non-Javadoc)
+   * 
+   * @see jalview.datamodel.AlignmentI#findGroup(jalview.datamodel.SequenceI)
+   */
+  @Override
+  public SequenceGroup findGroup(SequenceI s)
+  {
+    synchronized (groups)
     {
-        SequenceI[] seqs = getVisibleAndRepresentedSeqs();
-        int j, jSize = seqs.length;
+      for (int i = 0; i < this.groups.size(); i++)
+      {
+        SequenceGroup sg = groups.get(i);
 
-        int width = 0;
-        for (int i = 0; i < jSize; i++)
+        if (sg.getSequences(null).contains(s))
         {
-          if (seqs[i].getLength() > width)
-          {
-            width = seqs[i].getLength();
-          }
+          return sg;
         }
+      }
+    }
+    return null;
+  }
 
-        int startCol = -1, endCol = -1;
-        boolean delete = true;
-        for (int i = 0; i < width; i++)
-        {
-            delete = true;
-
-            for (j = 0; j < jSize; j++)
-            {
-                if (seqs[j].getLength() > i)
-                {
-                    if (!jalview.util.Comparison.isGap(seqs[j].getCharAt(i)))
-                    {
-                        if(delete)
-                          endCol = i;
-
-                        delete = false;
-                        break;
-                    }
-                }
-            }
-
-            if(delete && startCol==-1)
-            {
-              startCol = i;
-            }
-
+  /*
+   * (non-Javadoc)
+   * 
+   * @see
+   * jalview.datamodel.AlignmentI#findAllGroups(jalview.datamodel.SequenceI)
+   */
+  @Override
+  public SequenceGroup[] findAllGroups(SequenceI s)
+  {
+    ArrayList<SequenceGroup> temp = new ArrayList<SequenceGroup>();
 
-            if (!delete && startCol > -1)
-            {
-              deleteColumns(seqs, startCol, endCol);
-              width -= (endCol - startCol);
-              i -= (endCol - startCol);
-              startCol = -1;
-              endCol = -1;
-            }
+    synchronized (groups)
+    {
+      int gSize = groups.size();
+      for (int i = 0; i < gSize; i++)
+      {
+        SequenceGroup sg = groups.get(i);
+        if (sg == null || sg.getSequences(null) == null)
+        {
+          this.deleteGroup(sg);
+          gSize--;
+          continue;
         }
 
-        if (delete && startCol > -1)
+        if (sg.getSequences(null).contains(s))
         {
-          deleteColumns(seqs, startCol, endCol);
+          temp.add(sg);
         }
+      }
     }
+    SequenceGroup[] ret = new SequenceGroup[temp.size()];
+    return temp.toArray(ret);
+  }
 
-    /** Removes a range of columns (start to end inclusive).
-     *
-     * @param seqs Sequences to remove columns from
-     * @param start Start column in the alignment
-     * @param end End column in the alignment
-     */
-    public void deleteColumns(SequenceI [] seqs, int start, int end)
-    {
-      for(int i=0; i<seqs.length; i++)
-        seqs[i].deleteChars(start, end);
-    }
-
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param i DOCUMENT ME!
-     */
-    public void trimLeft(int i)
+  /**    */
+  @Override
+  public void addGroup(SequenceGroup sg)
+  {
+    synchronized (groups)
     {
-        SequenceI[] seqs = getVisibleAndRepresentedSeqs();
-        int j, jSize = seqs.length;
-        for (j = 0; j < jSize; j++)
+      if (!groups.contains(sg))
+      {
+        if (hiddenSequences.getSize() > 0)
         {
-            int newstart = seqs[j].findPosition(i);
-
-            if(i>seqs[j].getLength())
-            {
-              sequences.removeElement(seqs[j]);
-              j--;
-              jSize--;
-            }
-            else
+          int i, iSize = sg.getSize();
+          for (i = 0; i < iSize; i++)
+          {
+            if (!sequences.contains(sg.getSequenceAt(i)))
             {
-              seqs[j].setStart(newstart);
-              seqs[j].setSequence(seqs[j].getSequence().substring(i));
+              sg.deleteSequence(sg.getSequenceAt(i), false);
+              iSize--;
+              i--;
             }
+          }
+
+          if (sg.getSize() < 1)
+          {
+            return;
+          }
         }
+        sg.setContext(this);
+        groups.add(sg);
+      }
     }
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param i DOCUMENT ME!
-     */
-    public void trimRight(int i)
+  /**
+   * remove any annotation that references gp
+   * 
+   * @param gp
+   *          (if null, removes all group associated annotation)
+   */
+  private void removeAnnotationForGroup(SequenceGroup gp)
+  {
+    if (annotations == null || annotations.length == 0)
+    {
+      return;
+    }
+    // remove annotation very quickly
+    AlignmentAnnotation[] t, todelete = new AlignmentAnnotation[annotations.length], tokeep = new AlignmentAnnotation[annotations.length];
+    int i, p, k;
+    if (gp == null)
     {
-        SequenceI[] seqs = getVisibleAndRepresentedSeqs();
-        int j, jSize = seqs.length;
-        for (j = 0; j < jSize; j++)
+      for (i = 0, p = 0, k = 0; i < annotations.length; i++)
+      {
+        if (annotations[i].groupRef != null)
         {
-            int newend = seqs[j].findPosition(i);
-
-            seqs[j].setEnd(newend);
-            if(seqs[j].getLength()>i)
-              seqs[j].setSequence(seqs[j].getSequence().substring(0, i + 1));
+          todelete[p++] = annotations[i];
         }
+        else
+        {
+          tokeep[k++] = annotations[i];
+        }
+      }
     }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param s DOCUMENT ME!
-     */
-    public void deleteSequence(SequenceI s)
+    else
     {
-        for (int i = 0; i < getHeight(); i++)
+      for (i = 0, p = 0, k = 0; i < annotations.length; i++)
+      {
+        if (annotations[i].groupRef == gp)
         {
-            if (getSequenceAt(i) == s)
-            {
-                deleteSequence(i);
-            }
+          todelete[p++] = annotations[i];
+        }
+        else
+        {
+          tokeep[k++] = annotations[i];
         }
+      }
+    }
+    if (p > 0)
+    {
+      // clear out the group associated annotation.
+      for (i = 0; i < p; i++)
+      {
+        unhookAnnotation(todelete[i]);
+        todelete[i] = null;
+      }
+      t = new AlignmentAnnotation[k];
+      for (i = 0; i < k; i++)
+      {
+        t[i] = tokeep[i];
+      }
+      annotations = t;
     }
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param i DOCUMENT ME!
-     */
-    public void deleteSequence(int i)
+  @Override
+  public void deleteAllGroups()
+  {
+    synchronized (groups)
     {
-        sequences.removeElementAt(i);
+      if (annotations != null)
+      {
+        removeAnnotationForGroup(null);
+      }
+      for (SequenceGroup sg:groups) {
+        sg.setContext(null);
+      }
+      groups.clear();
     }
+  }
+
+  /**    */
+  @Override
+  public void deleteGroup(SequenceGroup g)
+  {
+    synchronized (groups)
+    {
+      if (groups.contains(g))
+      {
+        removeAnnotationForGroup(g);
+        groups.remove(g);
+        g.setContext(null);
+      }
+    }
+  }
+
+  /**    */
+  @Override
+  public SequenceI findName(String name)
+  {
+    return findName(name, false);
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see jalview.datamodel.AlignmentI#findName(java.lang.String, boolean)
+   */
+  @Override
+  public SequenceI findName(String token, boolean b)
+  {
+    return findName(null, token, b);
+  }
 
+  /*
+   * (non-Javadoc)
+   * 
+   * @see jalview.datamodel.AlignmentI#findName(SequenceI, java.lang.String,
+   * boolean)
+   */
+  @Override
+  public SequenceI findName(SequenceI startAfter, String token, boolean b)
+  {
 
-    /**    */
-    public SequenceGroup findGroup(SequenceI s)
+    int i = 0;
+    SequenceI sq = null;
+    String sqname = null;
+    if (startAfter != null)
     {
-        for (int i = 0; i < this.groups.size(); i++)
+      // try to find the sequence in the alignment
+      boolean matched = false;
+      while (i < sequences.size())
+      {
+        if (getSequenceAt(i++) == startAfter)
         {
-            SequenceGroup sg = (SequenceGroup) groups.elementAt(i);
-
-            if (sg.getSequences(false).contains(s))
-            {
-                return sg;
-            }
+          matched = true;
+          break;
         }
+      }
+      if (!matched)
+      {
+        i = 0;
+      }
+    }
+    while (i < sequences.size())
+    {
+      sq = getSequenceAt(i);
+      sqname = sq.getName();
+      if (sqname.equals(token) // exact match
+              || (b && // allow imperfect matches - case varies
+              (sqname.equalsIgnoreCase(token))))
+      {
+        return getSequenceAt(i);
+      }
 
-        return null;
+      i++;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param s DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public SequenceGroup[] findAllGroups(SequenceI s)
+    return null;
+  }
+
+  @Override
+  public SequenceI[] findSequenceMatch(String name)
+  {
+    Vector matches = new Vector();
+    int i = 0;
+
+    while (i < sequences.size())
     {
-        Vector temp = new Vector();
+      if (getSequenceAt(i).getName().equals(name))
+      {
+        matches.addElement(getSequenceAt(i));
+      }
+      i++;
+    }
 
-        int gSize = groups.size();
-        for (int i = 0; i < gSize; i++)
-        {
-            SequenceGroup sg = (SequenceGroup) groups.elementAt(i);
-            if(sg==null || sg.getSequences(false)==null)
-            {
-              this.deleteGroup(sg);
-              gSize--;
-              continue;
-            }
+    SequenceI[] result = new SequenceI[matches.size()];
+    for (i = 0; i < result.length; i++)
+    {
+      result[i] = (SequenceI) matches.elementAt(i);
+    }
 
-            if (sg.getSequences(false).contains(s))
-            {
-                temp.addElement(sg);
-            }
-        }
+    return result;
 
-        SequenceGroup[] ret = new SequenceGroup[temp.size()];
+  }
 
-        for (int i = 0; i < temp.size(); i++)
-        {
-            ret[i] = (SequenceGroup) temp.elementAt(i);
-        }
+  /*
+   * (non-Javadoc)
+   * 
+   * @see jalview.datamodel.AlignmentI#findIndex(jalview.datamodel.SequenceI)
+   */
+  @Override
+  public int findIndex(SequenceI s)
+  {
+    int i = 0;
+
+    while (i < sequences.size())
+    {
+      if (s == getSequenceAt(i))
+      {
+        return i;
+      }
 
-        return ret;
+      i++;
     }
 
+    return -1;
+  }
 
+  /*
+   * (non-Javadoc)
+   * 
+   * @see
+   * jalview.datamodel.AlignmentI#findIndex(jalview.datamodel.SearchResults)
+   */
+  @Override
+  public int findIndex(SearchResults results)
+  {
+    int i = 0;
 
-    /**    */
-    public void addGroup(SequenceGroup sg)
+    while (i < sequences.size())
     {
-        if (!groups.contains(sg))
-        {
-            groups.addElement(sg);
-        }
+      if (results.involvesSequence(getSequenceAt(i)))
+      {
+        return i;
+      }
+      i++;
     }
+    return -1;
+  }
 
-    /**
-     * DOCUMENT ME!
-     */
-    public void deleteAllGroups()
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  @Override
+  public int getHeight()
+  {
+    return sequences.size();
+  }
+
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  @Override
+  public int getWidth()
+  {
+    int maxLength = -1;
+
+    for (int i = 0; i < sequences.size(); i++)
     {
-        groups.removeAllElements();
+      if (getSequenceAt(i).getLength() > maxLength)
+      {
+        maxLength = getSequenceAt(i).getLength();
+      }
+    }
 
-        int i = 0;
+    return maxLength;
+  }
 
-        while (i < sequences.size())
-        {
-            SequenceI s = getSequenceAt(i);
-            s.setColor(java.awt.Color.white);
-            i++;
-        }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param gc
+   *          DOCUMENT ME!
+   */
+  @Override
+  public void setGapCharacter(char gc)
+  {
+    gapCharacter = gc;
+    synchronized (sequences)
+    {
+      for (SequenceI seq : sequences)
+      {
+        seq.setSequence(seq.getSequenceAsString().replace('.', gc)
+                .replace('-', gc).replace(' ', gc));
+      }
     }
+  }
 
-    /**    */
-    public void deleteGroup(SequenceGroup g)
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  @Override
+  public char getGapCharacter()
+  {
+    return gapCharacter;
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see jalview.datamodel.AlignmentI#isAligned()
+   */
+  @Override
+  public boolean isAligned()
+  {
+    return isAligned(false);
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see jalview.datamodel.AlignmentI#isAligned(boolean)
+   */
+  @Override
+  public boolean isAligned(boolean includeHidden)
+  {
+    int width = getWidth();
+    if (hiddenSequences == null || hiddenSequences.getSize() == 0)
+    {
+      includeHidden = true; // no hidden sequences to check against.
+    }
+    for (int i = 0; i < sequences.size(); i++)
     {
-        if (groups.contains(g))
+      if (includeHidden || !hiddenSequences.isHidden(getSequenceAt(i)))
+      {
+        if (getSequenceAt(i).getLength() != width)
         {
-            groups.removeElement(g);
+          return false;
         }
+      }
     }
 
-    /**    */
-    public SequenceI findName(String name)
-    {
-        int i = 0;
+    return true;
+  }
 
-        while (i < sequences.size())
-        {
-            if (getSequenceAt(i).getName().equals(name))
-            {
-                return getSequenceAt(i);
-            }
+  /*
+   * (non-Javadoc)
+   * 
+   * @seejalview.datamodel.AlignmentI#deleteAnnotation(jalview.datamodel.
+   * AlignmentAnnotation)
+   */
+  @Override
+  public boolean deleteAnnotation(AlignmentAnnotation aa)
+  {
+    return deleteAnnotation(aa, true);
+  }
 
-            i++;
-        }
+  @Override
+  public boolean deleteAnnotation(AlignmentAnnotation aa, boolean unhook)
+  {
+    int aSize = 1;
 
-        return null;
+    if (annotations != null)
+    {
+      aSize = annotations.length;
     }
 
-
-    /**    */
-    public int findIndex(SequenceI s)
+    if (aSize < 1)
     {
-        int i = 0;
+      return false;
+    }
 
-        while (i < sequences.size())
-        {
-            if (s == getSequenceAt(i))
-            {
-                return i;
-            }
+    AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize - 1];
 
-            i++;
-        }
+    boolean swap = false;
+    int tIndex = 0;
 
-        return -1;
+    for (int i = 0; i < aSize; i++)
+    {
+      if (annotations[i] == aa)
+      {
+        swap = true;
+        continue;
+      }
+      if (tIndex < temp.length)
+        temp[tIndex++] = annotations[i];
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getHeight()
+    if (swap)
     {
-        return sequences.size();
+      annotations = temp;
+      if (unhook)
+      {
+        unhookAnnotation(aa);
+      }
     }
+    return swap;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getWidth()
+  /**
+   * remove any object references associated with this annotation
+   * 
+   * @param aa
+   */
+  private void unhookAnnotation(AlignmentAnnotation aa)
+  {
+    if (aa.sequenceRef != null)
+    {
+      aa.sequenceRef.removeAlignmentAnnotation(aa);
+    }
+    if (aa.groupRef != null)
     {
-        int maxLength = -1;
+      // probably need to do more here in the future (post 2.5.0)
+      aa.groupRef = null;
+    }
+  }
 
-        for (int i = 0; i < sequences.size(); i++)
-        {
-            if (getSequenceAt(i).getLength() > maxLength)
-            {
-                maxLength = getSequenceAt(i).getLength();
-            }
-        }
+  /*
+   * (non-Javadoc)
+   * 
+   * @seejalview.datamodel.AlignmentI#addAnnotation(jalview.datamodel.
+   * AlignmentAnnotation)
+   */
+  @Override
+  public void addAnnotation(AlignmentAnnotation aa)
+  {
+    addAnnotation(aa, -1);
+  }
 
-        return maxLength;
+  /*
+   * (non-Javadoc)
+   * 
+   * @seejalview.datamodel.AlignmentI#addAnnotation(jalview.datamodel.
+   * AlignmentAnnotation, int)
+   */
+  @Override
+  public void addAnnotation(AlignmentAnnotation aa, int pos)
+  {
+    if (aa.getRNAStruc() != null)
+    {
+      hasRNAStructure = true;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getMaxIdLength()
+    int aSize = 1;
+    if (annotations != null)
     {
-        int max = 0;
-        int i = 0;
+      aSize = annotations.length + 1;
+    }
 
-        while (i < sequences.size())
+    AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize];
+    int i = 0;
+    if (pos == -1 || pos >= aSize)
+    {
+      temp[aSize - 1] = aa;
+    }
+    else
+    {
+      temp[pos] = aa;
+    }
+    if (aSize > 1)
+    {
+      int p = 0;
+      for (i = 0; i < (aSize - 1); i++, p++)
+      {
+        if (p == pos)
         {
-            SequenceI seq = getSequenceAt(i);
-            String tmp = seq.getName() + "/" + seq.getStart() + "-" +
-                seq.getEnd();
-
-            if (tmp.length() > max)
-            {
-                max = tmp.length();
-            }
-
-            i++;
+          p++;
+        }
+        if (p < temp.length)
+        {
+          temp[p] = annotations[i];
         }
+      }
+    }
+
+    annotations = temp;
+  }
 
-        return max;
+  @Override
+  public void setAnnotationIndex(AlignmentAnnotation aa, int index)
+  {
+    if (aa == null || annotations == null || annotations.length - 1 < index)
+    {
+      return;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param gc DOCUMENT ME!
-     */
-    public void setGapCharacter(char gc)
+    int aSize = annotations.length;
+    AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize];
+
+    temp[index] = aa;
+
+    for (int i = 0; i < aSize; i++)
     {
-        gapCharacter = gc;
+      if (i == index)
+      {
+        continue;
+      }
 
-        for (int i = 0; i < sequences.size(); i++)
-        {
-            Sequence seq = (Sequence) sequences.elementAt(i);
-            seq.setSequence( seq.getSequence().replace('.', gc) );
-            seq.setSequence( seq.getSequence().replace('-', gc) );
-            seq.setSequence( seq.getSequence().replace(' ', gc) );
-        }
+      if (i < index)
+      {
+        temp[i] = annotations[i];
+      }
+      else
+      {
+        temp[i] = annotations[i - 1];
+      }
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public char getGapCharacter()
+    annotations = temp;
+  }
+
+  @Override
+  /**
+   * returns all annotation on the alignment
+   */
+  public AlignmentAnnotation[] getAlignmentAnnotation()
+  {
+    return annotations;
+  }
+
+  @Override
+  public void setNucleotide(boolean b)
+  {
+    if (b)
     {
-        return gapCharacter;
+      type = NUCLEOTIDE;
     }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public Vector getAAFrequency()
+    else
     {
-        return AAFrequency.calculate(sequences, 0, getWidth());
+      type = PROTEIN;
     }
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean isAligned()
+  @Override
+  public boolean isNucleotide()
+  {
+    if (type == NUCLEOTIDE)
     {
-        int width = getWidth();
+      return true;
+    }
+    else
+    {
+      return false;
+    }
+  }
 
-        for (int i = 0; i < sequences.size(); i++)
+  @Override
+  public boolean hasRNAStructure()
+  {
+    // TODO can it happen that structure is removed from alignment?
+    return hasRNAStructure;
+  }
+
+  @Override
+  public void setDataset(Alignment data)
+  {
+    if (dataset == null && data == null)
+    {
+      // Create a new dataset for this alignment.
+      // Can only be done once, if dataset is not null
+      // This will not be performed
+      SequenceI[] seqs = new SequenceI[getHeight()];
+      SequenceI currentSeq;
+      for (int i = 0; i < getHeight(); i++)
+      {
+        currentSeq = getSequenceAt(i);
+        if (currentSeq.getDatasetSequence() != null)
         {
-            if (getSequenceAt(i).getLength() != width)
-            {
-                return false;
-            }
+          seqs[i] = currentSeq.getDatasetSequence();
         }
+        else
+        {
+          seqs[i] = currentSeq.createDatasetSequence();
+        }
+      }
 
-        return true;
+      dataset = new Alignment(seqs);
     }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aa DOCUMENT ME!
-     */
-    public void deleteAnnotation(AlignmentAnnotation aa)
+    else if (dataset == null && data != null)
     {
-        int aSize = 1;
+      dataset = data;
+    }
+    dataset.addAlignmentRef();
+  }
 
-        if (annotations != null)
-        {
-            aSize = annotations.length;
-        }
+  /**
+   * reference count for number of alignments referencing this one.
+   */
+  int alignmentRefs = 0;
 
-        AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize - 1];
+  /**
+   * increase reference count to this alignment.
+   */
+  private void addAlignmentRef()
+  {
+    alignmentRefs++;
+  }
 
-        int tIndex = 0;
+  @Override
+  public Alignment getDataset()
+  {
+    return dataset;
+  }
 
-        for (int i = 0; i < aSize; i++)
-        {
-            if (annotations[i] == aa)
-            {
-                continue;
-            }
+  @Override
+  public boolean padGaps()
+  {
+    boolean modified = false;
+
+    // Remove excess gaps from the end of alignment
+    int maxLength = -1;
 
-            temp[tIndex] = annotations[i];
-            tIndex++;
+    SequenceI current;
+    for (int i = 0; i < sequences.size(); i++)
+    {
+      current = getSequenceAt(i);
+      for (int j = current.getLength(); j > maxLength; j--)
+      {
+        if (j > maxLength
+                && !jalview.util.Comparison.isGap(current.getCharAt(j)))
+        {
+          maxLength = j;
+          break;
         }
+      }
+    }
+
+    maxLength++;
 
-        annotations = temp;
+    int cLength;
+    for (int i = 0; i < sequences.size(); i++)
+    {
+      current = getSequenceAt(i);
+      cLength = current.getLength();
+
+      if (cLength < maxLength)
+      {
+        current.insertCharAt(cLength, maxLength - cLength, gapCharacter);
+        modified = true;
+      }
+      else if (current.getLength() > maxLength)
+      {
+        current.deleteChars(maxLength, current.getLength());
+      }
     }
+    return modified;
+  }
 
+  /**
+   * Justify the sequences to the left or right by deleting and inserting gaps
+   * before the initial residue or after the terminal residue
+   * 
+   * @param right
+   *          true if alignment padded to right, false to justify to left
+   * @return true if alignment was changed
+   */
+  @Override
+  public boolean justify(boolean right)
+  {
+    boolean modified = false;
 
-    public void adjustSequenceAnnotations()
+    // Remove excess gaps from the end of alignment
+    int maxLength = -1;
+    int ends[] = new int[sequences.size() * 2];
+    SequenceI current;
+    for (int i = 0; i < sequences.size(); i++)
     {
-      if(annotations!=null)
+      current = getSequenceAt(i);
+      // This should really be a sequence method
+      ends[i * 2] = current.findIndex(current.getStart());
+      ends[i * 2 + 1] = current.findIndex(current.getStart()
+              + current.getLength());
+      boolean hitres = false;
+      for (int j = 0, rs = 0, ssiz = current.getLength(); j < ssiz; j++)
       {
-        for (int a = 0; a < annotations.length; a++)
+        if (!jalview.util.Comparison.isGap(current.getCharAt(j)))
         {
-          if (annotations[a].sequenceRef != null)
+          if (!hitres)
+          {
+            ends[i * 2] = j;
+            hitres = true;
+          }
+          else
           {
-            annotations[a].adjustForAlignment();
+            ends[i * 2 + 1] = j;
+            if (j - ends[i * 2] > maxLength)
+            {
+              maxLength = j - ends[i * 2];
+            }
           }
         }
       }
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aa DOCUMENT ME!
-     */
-    public void addAnnotation(AlignmentAnnotation aa)
+    maxLength++;
+    // now edit the flanking gaps to justify to either left or right
+    int cLength, extent, diff;
+    for (int i = 0; i < sequences.size(); i++)
     {
-        int aSize = 1;
-        if (annotations != null)
+      current = getSequenceAt(i);
+
+      cLength = 1 + ends[i * 2 + 1] - ends[i * 2];
+      diff = maxLength - cLength; // number of gaps to indent
+      extent = current.getLength();
+      if (right)
+      {
+        // right justify
+        if (extent > ends[i * 2 + 1])
         {
-            aSize = annotations.length + 1;
+          current.deleteChars(ends[i * 2 + 1] + 1, extent);
+          modified = true;
         }
-
-        AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize];
-
-        temp[aSize-1] = aa;
-
-        int i = 0;
-
-        if (aSize > 1)
+        if (ends[i * 2] > diff)
         {
-            for (i = 0; i < (aSize-1); i++)
-            {
-                temp[i] = annotations[i];
-            }
+          current.deleteChars(0, ends[i * 2] - diff);
+          modified = true;
         }
-
-        annotations = temp;
+        else
+        {
+          if (ends[i * 2] < diff)
+          {
+            current.insertCharAt(0, diff - ends[i * 2], gapCharacter);
+            modified = true;
+          }
+        }
+      }
+      else
+      {
+        // left justify
+        if (ends[i * 2] > 0)
+        {
+          current.deleteChars(0, ends[i * 2]);
+          modified = true;
+          ends[i * 2 + 1] -= ends[i * 2];
+          extent -= ends[i * 2];
+        }
+        if (extent > maxLength)
+        {
+          current.deleteChars(maxLength + 1, extent);
+          modified = true;
+        }
+        else
+        {
+          if (extent < maxLength)
+          {
+            current.insertCharAt(extent, maxLength - extent, gapCharacter);
+            modified = true;
+          }
+        }
+      }
     }
+    return modified;
+  }
+
+  @Override
+  public HiddenSequences getHiddenSequences()
+  {
+    return hiddenSequences;
+  }
 
-    public void setAnnotationIndex(AlignmentAnnotation aa, int index)
+  @Override
+  public CigarArray getCompactAlignment()
+  {
+    synchronized (sequences)
     {
-      if(aa==null || annotations==null || annotations.length-1<index)
-        return;
+      SeqCigar alseqs[] = new SeqCigar[sequences.size()];
+      int i = 0;
+      for (SequenceI seq : sequences)
+      {
+        alseqs[i++] = new SeqCigar(seq);
+      }
+      CigarArray cal = new CigarArray(alseqs);
+      cal.addOperation(CigarArray.M, getWidth());
+      return cal;
+    }
+  }
 
-      int aSize = annotations.length;
-      AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize];
+  @Override
+  public void setProperty(Object key, Object value)
+  {
+    if (alignmentProperties == null)
+      alignmentProperties = new Hashtable();
 
-      temp[index] = aa;
+    alignmentProperties.put(key, value);
+  }
 
-      for (int i = 0; i < aSize; i++)
-      {
-        if(i==index)
-          continue;
+  @Override
+  public Object getProperty(Object key)
+  {
+    if (alignmentProperties != null)
+      return alignmentProperties.get(key);
+    else
+      return null;
+  }
 
-        if(i<index)
-          temp[i] = annotations[i];
-        else
-          temp[i] = annotations[i-1];
-      }
+  @Override
+  public Hashtable getProperties()
+  {
+    return alignmentProperties;
+  }
 
-        annotations = temp;
+  AlignedCodonFrame[] codonFrameList = null;
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see
+   * jalview.datamodel.AlignmentI#addCodonFrame(jalview.datamodel.AlignedCodonFrame
+   * )
+   */
+  @Override
+  public void addCodonFrame(AlignedCodonFrame codons)
+  {
+    if (codons == null)
+      return;
+    if (codonFrameList == null)
+    {
+      codonFrameList = new AlignedCodonFrame[]
+      { codons };
+      return;
     }
+    AlignedCodonFrame[] t = new AlignedCodonFrame[codonFrameList.length + 1];
+    System.arraycopy(codonFrameList, 0, t, 0, codonFrameList.length);
+    t[codonFrameList.length] = codons;
+    codonFrameList = t;
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see jalview.datamodel.AlignmentI#getCodonFrame(int)
+   */
+  @Override
+  public AlignedCodonFrame getCodonFrame(int index)
+  {
+    return codonFrameList[index];
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public AlignmentAnnotation[] getAlignmentAnnotation()
+  /*
+   * (non-Javadoc)
+   * 
+   * @see
+   * jalview.datamodel.AlignmentI#getCodonFrame(jalview.datamodel.SequenceI)
+   */
+  @Override
+  public AlignedCodonFrame[] getCodonFrame(SequenceI seq)
+  {
+    if (seq == null || codonFrameList == null)
+      return null;
+    Vector cframes = new Vector();
+    for (int f = 0; f < codonFrameList.length; f++)
     {
-        return annotations;
+      if (codonFrameList[f].involvesSequence(seq))
+        cframes.addElement(codonFrameList[f]);
     }
+    if (cframes.size() == 0)
+      return null;
+    AlignedCodonFrame[] cfr = new AlignedCodonFrame[cframes.size()];
+    cframes.copyInto(cfr);
+    return cfr;
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see jalview.datamodel.AlignmentI#getCodonFrames()
+   */
+  @Override
+  public AlignedCodonFrame[] getCodonFrames()
+  {
+    return codonFrameList;
+  }
 
-    public void setNucleotide(boolean b)
+  /*
+   * (non-Javadoc)
+   * 
+   * @seejalview.datamodel.AlignmentI#removeCodonFrame(jalview.datamodel.
+   * AlignedCodonFrame)
+   */
+  @Override
+  public boolean removeCodonFrame(AlignedCodonFrame codons)
+  {
+    if (codons == null || codonFrameList == null)
+      return false;
+    boolean removed = false;
+    int i = 0, iSize = codonFrameList.length;
+    while (i < iSize)
     {
-      if(b)
-        type = NUCLEOTIDE;
+      if (codonFrameList[i] == codons)
+      {
+        removed = true;
+        if (i + 1 < iSize)
+        {
+          System.arraycopy(codonFrameList, i + 1, codonFrameList, i, iSize
+                  - i - 1);
+        }
+        iSize--;
+      }
       else
-        type = PROTEIN;
+      {
+        i++;
+      }
     }
+    return removed;
+  }
 
-    public boolean isNucleotide()
+  @Override
+  public void append(AlignmentI toappend)
+  {
+    if (toappend == this)
     {
-      if(type==NUCLEOTIDE)
-        return true;
-      else
-        return false;
+      System.err.println("Self append may cause a deadlock.");
     }
-
-    public void setDataset(Alignment data)
+    // TODO test this method for a future 2.5 release
+    // currently tested for use in jalview.gui.SequenceFetcher
+    boolean samegap = toappend.getGapCharacter() == getGapCharacter();
+    char oldc = toappend.getGapCharacter();
+    boolean hashidden = toappend.getHiddenSequences() != null
+            && toappend.getHiddenSequences().hiddenSequences != null;
+    // get all sequences including any hidden ones
+    List<SequenceI> sqs = (hashidden) ? toappend.getHiddenSequences()
+            .getFullAlignment().getSequences() : toappend.getSequences();
+    if (sqs != null)
     {
-      if(dataset==null && data==null)
+      synchronized (sqs)
       {
-        // Create a new dataset for this alignment.
-        // Can only be done once, if dataset is not null
-        // This will not be performed
-        Sequence[] seqs = new Sequence[getHeight()];
-        for (int i = 0; i < getHeight(); i++)
+        for (SequenceI addedsq : sqs)
         {
-          if(getSequenceAt(i).getDatasetSequence()!=null)
-          {
-            seqs[i] = (Sequence)getSequenceAt(i).getDatasetSequence();
-          }
-          else
+          if (!samegap)
           {
-            seqs[i] = new Sequence(getSequenceAt(i).getName(),
-                                   AlignSeq.extractGaps(
-                                       jalview.util.Comparison.GapChars,
-                                       getSequenceAt(i).getSequence()
-                                   ),
-                                   getSequenceAt(i).getStart(),
-                                   getSequenceAt(i).getEnd());
-
-            getSequenceAt(i).setDatasetSequence(seqs[i]);
+            char[] oldseq = addedsq.getSequence();
+            for (int c = 0; c < oldseq.length; c++)
+            {
+              if (oldseq[c] == oldc)
+              {
+                oldseq[c] = gapCharacter;
+              }
+            }
           }
+          addSequence(addedsq);
         }
-
-        dataset = new Alignment(seqs);
       }
-      else if(dataset==null && data!=null)
+    }
+    AlignmentAnnotation[] alan = toappend.getAlignmentAnnotation();
+    for (int a = 0; alan != null && a < alan.length; a++)
+    {
+      addAnnotation(alan[a]);
+    }
+    AlignedCodonFrame[] acod = toappend.getCodonFrames();
+    for (int a = 0; acod != null && a < acod.length; a++)
+    {
+      this.addCodonFrame(acod[a]);
+    }
+    List<SequenceGroup> sg = toappend.getGroups();
+    if (sg != null)
+    {
+      for (SequenceGroup _sg : sg)
       {
-        dataset = data;
+        addGroup(_sg);
       }
     }
-
-    public Alignment getDataset()
+    if (toappend.getHiddenSequences() != null)
     {
-      return dataset;
-    }
-
-    public boolean padGaps() {
-      boolean modified=false;
-
-      //Remove excess gaps from the end of alignment
-      int maxLength = -1;
-
-      SequenceI current;
-      for (int i = 0; i < sequences.size(); i++)
+      HiddenSequences hs = toappend.getHiddenSequences();
+      if (hiddenSequences == null)
+      {
+        hiddenSequences = new HiddenSequences(this);
+      }
+      if (hs.hiddenSequences != null)
       {
-        current = getSequenceAt(i);
-        for (int j = current.getLength(); j > maxLength; j--)
+        for (int s = 0; s < hs.hiddenSequences.length; s++)
         {
-          if (j > maxLength && !jalview.util.Comparison.isGap(
-              current.getCharAt(j)))
+          // hide the newly appended sequence in the alignment
+          if (hs.hiddenSequences[s] != null)
           {
-            maxLength = j;
-            break;
+            hiddenSequences.hideSequence(hs.hiddenSequences[s]);
           }
         }
       }
-
-      maxLength++;
-
-      for (int i = 0; i < sequences.size();
-           i++)
+    }
+    if (toappend.getProperties() != null)
+    {
+      // we really can't do very much here - just try to concatenate strings
+      // where property collisions occur.
+      Enumeration key = toappend.getProperties().keys();
+      while (key.hasMoreElements())
       {
-        current = getSequenceAt(i);
-
-        if (current.getLength() < maxLength)
+        Object k = key.nextElement();
+        Object ourval = this.getProperty(k);
+        Object toapprop = toappend.getProperty(k);
+        if (ourval != null)
         {
-          current.insertCharAt(maxLength - 1, gapCharacter);
-          modified=true;
+          if (ourval.getClass().equals(toapprop.getClass())
+                  && !ourval.equals(toapprop))
+          {
+            if (ourval instanceof String)
+            {
+              // append strings
+              this.setProperty(k, ((String) ourval) + "; "
+                      + ((String) toapprop));
+            }
+            else
+            {
+              if (ourval instanceof Vector)
+              {
+                // append vectors
+                Enumeration theirv = ((Vector) toapprop).elements();
+                while (theirv.hasMoreElements())
+                {
+                  ((Vector) ourval).addElement(theirv);
+                }
+              }
+            }
+          }
         }
-        else if(current.getLength() > maxLength)
+        else
         {
-          current.deleteChars(maxLength, current.getLength());
+          // just add new property directly
+          setProperty(k, toapprop);
         }
+
       }
-      return modified;
     }
+  }
 
-    public HiddenSequences getHiddenSequences()
+  @Override
+  public AlignmentAnnotation findOrCreateAnnotation(String name,
+          String calcId, boolean autoCalc, SequenceI seqRef,
+          SequenceGroup groupRef)
+  {
+    assert (name != null);
+    if (annotations != null)
     {
-      return hiddenSequences;
+      for (AlignmentAnnotation annot : getAlignmentAnnotation())
+      {
+        if (annot.autoCalculated == autoCalc && (name.equals(annot.label))
+                && (calcId == null || annot.getCalcId().equals(calcId))
+                && annot.sequenceRef == seqRef
+                && annot.groupRef == groupRef)
+        {
+          return annot;
+        }
+      }
     }
-    SequenceI [] getVisibleAndRepresentedSeqs()
+    AlignmentAnnotation annot = new AlignmentAnnotation(name, name,
+            new Annotation[1], 0f, 0f, AlignmentAnnotation.BAR_GRAPH);
+    annot.hasText = false;
+    annot.setCalcId(new String(calcId));
+    annot.autoCalculated = autoCalc;
+    if (seqRef != null)
+    {
+      annot.setSequenceRef(seqRef);
+    }
+    annot.groupRef = groupRef;
+    addAnnotation(annot);
+
+    return annot;
+  }
+
+  @Override
+  public Iterable<AlignmentAnnotation> findAnnotation(String calcId)
+  {
+    ArrayList<AlignmentAnnotation> aa = new ArrayList<AlignmentAnnotation>();
+    for (AlignmentAnnotation a : getAlignmentAnnotation())
     {
-      if(hiddenSequences==null || hiddenSequences.getSize()<1)
-        return getSequencesArray();
+      if (a.getCalcId() == calcId
+              || (a.getCalcId() != null && calcId != null && a.getCalcId()
+                      .equals(calcId)))
+      {
+        aa.add(a);
+      }
+    }
+    return aa;
+  }
 
-      Vector seqs = new Vector();
-      SequenceI seq;
-      SequenceGroup hidden;
-      for (int i = 0; i < sequences.size(); i++)
+  @Override
+  public void moveSelectedSequencesByOne(SequenceGroup sg,
+          Map<SequenceI, SequenceCollectionI> map, boolean up)
+  {
+    synchronized (sequences)
+    {
+      if (up)
       {
-        seq = (SequenceI) sequences.elementAt(i);
-        seqs.addElement(seq);
-        hidden = seq.getHiddenSequences();
-        if(hidden!=null)
+
+        for (int i = 1, iSize = sequences.size(); i < iSize; i++)
         {
-          for(int j=0; j<hidden.getSize(false); j++)
+          SequenceI seq = sequences.get(i);
+          if (!sg.getSequences(map).contains(seq))
+          {
+            continue;
+          }
+
+          SequenceI temp = sequences.get(i - 1);
+          if (sg.getSequences(null).contains(temp))
           {
-            seqs.addElement(hidden.getSequenceAt(j));
+            continue;
           }
+
+          sequences.set(i, temp);
+          sequences.set(i - 1, seq);
         }
       }
-      SequenceI [] result = new SequenceI[seqs.size()];
-      for(int i=0; i<seqs.size(); i++)
-        result[i] = (SequenceI)seqs.elementAt(i);
+      else
+      {
+        for (int i = sequences.size() - 2; i > -1; i--)
+        {
+          SequenceI seq = sequences.get(i);
+          if (!sg.getSequences(map).contains(seq))
+          {
+            continue;
+          }
 
-      return result;
+          SequenceI temp = sequences.get(i + 1);
+          if (sg.getSequences(map).contains(temp))
+          {
+            continue;
+          }
 
-    }
+          sequences.set(i, temp);
+          sequences.set(i + 1, seq);
+        }
+      }
 
-  public CigarArray getCompactAlignment()
-  {
-    SeqCigar alseqs[] = new SeqCigar[sequences.size()];
-    for (int i=0; i<sequences.size(); i++) {
-      alseqs[i] = new SeqCigar((SequenceI) sequences.elementAt(i));
     }
-    return new CigarArray(alseqs);
   }
+ @Override
+ public void validateAnnotation(AlignmentAnnotation alignmentAnnotation)
+ {
+   alignmentAnnotation.validateRangeAndDisplay();
+   if (isNucleotide() && alignmentAnnotation.isValidStruc())
+   {
+     hasRNAStructure = true;
+   }
+ }
+ @Override
+public int getEndRes()
+{
+  return getWidth()-1;
+}@Override
+public int getStartRes()
+{
+  return 0;
+}
 
+/* In the case of AlignmentI - returns the dataset for the alignment, if set
+ * (non-Javadoc)
+ * @see jalview.datamodel.AnnotatedCollectionI#getContext()
+ */
+@Override
+public AnnotatedCollectionI getContext()
+{
+  return dataset;
+}
 }