X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FTCoffeeScoreFile.java;h=07d7be4c1cea172765e32a420837b6a2501def56;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=5b7194e307e86e7c498f295c383e05fa8586a9f5;hpb=0e2054d29bc49351f000d478659dc3c4371b251c;p=jalview.git

diff --git a/src/jalview/io/TCoffeeScoreFile.java b/src/jalview/io/TCoffeeScoreFile.java
index 5b7194e..07d7be4 100644
--- a/src/jalview/io/TCoffeeScoreFile.java
+++ b/src/jalview/io/TCoffeeScoreFile.java
@@ -1,19 +1,21 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * 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.
+ * 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 Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.io;
@@ -87,7 +89,8 @@ import java.util.regex.Pattern;
  * @author Paolo Di Tommaso
  * 
  */
-public class TCoffeeScoreFile extends AlignFile {
+public class TCoffeeScoreFile extends AlignFile
+{
   public TCoffeeScoreFile(String inFile, String type) throws IOException
   {
     super(inFile, type);
@@ -394,8 +397,9 @@ public class TCoffeeScoreFile extends AlignFile {
     }
   }
 
-  static Pattern SCORES_WITH_RESIDUE_NUMS = Pattern.compile("^\\d+\\s([^\\s]+)\\s+\\d+$");
-  
+  static Pattern SCORES_WITH_RESIDUE_NUMS = Pattern
+          .compile("^\\d+\\s([^\\s]+)\\s+\\d+$");
+
   /**
    * Read a scores block ihe provided stream.
    * 
@@ -456,10 +460,11 @@ public class TCoffeeScoreFile extends AlignFile {
       String val = line.substring(p + 1).trim();
 
       Matcher m = SCORES_WITH_RESIDUE_NUMS.matcher(val);
-      if( m.matches() ) {
-    	  val = m.group(1);
+      if (m.matches())
+      {
+        val = m.group(1);
       }
-      
+
       result.items.put(id, val);
 
     } while ((line = reader.nextLine()) != null);
@@ -520,8 +525,7 @@ public class TCoffeeScoreFile extends AlignFile {
   /**
    * TCOFFEE score colourscheme
    */
-  static final Color[] colors =
-  { new Color(102, 102, 255), // #6666FF
+  static final Color[] colors = { new Color(102, 102, 255), // #6666FF
       new Color(0, 255, 0), // #00FF00
       new Color(102, 255, 0), // #66FF00
       new Color(204, 255, 0), // #CCFF00
@@ -548,8 +552,11 @@ public class TCoffeeScoreFile extends AlignFile {
   {
     if (al.getHeight() != getHeight() || al.getWidth() != getWidth())
     {
-      String info = String.format("align w: %s, h: %s; score: w: %s; h: %s ", al.getWidth(), al.getHeight(), getWidth(), getHeight() );
-      warningMessage = "Alignment shape does not match T-Coffee score file shape -- " + info;
+      String info = String.format(
+              "align w: %s, h: %s; score: w: %s; h: %s ", al.getWidth(),
+              al.getHeight(), getWidth(), getHeight());
+      warningMessage = "Alignment shape does not match T-Coffee score file shape -- "
+              + info;
       return false;
     }
     boolean added = false;