X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fmsa%2FMsa.java;h=066b10ff2d41784c33ac77251eec5b4198439272;hb=20ce9361380c461b8a7053100207034314e56e23;hp=50fcee94673cfcff12aefb13cf128f5e1e1226c8;hpb=505270dd6bd8892fe00658607de06e5f030b11db;p=jalview.git

diff --git a/forester/java/src/org/forester/msa/Msa.java b/forester/java/src/org/forester/msa/Msa.java
index 50fcee9..066b10f 100644
--- a/forester/java/src/org/forester/msa/Msa.java
+++ b/forester/java/src/org/forester/msa/Msa.java
@@ -21,7 +21,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 //
 // Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
 
 package org.forester.msa;
 
@@ -29,13 +29,18 @@ import java.io.IOException;
 import java.io.Writer;
 import java.util.List;
 
-import org.forester.sequence.Sequence.TYPE;
+import org.forester.sequence.MolecularSequence;
+import org.forester.sequence.MolecularSequence.TYPE;
 
 public interface Msa {
 
-    public Object getIdentifier( int row );
+    public static enum MSA_FORMAT {
+        FASTA, PHYLIP, NEXUS;
+    }
 
-    public void setIdentifier( int row, Object identifier );
+    public String getIdentifier( int row );
+
+    public void setIdentifier( int row, String identifier );
 
     public int getLength();
 
@@ -43,13 +48,21 @@ public interface Msa {
 
     public char getResidueAt( int row, int col );
 
+    public boolean isGapAt( int row, int col );
+
     public List<Character> getColumnAt( int col );
 
+    public MolecularSequence getSequence( final String id );
+
+    public MolecularSequence getSequence( final int row );
+
+    public List<MolecularSequence> asSequenceList();
+
     public StringBuffer getSequenceAsString( int row );
 
     public abstract TYPE getType();
 
     public void setResidueAt( final int row, final int col, final char residue );
 
-    public void write( Writer w ) throws IOException;
+    public void write( Writer w, MSA_FORMAT format ) throws IOException;
 }