X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFastaFile.java;h=ec1c82e25611a3abf016bd99bd305a788c4b778c;hb=d7361eaa08dc9af7d996851f39b7a2007d1b8832;hp=2db0ded1682df40d00c8420c7e2518188486c5cb;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git

diff --git a/src/jalview/io/FastaFile.java b/src/jalview/io/FastaFile.java
index 2db0ded..ec1c82e 100755
--- a/src/jalview/io/FastaFile.java
+++ b/src/jalview/io/FastaFile.java
@@ -1,27 +1,32 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.io;
 
-import java.io.*;
+import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.Annotation;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceI;
 
-
-import jalview.datamodel.*;
+import java.io.IOException;
 
 /**
  * DOCUMENT ME!
@@ -72,12 +77,13 @@ public class FastaFile extends AlignFile
    * @throws IOException
    *           DOCUMENT ME!
    */
+  @Override
   public void parse() throws IOException
   {
     StringBuffer sb = new StringBuffer();
     boolean firstLine = true;
 
-    String line,uline;
+    String line, uline;
     Sequence seq = null;
 
     boolean annotation = false;
@@ -139,23 +145,24 @@ public class FastaFile extends AlignFile
       seqs.addElement(seq);
     }
   }
+
   private AlignmentAnnotation makeAnnotation(SequenceI seq, StringBuffer sb)
   {
     Annotation[] anots = new Annotation[sb.length()];
     char cb;
-    for (int i=0;i<anots.length;i++)
+    for (int i = 0; i < anots.length; i++)
     {
       char cn = sb.charAt(i);
       if (cn != ' ')
       {
-        anots[i] = new Annotation(""+cn, null,
-              ' ', Float.NaN);
+        anots[i] = new Annotation("" + cn, null, ' ', Float.NaN);
       }
     }
     AlignmentAnnotation aa = new AlignmentAnnotation(seq.getName()
             .substring(2), seq.getDescription(), anots);
     return aa;
   }
+
   /**
    * called by AppletFormatAdapter to generate an annotated alignment, rather
    * than bare sequences.
@@ -167,8 +174,7 @@ public class FastaFile extends AlignFile
     addProperties(al);
     for (int i = 0; i < annotations.size(); i++)
     {
-      AlignmentAnnotation aa = (AlignmentAnnotation) annotations
-              .elementAt(i);
+      AlignmentAnnotation aa = annotations.elementAt(i);
       aa.setPadGaps(true, al.getGapCharacter());
       al.addAnnotation(aa);
     }
@@ -203,7 +209,8 @@ public class FastaFile extends AlignFile
 
       out.append(newline);
 
-      int nochunks = (s[i].getLength() / len) + 1;
+      int nochunks = (s[i].getLength() / len)
+              + (s[i].getLength() % len > 0 ? 1 : 0);
 
       for (int j = 0; j < nochunks; j++)
       {
@@ -232,6 +239,7 @@ public class FastaFile extends AlignFile
    * 
    * @return DOCUMENT ME!
    */
+  @Override
   public String print()
   {
     return print(getSeqsAsArray());