From 00f24a35f8ced01fb06bcecc65659995799301f2 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Wed, 20 Jul 2016 16:19:08 +0100 Subject: [PATCH] =?utf8?q?JAL-1926=20JAL-2106=20don=E2=80=99t=20use=20PDB=20?= =?utf8?q?database=20constant=20as=20a=20file=20format=20string?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/jalview/bin/Cache.java | 6 ++++-- src/jalview/structure/StructureImportSettings.java | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) 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 -- 1.7.10.2