fixed issue with cutting off of long names in pdf export + minor changes

[jalview.git] / forester / java / src / org / forester / msa / DeleteableMsa.java

diff --git a/forester/java/src/org/forester/msa/DeleteableMsa.java b/forester/java/src/org/forester/msa/DeleteableMsa.java
index 172ce4d..5126e47 100644 (file)
--- a/forester/java/src/org/forester/msa/DeleteableMsa.java
+++ b/forester/java/src/org/forester/msa/DeleteableMsa.java
@@ -27,7 +27,7 @@ package org.forester.msa;
 import java.util.List;
 
 import org.forester.sequence.BasicSequence;
-import org.forester.sequence.Sequence;
+import org.forester.sequence.MolecularSequence;
 
 public final class DeleteableMsa extends BasicMsa {
 
@@ -102,7 +102,7 @@ public final class DeleteableMsa extends BasicMsa {
         }
     }
 
-    final public Sequence deleteRow( final String id, final boolean return_removed_seq ) {
+    final public MolecularSequence deleteRow( final String id, final boolean return_removed_seq ) {
         int row = -1;
         for( int r = 0; r < getNumberOfSequences(); ++r ) {
             if ( getIdentifier( r ).equals( id ) ) {
@@ -113,15 +113,15 @@ public final class DeleteableMsa extends BasicMsa {
         if ( row < 0 ) {
             throw new IllegalArgumentException( "id [" + id + "] not found" );
         }
-        Sequence s = null;
+        MolecularSequence 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 ] );
+            for( final char element : x ) {
+                if ( element != MolecularSequence.GAP ) {
+                    sb.append( element );
                 }
             }
         }
@@ -158,7 +158,7 @@ public final class DeleteableMsa extends BasicMsa {
     }
 
     @Override
-    public Sequence getSequence( final int row ) {
+    public MolecularSequence getSequence( final int row ) {
         checkRow( row );
         return new BasicSequence( getIdentifier( row ), getSequenceAsString( row ).toString(), getType() );
     }
@@ -166,7 +166,7 @@ public final class DeleteableMsa extends BasicMsa {
     final public boolean isAllGap( final int col ) {
         final int m_col = _mapped_col_positions[ col ];
         for( int j = 0; j < getNumberOfSequences(); ++j ) {
-            if ( super.getResidueAt( _mapped_row_positions[ j ], m_col ) != Sequence.GAP ) {
+            if ( super.getResidueAt( _mapped_row_positions[ j ], m_col ) != MolecularSequence.GAP ) {
                 return false;
             }
         }
@@ -200,7 +200,7 @@ public final class DeleteableMsa extends BasicMsa {
 
     final private void deleteColumn( final int col ) {
         checkColumn( col );
-        for( int c = col; c < _length - 1; ++c ) {
+        for( int c = col; c < ( _length - 1 ); ++c ) {
             _mapped_col_positions[ c ] = _mapped_col_positions[ c + 1 ];
         }
         --_length;
@@ -208,13 +208,13 @@ public final class DeleteableMsa extends BasicMsa {
 
     final private void deleteRow( final int row ) {
         checkRow( row );
-        for( int r = row; r < _seqs - 1; ++r ) {
+        for( int r = row; r < ( _seqs - 1 ); ++r ) {
             _mapped_row_positions[ r ] = _mapped_row_positions[ r + 1 ];
         }
         --_seqs;
     }
 
-    public final static DeleteableMsa createInstance( final List<Sequence> seqs ) {
+    public final static DeleteableMsa createInstance( final List<MolecularSequence> seqs ) {
         return new DeleteableMsa( ( BasicMsa ) BasicMsa.createInstance( seqs ) );
     }