X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FTCoffeeScoreFile.java;h=ca8a22ab7e9c1867ffd7157319142d3910be892d;hb=ad15cff29620f960119f80176f1fd443da9f6763;hp=7e5f0c317d4a47774261377dba15b8eff0e87022;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/io/TCoffeeScoreFile.java b/src/jalview/io/TCoffeeScoreFile.java index 7e5f0c3..ca8a22a 100644 --- a/src/jalview/io/TCoffeeScoreFile.java +++ b/src/jalview/io/TCoffeeScoreFile.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * 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. * @@ -89,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); @@ -396,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. * @@ -458,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); @@ -550,8 +553,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;