apply version 2.7 copyright

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

diff --git a/src/jalview/io/MatrixFile.java b/src/jalview/io/MatrixFile.java
index 011eda3..11463ce 100644 (file)
--- a/src/jalview/io/MatrixFile.java
+++ b/src/jalview/io/MatrixFile.java
@@ -1,20 +1,19 @@
 /*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)\r
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)\r
+ * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle\r
  * \r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
+ * This file is part of Jalview.\r
  * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
+ * Jalview is free software: you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License \r
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\r
  * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
+ * Jalview is distributed in the hope that it will be useful, but \r
+ * WITHOUT ANY WARRANTY; without even the implied warranty \r
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR \r
+ * PURPOSE.  See the GNU General Public License for more details.\r
+ * \r
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.\r
  */\r
 package jalview.io;\r
 \r
@@ -25,8 +24,8 @@ import java.io.IOException;
  * by PCA viewer. Form is: tab separated entity defs header line TITLE\ttitle\r
  * DESC\tdesc PROPERTY\t<id or empty for whole matrix>\tname\ttype\tvalue\r
  * ROW\tRow i label (ID)/tPrinciple text/tprinciple description/t...\r
- * COLUMN\t(similar, optional).. .. <float>\t<float>...(column-wise data for\r
- * row i)\r
+ * COLUMN\t(similar, optional).. .. <float>\t<float>...(column-wise data for row\r
+ * i)\r
  */\r
 \r
 public class MatrixFile extends FileParse\r