jalview 2.5 release banner

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

diff --git a/src/jalview/io/JnetAnnotationMaker.java b/src/jalview/io/JnetAnnotationMaker.java
index 8c841a8..a4160c5 100755 (executable)
--- a/src/jalview/io/JnetAnnotationMaker.java
+++ b/src/jalview/io/JnetAnnotationMaker.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;
 
@@ -33,17 +32,17 @@ public class JnetAnnotationMaker
    * adds the annotation parsed by prediction to al.
    * 
    * @param prediction
-   *                JPredFile
+   *          JPredFile
    * @param al
-   *                AlignmentI
+   *          AlignmentI
    * @param firstSeq
-   *                int the index of the sequence to attach the annotation to
-   *                (usually zero)
+   *          int the index of the sequence to attach the annotation to (usually
+   *          zero)
    * @param noMsa
-   *                boolean
+   *          boolean
    * @param delMap
-   *                mapping from columns in JPredFile prediction to residue
-   *                number in al.getSequence(firstSeq)
+   *          mapping from columns in JPredFile prediction to residue number in
+   *          al.getSequence(firstSeq)
    */
   public static void add_annotation(JPredFile prediction, AlignmentI al,
           int firstSeq, boolean noMsa, int[] delMap) throws Exception