JAL-2157 todo: verify parser/file format enums and static/dynamic status these fields

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

diff --git a/src/jalview/structure/StructureImportSettings.java b/src/jalview/structure/StructureImportSettings.java
index 388ccbd..82b5f69 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
@@ -111,17 +110,7 @@ public class StructureImportSettings
           String defaultStructureFileFormat)
   {
     StructureImportSettings.defaultStructureFileFormat = PDBEntry.Type
-            .valueOf(defaultStructureFileFormat);
-  }
-
-  public static boolean isProcessHETATMs()
-  {
-    return processHETATMs;
-  }
-
-  public static void setProcessHETATMs(boolean processHETATMs)
-  {
-    StructureImportSettings.processHETATMs = processHETATMs;
+            .valueOf(defaultStructureFileFormat.toUpperCase());
   }
 
   public static String getDefaultPDBFileParser()
@@ -138,7 +127,7 @@ public class StructureImportSettings
   public static void setDefaultPDBFileParser(String defaultPDBFileParser)
   {
     StructureImportSettings.defaultPDBFileParser = StructureParser
-            .valueOf(defaultPDBFileParser);
+            .valueOf(defaultPDBFileParser.toUpperCase());
   }
 
 }