X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FCache.java;h=00c8b86fbd116038da11e4b864a77ec6e55c08df;hb=3ea56b3730e5115138af264f5b5408104ebd9c20;hp=76fdb695563a70fd462064dc84b35f37157ecb02;hpb=e8ab1b32267d78c12e9ec2db2a65cf1b472fe1d0;p=jalview.git diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index 76fdb69..00c8b86 100755 --- 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 @@ -444,11 +444,12 @@ public class Cache .println("Jalview Version: " + codeVersion + codeInstallation); StructureImportSettings.setDefaultStructureFileFormat(jalview.bin.Cache - .getDefault( - "DEFAULT_STRUCTURE_FORMAT", DEFAULT_STRUCTURE_FORMAT)); + .getDefault("PDB_DOWNLOAD_FORMAT", PDB_DOWNLOAD_FORMAT)); StructureImportSettings - .setDefaultPDBFileParser(jalview.bin.Cache.getDefault( - "DEFAULT_PDB_FILE_PARSER", DEFAULT_PDB_FILE_PARSER)); + .setDefaultPDBFileParser(DEFAULT_PDB_FILE_PARSER); + // 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