From: Jim Procter Date: Wed, 20 Jul 2016 15:19:08 +0000 (+0100) Subject: JAL-1926 JAL-2106 don’t use PDB database constant as a file format string X-Git-Tag: Release_2_10_0~135^2^2~1 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=00f24a35f8ced01fb06bcecc65659995799301f2;hp=63c563ea81cef0fc7743a08a45d6b43a9818d033;p=jalview.git JAL-1926 JAL-2106 don’t use PDB database constant as a file format string --- diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index cf251dc..8493dff 100755 --- a/src/jalview/bin/Cache.java +++ b/src/jalview/bin/Cache.java @@ -20,7 +20,6 @@ */ package jalview.bin; -import jalview.datamodel.DBRefSource; import jalview.structure.StructureImportSettings; import jalview.ws.dbsources.das.api.DasSourceRegistryI; import jalview.ws.dbsources.das.datamodel.DasSourceRegistry; @@ -228,7 +227,10 @@ public class Cache private final static String DEFAULT_FAIL_SAFE_PID_THRESHOLD = "30"; - private final static String DEFAULT_STRUCTURE_FORMAT = DBRefSource.PDB; + /** + * Allowed values are PDB or mmCIF + */ + private final static String DEFAULT_STRUCTURE_FORMAT = "PDB"; /** * Initialises the Jalview Application Log diff --git a/src/jalview/structure/StructureImportSettings.java b/src/jalview/structure/StructureImportSettings.java index 8a321ce..2faca2a 100644 --- a/src/jalview/structure/StructureImportSettings.java +++ b/src/jalview/structure/StructureImportSettings.java @@ -1,6 +1,5 @@ package jalview.structure; -import jalview.datamodel.DBRefSource; public class StructureImportSettings { @@ -26,7 +25,6 @@ public class StructureImportSettings private static boolean processHETATMs = false; - private static String currentDefaultFormat = DBRefSource.PDB; public enum StructureFormat { PDB, MMCIF