X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fstructure%2FStructureImportSettings.java;h=8a321cefcb9f67fda7b9213f4544c5b1b3637d92;hb=63c563ea81cef0fc7743a08a45d6b43a9818d033;hp=b23fd53cf9d16a259731ae6e5fea6f3bd65a35f7;hpb=7596cd64543481df859a9bd2e73a3b3bb6b2e42c;p=jalview.git

diff --git a/src/jalview/structure/StructureImportSettings.java b/src/jalview/structure/StructureImportSettings.java
index b23fd53..8a321ce 100644
--- a/src/jalview/structure/StructureImportSettings.java
+++ b/src/jalview/structure/StructureImportSettings.java
@@ -27,6 +27,12 @@ public class StructureImportSettings
   private static boolean processHETATMs = false;
 
   private static String currentDefaultFormat = DBRefSource.PDB;
+  public enum StructureFormat
+  {
+    PDB, MMCIF
+  };
+
+  private static StructureFormat currentDefaultFormat = StructureFormat.PDB;
 
   public static void addSettings(boolean addAlignmentAnnotations,
           boolean predictSecStr, boolean externalSecStr)
@@ -82,12 +88,13 @@ public class StructureImportSettings
 
   public static String getCurrentDefaultFormat()
   {
-    return currentDefaultFormat;
+    return currentDefaultFormat.toString();
   }
 
   public static void setCurrentDefaultFormat(String currentDefaultFormat)
   {
-    StructureImportSettings.currentDefaultFormat = currentDefaultFormat;
+    StructureImportSettings.currentDefaultFormat = StructureFormat
+            .valueOf(currentDefaultFormat);
   }
 
   public static boolean isProcessHETATMs()