X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FModellerDescription.java;h=c1849fc3d5e5a06422ff20001f577524aa958f2f;hb=c6018dc0dc12720e13b75850a5303279ac7094b7;hp=f7c94c38a8f4701e959f0f7e59b02eb7fd4a0c95;hpb=db93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3;p=jalview.git diff --git a/src/jalview/io/ModellerDescription.java b/src/jalview/io/ModellerDescription.java index f7c94c3..c1849fc 100755 --- a/src/jalview/io/ModellerDescription.java +++ b/src/jalview/io/ModellerDescription.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 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. * @@ -61,7 +61,8 @@ public class ModellerDescription */ final int Types[] = { 0, 0, 1, 0, 1, 0, 0, 0, 0, 0 }; - final char Padding[] = { ' ', ' ', ' ', '.', ' ', '.', '.', '.', '.', '.' }; + final char Padding[] = { ' ', ' ', ' ', '.', ' ', '.', '.', '.', '.', + '.' }; java.util.Hashtable fields = new java.util.Hashtable(); @@ -84,7 +85,7 @@ public class ModellerDescription resCode(int v) { - val = new Integer(v); + val = Integer.valueOf(v); field = val.toString(); } }; @@ -244,15 +245,15 @@ public class ModellerDescription { // Set start and end before we update the type (in the case of a // synthesized field set) - if (getStartCode() == null - || (getStartNum() != seq.getStart() && getStartCode().val != null)) + if (getStartCode() == null || (getStartNum() != seq.getStart() + && getStartCode().val != null)) { // unset or user updated sequence start position setStartCode(seq.getStart()); } - if (getEndCode() == null - || (getEndNum() != seq.getEnd() && getStartCode() != null && getStartCode().val != null)) + if (getEndCode() == null || (getEndNum() != seq.getEnd() + && getStartCode() != null && getStartCode().val != null)) { setEndCode(seq.getEnd()); }