Merge branch 'develop' into trialMerge

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

diff --git a/src/jalview/io/ModellerDescription.java b/src/jalview/io/ModellerDescription.java
index 7e05b15..a56f2af 100755 (executable)
--- a/src/jalview/io/ModellerDescription.java
+++ b/src/jalview/io/ModellerDescription.java
@@ -25,6 +25,8 @@ import jalview.datamodel.SequenceI;
 
 import java.util.List;
 
+import com.stevesoft.pat.Regex;
+
 public class ModellerDescription
 {
   /**
@@ -88,7 +90,7 @@ public class ModellerDescription
 
     resCode(int v)
     {
-      val = new Integer(v);
+      val = Integer.valueOf(v);
       field = val.toString();
     }
   };
@@ -96,7 +98,7 @@ public class ModellerDescription
   private resCode validResidueCode(String field)
   {
     Integer val = null;
-    com.stevesoft.pat.Regex r = new com.stevesoft.pat.Regex(
+    Regex r = new Regex(
             "\\s*((([-0-9]+).?)|FIRST|LAST|@)");
 
     if (!r.search(field))