X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsequence%2FBasicSequence.java;h=6b76f92941f2c66428f1c6d43e999a88b87698e6;hb=5309828c338cdf84ef10f70dc2472cf27016a75b;hp=786cc03c9ba9c553bba4afdad6e373e8a05de100;hpb=045ed0731ed1997f6ccf41b2a7688d028ea73a0a;p=jalview.git

diff --git a/forester/java/src/org/forester/sequence/BasicSequence.java b/forester/java/src/org/forester/sequence/BasicSequence.java
index 786cc03..6b76f92 100644
--- a/forester/java/src/org/forester/sequence/BasicSequence.java
+++ b/forester/java/src/org/forester/sequence/BasicSequence.java
@@ -26,27 +26,41 @@
 
 package org.forester.sequence;
 
+import org.forester.util.ForesterUtil;
+
 public class BasicSequence implements Sequence {
 
     private final char[] _mol_sequence;
-    private final Object _identifier;
+    private final String _identifier;
     private final TYPE   _type;
 
-    private BasicSequence( final Object identifier, final String mol_sequence, final TYPE type ) {
+    private BasicSequence( final String identifier, final String mol_sequence, final TYPE type ) {
+        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!
-    public BasicSequence( final Object identifier, final char[] mol_sequence, final TYPE type ) {
+    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" );
+        }
+        if ( ( mol_sequence == null ) || ( mol_sequence.length < 1 ) ) {
+            throw new IllegalArgumentException( "molecular sequence cannot be empty" );
+        }
         _mol_sequence = mol_sequence;
         _identifier = identifier;
         _type = type;
     }
 
     @Override
-    public Object getIdentifier() {
+    public String getIdentifier() {
         return _identifier;
     }
 
@@ -73,8 +87,8 @@ public class BasicSequence implements Sequence {
     @Override
     public int getNumberOfGapResidues() {
         int gaps = 0;
-        for( int i = 0; i < _mol_sequence.length; ++i ) {
-            if ( _mol_sequence[ i ] == GAP ) {
+        for( final char element : _mol_sequence ) {
+            if ( element == GAP ) {
                 ++gaps;
             }
         }
@@ -82,26 +96,59 @@ public class BasicSequence implements Sequence {
     }
 
     @Override
+    public boolean equals( final Object obj ) {
+        if ( obj == null ) {
+            return false;
+        }
+        if ( obj.getClass() != getClass() ) {
+            return false;
+        }
+        final Sequence other = ( Sequence ) obj;
+        if ( getMolecularSequenceAsString().equals( other.getMolecularSequenceAsString() ) ) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return getMolecularSequenceAsString().hashCode();
+    }
+
+    @Override
     public String toString() {
         final StringBuffer sb = new StringBuffer();
         sb.append( _identifier.toString() );
-        sb.append( " " );
-        sb.append( new String( _mol_sequence ) );
+        sb.append( ": " );
+        sb.append( getMolecularSequenceAsString() );
         return sb.toString();
     }
 
-    public static Sequence createAaSequence( final Object identifier, final String mol_sequence ) {
+    public static Sequence copySequence( final Sequence seq ) {
+        final char[] s = new char[ seq.getMolecularSequence().length ];
+        for( int i = 0; i < seq.getMolecularSequence().length; i++ ) {
+            s[ i ] = seq.getMolecularSequence()[ i ];
+        }
+        return new BasicSequence( new String( seq.getIdentifier() ), s, seq.getType() );
+    }
+
+    public static Sequence createAaSequence( final String identifier, final String mol_sequence ) {
         return new BasicSequence( identifier, mol_sequence.toUpperCase().replaceAll( "\\.", GAP_STR )
                 .replaceAll( AA_REGEXP, Character.toString( UNSPECIFIED_AA ) ), TYPE.AA );
     }
 
-    public static Sequence createDnaSequence( final Object identifier, final String mol_sequence ) {
+    public static Sequence createDnaSequence( final String identifier, final String mol_sequence ) {
         return new BasicSequence( identifier, mol_sequence.toUpperCase().replaceAll( "\\.", GAP_STR )
                 .replaceAll( DNA_REGEXP, Character.toString( UNSPECIFIED_NUC ) ), TYPE.DNA );
     }
 
-    public static Sequence createRnaSequence( final Object identifier, final String mol_sequence ) {
+    public static Sequence createRnaSequence( final String identifier, final String mol_sequence ) {
         return new BasicSequence( identifier, mol_sequence.toUpperCase().replaceAll( "\\.", GAP_STR )
                 .replaceAll( RNA_REGEXP, Character.toString( UNSPECIFIED_NUC ) ), TYPE.RNA );
     }
+
+    @Override
+    public String getMolecularSequenceAsString() {
+        return new String( getMolecularSequence() );
+    }
 }