X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fmsa%2FDeleteableMsa.java;h=350aae25cc4526b8907ca3fd93ec9b7fffd9dbf8;hb=0465b8ebe16d57902022bba6f90f25dd1a18e656;hp=a781bf69fb25f492a664799a89f1ee8c4cb9cfaf;hpb=920278dc79977b8fc30b43ef06a7d207dccbe9cd;p=jalview.git diff --git a/forester/java/src/org/forester/msa/DeleteableMsa.java b/forester/java/src/org/forester/msa/DeleteableMsa.java index a781bf6..350aae2 100644 --- a/forester/java/src/org/forester/msa/DeleteableMsa.java +++ b/forester/java/src/org/forester/msa/DeleteableMsa.java @@ -81,7 +81,7 @@ public final class DeleteableMsa extends BasicMsa { } } - final public Sequence deleteRow( final String id ) { + final public Sequence deleteRow( final String id, final boolean return_removed_seq ) { int row = -1; for( int r = 0; r < getNumberOfSequences(); ++r ) { if ( getIdentifier( r ).equals( id ) ) { @@ -92,9 +92,25 @@ public final class DeleteableMsa extends BasicMsa { if ( row < 0 ) { throw new IllegalArgumentException( "id [" + id + "] not found" ); } - final Sequence s = getSequence( row ); + Sequence s = null; + StringBuilder sb = null; + if ( return_removed_seq ) { + s = getSequence( row ); + final char[] x = s.getMolecularSequence(); + sb = new StringBuilder( x.length ); + for( int i = 0; i < x.length; ++i ) { + if ( x[ i ] != Sequence.GAP ) { + sb.append( x[ i ] ); + } + } + } deleteRow( row ); - return s; + if ( return_removed_seq ) { + return new BasicSequence( new String( s.getIdentifier() ), sb.toString(), s.getType() ); + } + else { + return null; + } } @Override