Merge branch 'develop' into merged_2_11_2_0_to_2_12

[jalview.git] / src / jalview / io / ModellerDescription.java

diff --git a/src/jalview/io/ModellerDescription.java b/src/jalview/io/ModellerDescription.java
index 48a6903..4976719 100755 (executable)
--- 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 */