X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FModellerDescription.java;h=497671967a9fcd407c4956d13223101a3b693f7d;hb=c0501eaa85c0594f9275766f64de8ea44a59c368;hp=48a69034ee8eb9bf7cc54ba426b9a6242b46fd96;hpb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;p=jalview.git diff --git a/src/jalview/io/ModellerDescription.java b/src/jalview/io/ModellerDescription.java index 48a6903..4976719 100755 --- a/src/jalview/io/ModellerDescription.java +++ b/src/jalview/io/ModellerDescription.java @@ -23,6 +23,7 @@ package jalview.io; import jalview.datamodel.DBRefEntry; import jalview.datamodel.SequenceI; import jalview.util.Platform; +import jalview.bin.Console; import java.util.List; @@ -105,11 +106,11 @@ public class ModellerDescription .newRegex("\\s*((([-0-9]+).?)|FIRST|LAST|@)", null) : VALIDATION_REGEX); } - private resCode validResidueCode(String field) { Integer val = null; Regex r = getRegex(); + if (!r.search(field)) { return null; // invalid @@ -119,7 +120,7 @@ public class ModellerDescription { value = r.stringMatched(1); } - // jalview.bin.Cache.log.debug("from '" + field + "' matched '" + value + + // jalview.bin.Console.debug("from '" + field + "' matched '" + value + // "'"); try { @@ -174,7 +175,7 @@ public class ModellerDescription } else { - // jalview.bin.Cache.log.debug( + // jalview.bin.Console.debug( // "Ignoring non-Modeller description: invalid integer-like // field '" + field + "'"); type = -1; /* invalid field! - throw the FieldSet away */