Merge branch 'develop' of http://source.jalview.org/git/jalview into develop

[jalview.git] / src / jalview / bin / Cache.java

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 0972ced..31dbeac 100755 (executable)
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -235,6 +235,8 @@ public class Cache
   private final static String PDB_DOWNLOAD_FORMAT = PDBEntry.Type.MMCIF
           .toString();
 
+  private final static String DEFAULT_PDB_FILE_PARSER = StructureImportSettings.StructureParser.JMOL_PARSER
+          .toString();
 
   /*
    * a date formatter using a fixed (rather than the user's) locale; 
@@ -444,7 +446,9 @@ public class Cache
     StructureImportSettings.setDefaultStructureFileFormat(jalview.bin.Cache
             .getDefault(
 "PDB_DOWNLOAD_FORMAT", PDB_DOWNLOAD_FORMAT));
-
+    // StructureImportSettings
+    // .setDefaultPDBFileParser(jalview.bin.Cache.getDefault(
+    // "DEFAULT_PDB_FILE_PARSER", DEFAULT_PDB_FILE_PARSER));
     // jnlpVersion will be null if we're using InstallAnywhere
     // Dont do this check if running in headless mode
     if (jnlpVersion == null