JAL-3210 Barebones gradle/buildship/eclipse. See README

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

diff --git a/src/jalview/io/ModellerDescription.java b/src/jalview/io/ModellerDescription.java
index 4a12387..a56f2af 100755 (executable)
--- a/src/jalview/io/ModellerDescription.java
+++ b/src/jalview/io/ModellerDescription.java
@@ -22,7 +22,6 @@ package jalview.io;
 
 import jalview.datamodel.DBRefEntry;
 import jalview.datamodel.SequenceI;
-import jalview.util.Platform;
 
 import java.util.List;
 
@@ -91,25 +90,17 @@ 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;
-    Regex r = getRegex();
+    Regex r = new Regex(
+            "\\s*((([-0-9]+).?)|FIRST|LAST|@)");
+
     if (!r.search(field))
     {
       return null; // invalid