JAL-1432 updated copyright notices

[jalview.git] / src / jalview / io / FastaFile.java

diff --git a/src/jalview/io/FastaFile.java b/src/jalview/io/FastaFile.java
index 2ee715d..9cc3b55 100755 (executable)
--- a/src/jalview/io/FastaFile.java
+++ b/src/jalview/io/FastaFile.java
@@ -1,20 +1,20 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
  * 
- * This program 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 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program 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.
+ * 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.
+ *  
+ * 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * 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;
 
@@ -48,12 +48,12 @@ public class FastaFile extends AlignFile
    * Creates a new FastaFile object.
    * 
    * @param inFile
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    * @param type
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    * 
    * @throws IOException
-   *                 DOCUMENT ME!
+   *           DOCUMENT ME!
    */
   public FastaFile(String inFile, String type) throws IOException
   {
@@ -69,7 +69,7 @@ public class FastaFile extends AlignFile
    * DOCUMENT ME!
    * 
    * @throws IOException
-   *                 DOCUMENT ME!
+   *           DOCUMENT ME!
    */
   public void parse() throws IOException
   {
@@ -181,13 +181,13 @@ public class FastaFile extends AlignFile
    * DOCUMENT ME!
    * 
    * @param s
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    * @param len
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    * @param gaps
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    * @param displayId
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    * 
    * @return DOCUMENT ME!
    */
@@ -204,7 +204,7 @@ public class FastaFile extends AlignFile
         out.append(" " + s[i].getDescription());
       }
 
-      out.append("\n");
+      out.append(newline);
 
       int nochunks = (s[i].getLength() / len) + 1;
 
@@ -215,12 +215,12 @@ public class FastaFile extends AlignFile
 
         if (end < s[i].getLength())
         {
-          out.append(s[i].getSequenceAsString(start, end) + "\n");
+          out.append(s[i].getSequenceAsString(start, end) + newline);
         }
         else if (start < s[i].getLength())
         {
           out.append(s[i].getSequenceAsString(start, s[i].getLength())
-                  + "\n");
+                  + newline);
         }
       }