X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fstructure%2FStructureImportSettings.java;h=22ecdc723195ffa4e6e0edf7c5a5d381043432d2;hb=dc78f37f49146f6339815e93598159d0c1ddc4c7;hp=e969d4b84181fdb62de6964161516ff6234ab133;hpb=65c671b0263c0c692a4a0a0905a4acc2fc6b1065;p=jalview.git

diff --git a/src/jalview/structure/StructureImportSettings.java b/src/jalview/structure/StructureImportSettings.java
index e969d4b..22ecdc7 100644
--- a/src/jalview/structure/StructureImportSettings.java
+++ b/src/jalview/structure/StructureImportSettings.java
@@ -1,10 +1,34 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.structure;
 
+import java.util.Locale;
+
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.PDBEntry.Type;
+import jalview.util.MessageManager;
 
 /**
  * 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
  *
@@ -36,6 +60,17 @@ public class StructureImportSettings
     JMOL_PARSER, JALVIEW_PARSER
   }
 
+  public static enum TFType
+  {
+    DEFAULT, PLDDT;
+
+    @Override
+    public String toString()
+    {
+      return MessageManager.getString(
+              "label.tftype_" + this.name().toLowerCase(Locale.ROOT));
+    }
+  }
 
   /**
    * Determines the default file format for structure files to be downloaded
@@ -48,6 +83,9 @@ public class StructureImportSettings
    * are : JMolParser|JalveiwParser
    */
   private static StructureParser defaultPDBFileParser = StructureParser.JMOL_PARSER;
+
+  private static TFType temperatureFactorType;
+
   public static void addSettings(boolean addAlignmentAnnotations,
           boolean processSecStr, boolean externalSecStr)
   {
@@ -62,6 +100,11 @@ public class StructureImportSettings
     return visibleChainAnnotation;
   }
 
+  public static void setTemperatureFactorType(TFType t)
+  {
+    StructureImportSettings.temperatureFactorType = t;
+  }
+
   public static void setVisibleChainAnnotation(
           boolean visibleChainAnnotation)
   {
@@ -100,16 +143,16 @@ public class StructureImportSettings
     StructureImportSettings.showSeqFeatures = showSeqFeatures;
   }
 
-  public static String getDefaultStructureFileFormat()
+  public static PDBEntry.Type getDefaultStructureFileFormat()
   {
-    return defaultStructureFileFormat.toString();
+    return defaultStructureFileFormat;
   }
 
   public static void setDefaultStructureFileFormat(
           String defaultStructureFileFormat)
   {
     StructureImportSettings.defaultStructureFileFormat = PDBEntry.Type
-            .valueOf(defaultStructureFileFormat);
+            .valueOf(defaultStructureFileFormat.toUpperCase(Locale.ROOT));
   }
 
   public static String getDefaultPDBFileParser()
@@ -126,7 +169,12 @@ public class StructureImportSettings
   public static void setDefaultPDBFileParser(String defaultPDBFileParser)
   {
     StructureImportSettings.defaultPDBFileParser = StructureParser
-            .valueOf(defaultPDBFileParser);
+            .valueOf(defaultPDBFileParser.toUpperCase(Locale.ROOT));
+  }
+
+  public static TFType getTemperatureFactorType()
+  {
+    return temperatureFactorType;
   }
 
 }