X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FModellerDescription.java;h=48a69034ee8eb9bf7cc54ba426b9a6242b46fd96;hb=fbab485e42c5b07733ae390b236d944abfcedefb;hp=7e05b15482d6828fbfa191a734ab91344f8edfd9;hpb=26b115b0a77d521da92a06572d9b7819c2d0d49a;p=jalview.git diff --git a/src/jalview/io/ModellerDescription.java b/src/jalview/io/ModellerDescription.java index 7e05b15..48a6903 100755 --- a/src/jalview/io/ModellerDescription.java +++ b/src/jalview/io/ModellerDescription.java @@ -22,9 +22,12 @@ package jalview.io; import jalview.datamodel.DBRefEntry; import jalview.datamodel.SequenceI; +import jalview.util.Platform; import java.util.List; +import com.stevesoft.pat.Regex; + public class ModellerDescription { /** @@ -88,17 +91,25 @@ public class ModellerDescription resCode(int v) { - val = new Integer(v); + val = Integer.valueOf(v); field = val.toString(); } }; + private static Regex VALIDATION_REGEX; + + private static Regex getRegex() + { + return (VALIDATION_REGEX == null + ? VALIDATION_REGEX = Platform + .newRegex("\\s*((([-0-9]+).?)|FIRST|LAST|@)", null) + : VALIDATION_REGEX); + } + private resCode validResidueCode(String field) { Integer val = null; - com.stevesoft.pat.Regex r = new com.stevesoft.pat.Regex( - "\\s*((([-0-9]+).?)|FIRST|LAST|@)"); - + Regex r = getRegex(); if (!r.search(field)) { return null; // invalid