X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fdatamodel%2FAlignmentI.java;h=b46a1a780c970688dba8fe68407ecf7de479c36f;hb=af7d55faa6df986fda34b245de48e7423f1b79e0;hp=5a21a0476ed2a132070edb10760e41b21ef1a9f6;hpb=c19db28827bb0f5704354e4bfc049855fc3f220a;p=jalview.git

diff --git a/src/jalview/datamodel/AlignmentI.java b/src/jalview/datamodel/AlignmentI.java
index 5a21a04..b46a1a7 100755
--- a/src/jalview/datamodel/AlignmentI.java
+++ b/src/jalview/datamodel/AlignmentI.java
@@ -1,6 +1,5 @@
 package jalview.datamodel;
 
-import jalview.jbgui.*;
 import java.util.*;
 
 /** Data structure to hold and manipulate a multiple sequence alignment
@@ -11,6 +10,8 @@ public interface AlignmentI {
   public int         getWidth() ;
   public int         getMaxIdLength() ;
 
+  public boolean isAligned();
+
   public Vector      getSequences();
   public SequenceI   getSequenceAt(int i);
 
@@ -29,7 +30,7 @@ public interface AlignmentI {
   public void        insertColumns(SequenceI[] seqs, int pos) ;
 
   public SequenceI   findName(String name) ;
-  public SequenceI findbyDisplayId(String name);
+  public SequenceI   findbyDisplayId(String name);
 
   public int         findIndex(SequenceI s) ;
 
@@ -44,22 +45,32 @@ public interface AlignmentI {
   // Grouping methods
   public SequenceGroup findGroup(int i) ;
   public SequenceGroup findGroup(SequenceI s) ;
+  public SequenceGroup [] findAllGroups(SequenceI s);
   public void          addToGroup(SequenceGroup g, SequenceI s) ;
   public void          removeFromGroup(SequenceGroup g,SequenceI s) ;
   public void          addGroup(SequenceGroup sg) ;
-  public SequenceGroup addGroup() ;
   public void          deleteGroup(SequenceGroup g) ;
   public Vector        getGroups();
+  public void deleteAllGroups();
+
+  public void          addSuperGroup(SuperGroup sg);
+  public void          removeSuperGroup(SuperGroup sg);
+  public SuperGroup    getSuperGroup(SequenceGroup sg);
 
   // Sorting
   public void          sortGroups() ;
   public void          sortByPID(SequenceI s) ;
   public void          sortByID() ;
 
-  public void          setGapCharacter(String gc);
-  public String        getGapCharacter();
+  //Annotations
+  public void addAnnotation(AlignmentAnnotation aa);
+  public void deleteAnnotation(AlignmentAnnotation aa);
+  public AlignmentAnnotation [] getAlignmentAnnotation();
+
+  public void          setGapCharacter(char gc);
+  public char          getGapCharacter();
 
-    public Vector        getAAFrequency();
+  public Vector        getAAFrequency();
 }