X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FModellerDescription.java;h=fa6ef6d013ac861d592f08959574827cff4fe46f;hb=4486cbff6855402579eff5ccbada47f15a5e8653;hp=13431c17c0433c4f9c9490515a20dde762e1d99f;hpb=174230b4233d9ce80f94527768d2cd2f76da11ab;p=jalview.git

diff --git a/src/jalview/io/ModellerDescription.java b/src/jalview/io/ModellerDescription.java
index 13431c1..fa6ef6d 100755
--- a/src/jalview/io/ModellerDescription.java
+++ b/src/jalview/io/ModellerDescription.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,16 +18,16 @@
  */
 package jalview.io;
 
-import jalview.datamodel.SequenceI;
-import java.util.Vector;
+import jalview.datamodel.*;
+
 public class ModellerDescription
 {
-    /**
-     * Translates between a String containing a set of colon-separated values
-     * on a single line, and sequence start/end and other properties.
-     * See PIRFile IO for its use.
-     */
-    final String[] seqTypes =
+  /**
+   * Translates between a String containing a set of colon-separated values
+   * on a single line, and sequence start/end and other properties.
+   * See PIRFile IO for its use.
+   */
+  final String[] seqTypes =
       {
       "sequence", "structure", "structureX", "structureN"};
   final String[] Fields =
@@ -87,7 +87,8 @@ public class ModellerDescription
   private resCode validResidueCode(String field)
   {
     Integer val = null;
-    com.stevesoft.pat.Regex r = new com.stevesoft.pat.Regex("\\s*((([-0-9]+).?)|FIRST|LAST|@)");
+    com.stevesoft.pat.Regex r = new com.stevesoft.pat.Regex(
+        "\\s*((([-0-9]+).?)|FIRST|LAST|@)");
 
     if (!r.search(field))
     {
@@ -98,8 +99,8 @@ public class ModellerDescription
     {
       value = r.stringMatched(1);
     }
-   // jalview.bin.Cache.log.debug("from '" + field + "' matched '" + value +
-   //                             "'");
+    // jalview.bin.Cache.log.debug("from '" + field + "' matched '" + value +
+    //                             "'");
     try
     {
       val = Integer.valueOf(value);
@@ -124,7 +125,7 @@ public class ModellerDescription
       field = st.nextToken(":");
       do
       {
-        if (seqTypes[i].equalsIgnoreCase(field) )
+        if (seqTypes[i].equalsIgnoreCase(field))
         {
           break;
         }
@@ -150,8 +151,8 @@ public class ModellerDescription
               }
               else
               {
-          //      jalview.bin.Cache.log.debug(
-         //           "Ignoring non-Modeller description: invalid integer-like field '" + field + "'");
+                //      jalview.bin.Cache.log.debug(
+                //           "Ignoring non-Modeller description: invalid integer-like field '" + field + "'");
                 type = -1; /* invalid field! - throw the FieldSet away */
               }
               ;
@@ -242,7 +243,7 @@ public class ModellerDescription
       if (seq.getDatasetSequence() != null &&
           seq.getDatasetSequence().getDBRef() != null)
       {
-        jalview.datamodel.DBRefEntry [] dbr = seq.getDatasetSequence().getDBRef();
+        jalview.datamodel.DBRefEntry[] dbr = seq.getDatasetSequence().getDBRef();
         int i, j;
         for (i = 0, j = dbr.length; i < j; i++)
         {
@@ -388,4 +389,3 @@ public class ModellerDescription
     return false;
   }
 }
-