JAL-1432 updated copyright notices

[jalview.git] / src / jalview / analysis / ParseProperties.java

diff --git a/src/jalview/analysis/ParseProperties.java b/src/jalview/analysis/ParseProperties.java
index c79d53b..ccae429 100644 (file)
--- a/src/jalview/analysis/ParseProperties.java
+++ b/src/jalview/analysis/ParseProperties.java
@@ -1,20 +1,20 @@
 /*
- * 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.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.analysis;
 
@@ -69,17 +69,17 @@ public class ParseProperties
    * Extract scores for sequences by applying regex to description string.
    * 
    * @param seqs
-   *                seuqences to extract annotation from.
+   *          seuqences to extract annotation from.
    * @param ScoreNames
-   *                labels for each numeric field in regex match
+   *          labels for each numeric field in regex match
    * @param ScoreDescriptions
-   *                description for each numeric field in regex match
+   *          description for each numeric field in regex match
    * @param regex
-   *                Regular Expression string for passing to
-   *                <code>new com.stevesoft.patt.Regex(regex)</code>
+   *          Regular Expression string for passing to
+   *          <code>new com.stevesoft.patt.Regex(regex)</code>
    * @param repeat
-   *                true means the regex will be applied multiple times along
-   *                the description string of each sequence
+   *          true means the regex will be applied multiple times along the
+   *          description string of each sequence
    * @return total number of sequences that matched the regex
    */
   public int getScoresFromDescription(SequenceI[] seqs,