X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FCache.java;h=fc18f587b62697ada089897609858b90da80b487;hb=db93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3;hp=508e8a797eee012a7840bf374558b73ca03dcd89;hpb=dde2abe99b75477853a09b4668a6b46cc14bc3ef;p=jalview.git diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index 508e8a7..fc18f58 100755 --- a/src/jalview/bin/Cache.java +++ b/src/jalview/bin/Cache.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -228,7 +228,7 @@ public class Cache private final static String DEFAULT_CACHE_THRESHOLD_IN_DAYS = "2"; private final static String DEFAULT_FAIL_SAFE_PID_THRESHOLD = "30"; - + /** * Allowed values are PDB or mmCIF */ @@ -444,11 +444,12 @@ public class Cache .println("Jalview Version: " + codeVersion + codeInstallation); StructureImportSettings.setDefaultStructureFileFormat(jalview.bin.Cache - .getDefault( -"PDB_DOWNLOAD_FORMAT", PDB_DOWNLOAD_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 @@ -894,7 +895,7 @@ public class Cache { setProperty(property, jalview.util.Format.getHexString(colour)); } - + /** * Stores a formatted date in a jalview property, using a fixed locale. *