jalview 2.5 release banner

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

diff --git a/src/jalview/io/AlignFile.java b/src/jalview/io/AlignFile.java
index 7a469dd..3f43582 100755 (executable)
--- a/src/jalview/io/AlignFile.java
+++ b/src/jalview/io/AlignFile.java
@@ -1,20 +1,19 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
- * 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.
  * 
- * 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
+ * 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/>.
  */
 package jalview.io;
 
@@ -67,9 +66,9 @@ public abstract class AlignFile extends FileParse
    * Constructor which parses the data from a file of some specified type.
    * 
    * @param inFile
-   *                Filename to read from.
+   *          Filename to read from.
    * @param type
-   *                What type of file to read from (File, URL)
+   *          What type of file to read from (File, URL)
    */
   public AlignFile(String inFile, String type) throws IOException
   {
@@ -158,10 +157,10 @@ public abstract class AlignFile extends FileParse
    * properties note: null keys will raise an error, null values will result in
    * the key/value pair being silently ignored.
    * 
-   * @param key -
-   *                non-null key object
-   * @param value -
-   *                non-null value
+   * @param key
+   *          - non-null key object
+   * @param value
+   *          - non-null value
    */
   protected void setAlignmentProperty(Object key, Object value)
   {
@@ -203,7 +202,7 @@ public abstract class AlignFile extends FileParse
    * DOCUMENT ME!
    * 
    * @param s
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   protected void setSeqs(SequenceI[] s)
   {