X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAlignFile.java;h=ad834be8c071b4ffda0f1dc6103aee5a9b4cf8f4;hb=a45774ee31d9f35d4eff46d54d7deab719afb092;hp=3ca2563b1e80d83ce47c28a1e0fb1510090c406c;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git diff --git a/src/jalview/io/AlignFile.java b/src/jalview/io/AlignFile.java index 3ca2563..ad834be 100755 --- a/src/jalview/io/AlignFile.java +++ b/src/jalview/io/AlignFile.java @@ -1,20 +1,19 @@ /* - * 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.7) + * Copyright (C) 2011 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 . */ 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) {