JAL-2164 JAL-1919 disabled PDB file parser configuration option

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

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 76fdb69..31dbeac 100755 (executable)
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -232,7 +232,7 @@ public class Cache
   /**
    * Allowed values are PDB or mmCIF
    */
-  private final static String DEFAULT_STRUCTURE_FORMAT = PDBEntry.Type.MMCIF
+  private final static String PDB_DOWNLOAD_FORMAT = PDBEntry.Type.MMCIF
           .toString();
 
   private final static String DEFAULT_PDB_FILE_PARSER = StructureImportSettings.StructureParser.JMOL_PARSER
@@ -244,8 +244,8 @@ public class Cache
    * even if the user changes their locale setting
    */
   private static final DateFormat date_format = SimpleDateFormat
-          .getDateTimeInstance(SimpleDateFormat.LONG,
-                  SimpleDateFormat.LONG, Locale.UK);
+          .getDateTimeInstance(SimpleDateFormat.MEDIUM,
+                  SimpleDateFormat.MEDIUM, Locale.UK);
 
   /**
    * Initialises the Jalview Application Log
@@ -445,10 +445,10 @@ public class Cache
 
     StructureImportSettings.setDefaultStructureFileFormat(jalview.bin.Cache
             .getDefault(
-            "DEFAULT_STRUCTURE_FORMAT", DEFAULT_STRUCTURE_FORMAT));
-    StructureImportSettings
-            .setDefaultPDBFileParser(jalview.bin.Cache.getDefault(
-                    "DEFAULT_PDB_FILE_PARSER", DEFAULT_PDB_FILE_PARSER));
+"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