X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsequence%2FBasicSequence.java;h=6d339cae25790d8538deed1f8efbd04527729d75;hb=f4c563596b6968fd343fdab7fa32b54431a17f2e;hp=4a4662ac6006f32adbe0134569f729dcda6e1833;hpb=656be28debec520e0e35a8b311114398a40ea366;p=jalview.git

diff --git a/forester/java/src/org/forester/sequence/BasicSequence.java b/forester/java/src/org/forester/sequence/BasicSequence.java
index 4a4662a..6d339ca 100644
--- a/forester/java/src/org/forester/sequence/BasicSequence.java
+++ b/forester/java/src/org/forester/sequence/BasicSequence.java
@@ -28,25 +28,36 @@ package org.forester.sequence;
 
 import org.forester.util.ForesterUtil;
 
-public class BasicSequence implements Sequence {
+public class BasicSequence implements MolecularSequence {
 
     private final char[] _mol_sequence;
-    private final String _identifier;
+    private String       _identifier;
     private final TYPE   _type;
 
-    private BasicSequence( final String identifier, final String mol_sequence, final TYPE type ) {
+    /**
+     * Only use if you know what you are doing!
+     *
+     */
+    public BasicSequence( final String identifier, final String mol_sequence, final TYPE type ) {
+        check( identifier, mol_sequence );
+        _mol_sequence = mol_sequence.toCharArray();
+        _identifier = identifier;
+        _type = type;
+    }
+
+    private static final void check( final String identifier, final String mol_sequence ) {
         if ( ForesterUtil.isEmpty( identifier ) ) {
             throw new IllegalArgumentException( "identifier of sequence cannot be empty" );
         }
         if ( ForesterUtil.isEmpty( mol_sequence ) ) {
             throw new IllegalArgumentException( "molecular sequence cannot be empty" );
         }
-        _mol_sequence = mol_sequence.toCharArray();
-        _identifier = identifier;
-        _type = type;
     }
 
-    // Only use if you know what you are doing!
+    /**
+     * Only use if you know what you are doing!
+     *
+     */
     public BasicSequence( final String identifier, final char[] mol_sequence, final TYPE type ) {
         if ( ForesterUtil.isEmpty( identifier ) ) {
             throw new IllegalArgumentException( "identifier of sequence cannot be empty" );
@@ -59,6 +70,10 @@ public class BasicSequence implements Sequence {
         _type = type;
     }
 
+    public void setIdentifier( final String id ) {
+        _identifier = id;
+    }
+
     @Override
     public String getIdentifier() {
         return _identifier;
@@ -103,7 +118,7 @@ public class BasicSequence implements Sequence {
         if ( obj.getClass() != getClass() ) {
             return false;
         }
-        final Sequence other = ( Sequence ) obj;
+        final MolecularSequence other = ( MolecularSequence ) obj;
         if ( getMolecularSequenceAsString().equals( other.getMolecularSequenceAsString() ) ) {
             return true;
         }
@@ -124,7 +139,7 @@ public class BasicSequence implements Sequence {
         return sb.toString();
     }
 
-    public static Sequence copySequence( final Sequence seq ) {
+    public static MolecularSequence copySequence( final MolecularSequence seq ) {
         final char[] s = new char[ seq.getMolecularSequence().length ];
         for( int i = 0; i < seq.getMolecularSequence().length; i++ ) {
             s[ i ] = seq.getMolecularSequence()[ i ];
@@ -132,23 +147,31 @@ public class BasicSequence implements Sequence {
         return new BasicSequence( new String( seq.getIdentifier() ), s, seq.getType() );
     }
 
-    public static Sequence createAaSequence( final String identifier, final String mol_sequence ) {
+    public static MolecularSequence createAaSequence( final String identifier, final String mol_sequence ) {
+        check( identifier, mol_sequence );
         return new BasicSequence( identifier, mol_sequence.toUpperCase().replaceAll( "\\.", GAP_STR )
-                .replaceAll( AA_REGEXP, Character.toString( UNSPECIFIED_AA ) ), TYPE.AA );
+                                  .replaceAll( AA_REGEXP, Character.toString( UNSPECIFIED_AA ) ), TYPE.AA );
     }
 
-    public static Sequence createDnaSequence( final String identifier, final String mol_sequence ) {
+    public static MolecularSequence createDnaSequence( final String identifier, final String mol_sequence ) {
+        check( identifier, mol_sequence );
         return new BasicSequence( identifier, mol_sequence.toUpperCase().replaceAll( "\\.", GAP_STR )
-                .replaceAll( DNA_REGEXP, Character.toString( UNSPECIFIED_NUC ) ), TYPE.DNA );
+                                  .replaceAll( DNA_REGEXP, Character.toString( UNSPECIFIED_NUC ) ), TYPE.DNA );
     }
 
-    public static Sequence createRnaSequence( final String identifier, final String mol_sequence ) {
+    public static MolecularSequence createRnaSequence( final String identifier, final String mol_sequence ) {
+        check( identifier, mol_sequence );
         return new BasicSequence( identifier, mol_sequence.toUpperCase().replaceAll( "\\.", GAP_STR )
-                .replaceAll( RNA_REGEXP, Character.toString( UNSPECIFIED_NUC ) ), TYPE.RNA );
+                                  .replaceAll( RNA_REGEXP, Character.toString( UNSPECIFIED_NUC ) ), TYPE.RNA );
     }
 
     @Override
     public String getMolecularSequenceAsString() {
         return new String( getMolecularSequence() );
     }
+
+    @Override
+    public boolean isGapAt( final int position ) {
+        return getResidueAt( position ) == GAP;
+    }
 }