Merge branch 'patch/JAL-2164_updatesRESNUMtests' into develop

[jalview.git] / src / jalview / structure / StructureImportSettings.java

diff --git a/src/jalview/structure/StructureImportSettings.java b/src/jalview/structure/StructureImportSettings.java
index 388ccbd..f168413 100644 (file)
--- a/src/jalview/structure/StructureImportSettings.java
+++ b/src/jalview/structure/StructureImportSettings.java
@@ -5,6 +5,7 @@ import jalview.datamodel.PDBEntry.Type;
 
 /**
  * bean holding settings for structure IO. TODO: tests for validation of values
+ * TODO: tests for race conditions (all fields are static, is that correct ?)
  * 
  * @author tcofoegbu
  *
@@ -31,8 +32,6 @@ public class StructureImportSettings
 
   private static boolean showSeqFeatures = true;
 
-  private static boolean processHETATMs = false;
-
   public enum StructureParser
   {
     JMOL_PARSER, JALVIEW_PARSER
@@ -49,7 +48,6 @@ public class StructureImportSettings
    * Determines the parser used for parsing PDB format file. Possible options
    * are : JMolParser|JalveiwParser
    */
-  private static StructureParser defaultPDBFileParser = StructureParser.JMOL_PARSER;
   public static void addSettings(boolean addAlignmentAnnotations,
           boolean processSecStr, boolean externalSecStr)
   {
@@ -111,34 +109,8 @@ public class StructureImportSettings
           String defaultStructureFileFormat)
   {
     StructureImportSettings.defaultStructureFileFormat = PDBEntry.Type
-            .valueOf(defaultStructureFileFormat);
-  }
-
-  public static boolean isProcessHETATMs()
-  {
-    return processHETATMs;
+            .valueOf(defaultStructureFileFormat.toUpperCase());
   }
 
-  public static void setProcessHETATMs(boolean processHETATMs)
-  {
-    StructureImportSettings.processHETATMs = processHETATMs;
-  }
-
-  public static String getDefaultPDBFileParser()
-  {
-    return defaultPDBFileParser.toString();
-  }
-
-  public static void setDefaultPDBFileParser(
-          StructureParser defaultPDBFileParser)
-  {
-    StructureImportSettings.defaultPDBFileParser = defaultPDBFileParser;
-  }
-
-  public static void setDefaultPDBFileParser(String defaultPDBFileParser)
-  {
-    StructureImportSettings.defaultPDBFileParser = StructureParser
-            .valueOf(defaultPDBFileParser);
-  }
 
 }