X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequenceGroup.java;h=e22042c355e8b27ae7b51d0d48b4a9461ecf2a99;hb=c39e588784c0fbb64c7dabfcae8db4faedde10e6;hp=679997e3c1a4847bc086eaeb2d26445bf6da757e;hpb=70d8cbb3e0f3e4986c09d9e5e42a7997d77cf9d5;p=jalview.git

diff --git a/src/jalview/datamodel/SequenceGroup.java b/src/jalview/datamodel/SequenceGroup.java
index 679997e..e22042c 100755
--- a/src/jalview/datamodel/SequenceGroup.java
+++ b/src/jalview/datamodel/SequenceGroup.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 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,14 +18,12 @@
  */
 package jalview.datamodel;
 
-import jalview.analysis.*;
-
-import jalview.schemes.*;
+import java.util.*;
 
 import java.awt.*;
 
-import java.util.*;
-
+import jalview.analysis.*;
+import jalview.schemes.*;
 
 /**
  * DOCUMENT ME!
@@ -35,89 +33,66 @@ import java.util.*;
  */
 public class SequenceGroup
 {
-    String groupName;
-    Conservation conserve;
-    Vector aaFrequency;
-    boolean displayBoxes;
-    boolean displayText;
-    boolean colourText;
-    private Vector sequences = new Vector();
-    int width = -1;
-
-    /** DOCUMENT ME!! */
-    public ColourSchemeI cs;
-    int startRes = 0;
-    int endRes = 0;
-    Color outlineColour = Color.black;
-
-    /**
-     * Creates a new SequenceGroup object.
-     */
-    public SequenceGroup()
-    {
-        groupName = "Group";
-        this.displayBoxes = true;
-        this.displayText = true;
-        this.colourText = false;
-        cs = null;
-    }
-
-    /**
-     * Creates a new SequenceGroup object.
-     *
-     * @param sequences DOCUMENT ME!
-     * @param groupName DOCUMENT ME!
-     * @param scheme DOCUMENT ME!
-     * @param displayBoxes DOCUMENT ME!
-     * @param displayText DOCUMENT ME!
-     * @param colourText DOCUMENT ME!
-     * @param start DOCUMENT ME!
-     * @param end DOCUMENT ME!
-     */
-    public SequenceGroup(Vector sequences, String groupName,
-        ColourSchemeI scheme, boolean displayBoxes, boolean displayText,
-        boolean colourText, int start, int end)
-    {
-        this.sequences = sequences;
-        this.groupName = groupName;
-        this.displayBoxes = displayBoxes;
-        this.displayText = displayText;
-        this.colourText = colourText;
-        this.cs = scheme;
-        startRes = start;
-        endRes = end;
-        recalcConservation();
-    }
-
-    /**
-     * Creates a new SequenceGroup object.
-     *
-     * @param groupName DOCUMENT ME!
-     * @param scheme DOCUMENT ME!
-     * @param displayBoxes DOCUMENT ME!
-     * @param displayText DOCUMENT ME!
-     * @param colourText DOCUMENT ME!
-     * @param start DOCUMENT ME!
-     * @param end DOCUMENT ME!
-     */
-    public SequenceGroup(String groupName, ColourSchemeI scheme,
-        boolean displayBoxes, boolean displayText, boolean colourText,
-        int start, int end)
-    {
-        this.groupName = groupName;
-        this.displayBoxes = displayBoxes;
-        this.displayText = displayText;
-        this.colourText = colourText;
-        this.cs = scheme;
-        startRes = start;
-        endRes = end;
-    }
-
-    public SequenceI [] getSelectionAsNewSequences(AlignmentI align)
-    {
-      int iSize = sequences.size();
-      SequenceI [] seqs = new SequenceI[iSize];
-      SequenceI [] inorder = getSequencesInOrder(align);
+  String groupName;
+  String description;
+  Conservation conserve;
+  Vector aaFrequency;
+  boolean displayBoxes = true;
+  boolean displayText = true;
+  boolean colourText = true;
+  private Vector sequences = new Vector();
+  int width = -1;
+
+  /** DOCUMENT ME!! */
+  public ColourSchemeI cs;
+  int startRes = 0;
+  int endRes = 0;
+  Color outlineColour = Color.black;
+  public int thresholdTextColour = 0;
+  public Color textColour = Color.black;
+  public Color textColour2 = Color.white;
+
+  /**
+   * Creates a new SequenceGroup object.
+   */
+  public SequenceGroup()
+  {
+    groupName = "JGroup:" + this.hashCode();
+  }
+
+  /**
+   * Creates a new SequenceGroup object.
+   *
+   * @param sequences DOCUMENT ME!
+   * @param groupName DOCUMENT ME!
+   * @param scheme DOCUMENT ME!
+   * @param displayBoxes DOCUMENT ME!
+   * @param displayText DOCUMENT ME!
+   * @param colourText DOCUMENT ME!
+   * @param start DOCUMENT ME!
+   * @param end DOCUMENT ME!
+   */
+  public SequenceGroup(Vector sequences, String groupName,
+                       ColourSchemeI scheme, boolean displayBoxes,
+                       boolean displayText,
+                       boolean colourText, int start, int end)
+  {
+    this.sequences = sequences;
+    this.groupName = groupName;
+    this.displayBoxes = displayBoxes;
+    this.displayText = displayText;
+    this.colourText = colourText;
+    this.cs = scheme;
+    startRes = start;
+    endRes = end;
+    recalcConservation();
+  }
+
+  public SequenceI[] getSelectionAsNewSequences(AlignmentI align)
+  {
+    int iSize = sequences.size();
+    SequenceI[] seqs = new SequenceI[iSize];
+    SequenceI[] inorder = getSequencesInOrder(align);
 
     for (int i = 0; i < iSize; i++)
     {
@@ -132,468 +107,494 @@ public class SequenceGroup
       seqs[i].setDBRef(seq.getDBRef());
       seqs[i].setSequenceFeatures(seq.getSequenceFeatures());
       if (seq.getDatasetSequence() != null)
+      {
         seqs[i].setDatasetSequence(seq.getDatasetSequence());
+      }
 
-      if(seq.getAnnotation()!=null)
+      if (seq.getAnnotation() != null)
       {
-        for(int a=0; a<seq.getAnnotation().length; a++)
+        for (int a = 0; a < seq.getAnnotation().length; a++)
+        {
           seqs[i].addAlignmentAnnotation(seq.getAnnotation()[a]);
+        }
       }
     }
 
     return seqs;
 
-    }
-
-    /**
-     * If sequence ends in gaps, the end residue can
-     * be correctly calculated here
-     * @param seq SequenceI
-     * @return int
-     */
-    public int findEndRes(SequenceI seq)
-    {
-      int eres = 0;
-      char ch;
-
-      for (int j = 0; j < endRes + 1 && j < seq.getLength(); j++)
-      {
-        ch = seq.getCharAt(j);
-        if (!jalview.util.Comparison.isGap( (ch)))
-        {
-          eres++;
-        }
-      }
-
-      if (eres > 0)
-      {
-        eres += seq.getStart() - 1;
-      }
+  }
 
-      return eres;
-    }
+  /**
+   * If sequence ends in gaps, the end residue can
+   * be correctly calculated here
+   * @param seq SequenceI
+   * @return int
+   */
+  public int findEndRes(SequenceI seq)
+  {
+    int eres = 0;
+    char ch;
 
-    public Vector getSequences(boolean includeHidden)
+    for (int j = 0; j < endRes + 1 && j < seq.getLength(); j++)
     {
-      if(!includeHidden)
-        return sequences;
-      else
+      ch = seq.getCharAt(j);
+      if (!jalview.util.Comparison.isGap( (ch)))
       {
-        Vector allSequences = new Vector();
-        SequenceI seq;
-        for (int i = 0; i < sequences.size(); i++)
-        {
-          seq = (SequenceI) sequences.elementAt(i);
-          allSequences.addElement(seq);
-          if (seq.getHiddenSequences() != null)
-          {
-            for (int h = 0; h < seq.getHiddenSequences().getSize(false); h++)
-            {
-              allSequences.addElement(
-                  seq.getHiddenSequences().getSequenceAt(h)
-                  );
-            }
-          }
-        }
-
-        return allSequences;
+        eres++;
       }
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param col DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean adjustForRemoveLeft(int col)
+    if (eres > 0)
     {
-        // return value is true if the group still exists
-        if (startRes >= col)
-        {
-            startRes = startRes - col;
-        }
-
-        if (endRes >= col)
-        {
-            endRes = endRes - col;
-
-            if (startRes > endRes)
-            {
-                startRes = 0;
-            }
-        }
-        else
-        {
-            // must delete this group!!
-            return false;
-        }
-
-        return true;
+      eres += seq.getStart() - 1;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param col DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean adjustForRemoveRight(int col)
-    {
-        if (startRes > col)
-        {
-            // delete this group
-            return false;
-        }
-
-        if (endRes >= col)
-        {
-            endRes = col;
-        }
-
-        return true;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public String getName()
-    {
-        return groupName;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param name DOCUMENT ME!
-     */
-    public void setName(String name)
-    {
-        groupName = name;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public Conservation getConservation()
-    {
-        return conserve;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param c DOCUMENT ME!
-     */
-    public void setConservation(Conservation c)
-    {
-        conserve = c;
-    }
+    return eres;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param s DOCUMENT ME!
-     * @param recalc DOCUMENT ME!
-     */
-    public void addSequence(SequenceI s, boolean recalc)
+  public Vector getSequences(Hashtable hiddenReps)
+  {
+    if (hiddenReps == null)
     {
-        if (!sequences.contains(s))
-        {
-            sequences.addElement(s);
-        }
-
-        if (recalc)
-        {
-            recalcConservation();
-        }
+      return sequences;
     }
-
-    /**
-     * DOCUMENT ME!
-     */
-    public void recalcConservation()
+    else
     {
-        if(cs == null)
-          return;
-
-        try
+      Vector allSequences = new Vector();
+      SequenceI seq, seq2;
+      for (int i = 0; i < sequences.size(); i++)
+      {
+        seq = (SequenceI) sequences.elementAt(i);
+        allSequences.addElement(seq);
+        if (hiddenReps.containsKey(seq))
         {
-          cs.setConsensus(AAFrequency.calculate(sequences, 0, getWidth()));
-
-          if (cs instanceof ClustalxColourScheme)
+          SequenceGroup hsg = (SequenceGroup) hiddenReps.get(seq);
+          for (int h = 0; h < hsg.getSize(); h++)
           {
-            ( (ClustalxColourScheme) cs).resetClustalX(sequences, getWidth());
-          }
-
-          if (cs.conservationApplied())
-          {
-            Conservation c = new Conservation(groupName,
-                                              ResidueProperties.propHash, 3, sequences,
-                                              0, getWidth());
-            c.calculate();
-            c.verdict(false, 25);
-
-            cs.setConservation(c);
-
-            if (cs instanceof ClustalxColourScheme)
+            seq2 = hsg.getSequenceAt(h);
+            if (seq2 != seq
+                && !allSequences.contains(seq2))
             {
-              ( (ClustalxColourScheme) cs).resetClustalX(sequences,
-                                                         getWidth());
+              allSequences.addElement(seq2);
             }
           }
         }
-        catch (java.lang.OutOfMemoryError err)
-        {
-          System.out.println("Out of memory loading groups: " + err);
-        }
-
-    }
+      }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param s DOCUMENT ME!
-     * @param recalc DOCUMENT ME!
-     */
-    public void addOrRemove(SequenceI s, boolean recalc)
-    {
-        if (sequences.contains(s))
-        {
-            deleteSequence(s, recalc);
-        }
-        else
-        {
-            addSequence(s, recalc);
-        }
+      return allSequences;
     }
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param s DOCUMENT ME!
-     * @param recalc DOCUMENT ME!
-     */
-    public void deleteSequence(SequenceI s, boolean recalc)
+  public SequenceI[] getSequencesAsArray(Hashtable hiddenReps)
+  {
+    Vector tmp = getSequences(hiddenReps);
+    if (tmp == null)
     {
-        sequences.removeElement(s);
-
-        if (recalc)
-        {
-            recalcConservation();
-        }
+      return null;
     }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getStartRes()
+    SequenceI[] result = new SequenceI[tmp.size()];
+    for (int i = 0; i < result.length; i++)
     {
-        return startRes;
+      result[i] = (SequenceI) tmp.elementAt(i);
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getEndRes()
-    {
-        return endRes;
-    }
+    return result;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param i DOCUMENT ME!
-     */
-    public void setStartRes(int i)
+  /**
+   * DOCUMENT ME!
+   *
+   * @param col DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public boolean adjustForRemoveLeft(int col)
+  {
+    // return value is true if the group still exists
+    if (startRes >= col)
     {
-        startRes = i;
+      startRes = startRes - col;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param i DOCUMENT ME!
-     */
-    public void setEndRes(int i)
+    if (endRes >= col)
     {
-        endRes = i;
-    }
+      endRes = endRes - col;
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getSize(boolean includeHidden)
-    {
-      if(!includeHidden)
-        return sequences.size();
-      else
+      if (startRes > endRes)
       {
-        int total = sequences.size();
-        SequenceI seq;
-        for (int i = 0; i < sequences.size(); i++)
-        {
-          seq = (SequenceI) sequences.elementAt(i);
-          if (seq.getHiddenSequences() != null)
-          {
-            total += seq.getHiddenSequences().getSize(false);
-          }
-        }
-        return total;
+        startRes = 0;
       }
     }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param i DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public SequenceI getSequenceAt(int i)
+    else
+    {
+      // must delete this group!!
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param col DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public boolean adjustForRemoveRight(int col)
+  {
+    if (startRes > col)
     {
-        return (SequenceI) sequences.elementAt(i);
+      // delete this group
+      return false;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param state DOCUMENT ME!
-     */
-    public void setColourText(boolean state)
+    if (endRes >= col)
     {
-        colourText = state;
+      endRes = col;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getColourText()
-    {
-        return colourText;
-    }
+    return true;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param state DOCUMENT ME!
-     */
-    public void setDisplayText(boolean state)
-    {
-        displayText = state;
-    }
+  /**
+   * DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public String getName()
+  {
+    return groupName;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getDisplayText()
-    {
-        return displayText;
-    }
+  public String getDescription()
+  {
+    return description;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param state DOCUMENT ME!
-     */
-    public void setDisplayBoxes(boolean state)
-    {
-        displayBoxes = state;
-    }
+  /**
+   * DOCUMENT ME!
+   *
+   * @param name DOCUMENT ME!
+   */
+  public void setName(String name)
+  {
+    groupName = name;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getDisplayBoxes()
-    {
-        return displayBoxes;
-    }
+  public void setDescription(String desc)
+  {
+    description = desc;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getWidth()
-    {
-        // MC This needs to get reset when characters are inserted and deleted
-        if (sequences.size() > 0)
-        {
-            width = ((SequenceI) sequences.elementAt(0)).getLength();
-        }
+  /**
+   * DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public Conservation getConservation()
+  {
+    return conserve;
+  }
 
-        for (int i = 1; i < sequences.size(); i++)
-        {
-            SequenceI seq = (SequenceI) sequences.elementAt(i);
+  /**
+   * DOCUMENT ME!
+   *
+   * @param c DOCUMENT ME!
+   */
+  public void setConservation(Conservation c)
+  {
+    conserve = c;
+  }
 
-            if (seq.getLength() > width)
-            {
-                width = seq.getLength();
-            }
-        }
-
-        return width;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param c DOCUMENT ME!
-     */
-    public void setOutlineColour(Color c)
+  /**
+   * DOCUMENT ME!
+   *
+   * @param s DOCUMENT ME!
+   * @param recalc DOCUMENT ME!
+   */
+  public void addSequence(SequenceI s, boolean recalc)
+  {
+    if (s != null && !sequences.contains(s))
     {
-        outlineColour = c;
+      sequences.addElement(s);
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public Color getOutlineColour()
+    if (recalc)
     {
-        return outlineColour;
+      recalcConservation();
     }
+  }
+
+  /**
+   * DOCUMENT ME!
+   */
+  public void recalcConservation()
+  {
+    if (cs == null)
+    {
+      return;
+    }
+
+    try
+    {
+      cs.setConsensus(AAFrequency.calculate(sequences, startRes, endRes + 1));
+
+      if (cs instanceof ClustalxColourScheme)
+      {
+        ( (ClustalxColourScheme) cs).resetClustalX(sequences, getWidth());
+      }
 
-    /**
-     *
-     * returns the sequences in the group ordered by the ordering given by al
-     *
-     * @param al Alignment
-     * @return SequenceI[]
-     */
-    public SequenceI[] getSequencesInOrder(AlignmentI al)
-    {
-        int sSize = sequences.size();
-        int alHeight = al.getHeight();
+      if (cs.conservationApplied())
+      {
+        Conservation c = new Conservation(groupName,
+                                          ResidueProperties.propHash, 3,
+                                          sequences,
+                                          startRes, endRes + 1);
+        c.calculate();
+        c.verdict(false, 25);
 
-        SequenceI[] seqs = new SequenceI[sSize];
+        cs.setConservation(c);
 
-        int index = 0;
-        for (int i = 0; i < alHeight && index<sSize; i++)
+        if (cs instanceof ClustalxColourScheme)
         {
-          if(sequences.contains( al.getSequenceAt(i) ) )
-            seqs[index++] = al.getSequenceAt(i);
+          ( (ClustalxColourScheme) cs).resetClustalX(sequences,
+              getWidth());
         }
+      }
+    }
+    catch (java.lang.OutOfMemoryError err)
+    {
+      System.out.println("Out of memory loading groups: " + err);
+    }
+
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param s DOCUMENT ME!
+   * @param recalc DOCUMENT ME!
+   */
+  public void addOrRemove(SequenceI s, boolean recalc)
+  {
+    if (sequences.contains(s))
+    {
+      deleteSequence(s, recalc);
+    }
+    else
+    {
+      addSequence(s, recalc);
+    }
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param s DOCUMENT ME!
+   * @param recalc DOCUMENT ME!
+   */
+  public void deleteSequence(SequenceI s, boolean recalc)
+  {
+    sequences.removeElement(s);
+
+    if (recalc)
+    {
+      recalcConservation();
+    }
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public int getStartRes()
+  {
+    return startRes;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public int getEndRes()
+  {
+    return endRes;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param i DOCUMENT ME!
+   */
+  public void setStartRes(int i)
+  {
+    startRes = i;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param i DOCUMENT ME!
+   */
+  public void setEndRes(int i)
+  {
+    endRes = i;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public int getSize()
+  {
+    return sequences.size();
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param i DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public SequenceI getSequenceAt(int i)
+  {
+    return (SequenceI) sequences.elementAt(i);
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param state DOCUMENT ME!
+   */
+  public void setColourText(boolean state)
+  {
+    colourText = state;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public boolean getColourText()
+  {
+    return colourText;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param state DOCUMENT ME!
+   */
+  public void setDisplayText(boolean state)
+  {
+    displayText = state;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public boolean getDisplayText()
+  {
+    return displayText;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param state DOCUMENT ME!
+   */
+  public void setDisplayBoxes(boolean state)
+  {
+    displayBoxes = state;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public boolean getDisplayBoxes()
+  {
+    return displayBoxes;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public int getWidth()
+  {
+    // MC This needs to get reset when characters are inserted and deleted
+    if (sequences.size() > 0)
+    {
+      width = ( (SequenceI) sequences.elementAt(0)).getLength();
+    }
+
+    for (int i = 1; i < sequences.size(); i++)
+    {
+      SequenceI seq = (SequenceI) sequences.elementAt(i);
+
+      if (seq.getLength() > width)
+      {
+        width = seq.getLength();
+      }
+    }
 
-        return seqs;
+    return width;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param c DOCUMENT ME!
+   */
+  public void setOutlineColour(Color c)
+  {
+    outlineColour = c;
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public Color getOutlineColour()
+  {
+    return outlineColour;
+  }
+
+  /**
+   *
+   * returns the sequences in the group ordered by the ordering given by al
+   *
+   * @param al Alignment
+   * @return SequenceI[]
+   */
+  public SequenceI[] getSequencesInOrder(AlignmentI al)
+  {
+    int sSize = sequences.size();
+    int alHeight = al.getHeight();
+
+    SequenceI[] seqs = new SequenceI[sSize];
+
+    int index = 0;
+    for (int i = 0; i < alHeight && index < sSize; i++)
+    {
+      if (sequences.contains(al.getSequenceAt(i)))
+      {
+        seqs[index++] = al.getSequenceAt(i);
+      }
     }
+
+    return seqs;
+  }
 }