X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FPdb.java;h=61c5c0458fe4fa7090d3d2362e8659e3d7187ddf;hb=ccc31f21ed36c2e43b5a1b450846284151c680bb;hp=a06f0c8528ba2f17a60d9b4cfd528f9d34986406;hpb=63c563ea81cef0fc7743a08a45d6b43a9818d033;p=jalview.git diff --git a/src/jalview/ws/dbsources/Pdb.java b/src/jalview/ws/dbsources/Pdb.java index a06f0c8..61c5c04 100644 --- a/src/jalview/ws/dbsources/Pdb.java +++ b/src/jalview/ws/dbsources/Pdb.java @@ -27,11 +27,11 @@ import jalview.datamodel.AlignmentI; import jalview.datamodel.DBRefEntry; import jalview.datamodel.DBRefSource; import jalview.datamodel.PDBEntry; +import jalview.datamodel.PDBEntry.Type; import jalview.datamodel.SequenceI; import jalview.io.FormatAdapter; import jalview.io.PDBFeatureSettings; import jalview.structure.StructureImportSettings; -import jalview.structure.StructureImportSettings.StructureFormat; import jalview.util.MessageManager; import jalview.ws.ebi.EBIFetchClient; @@ -133,11 +133,11 @@ public class Pdb extends EbiFileRetrievedProxy stopQuery(); return null; } - String ext = StructureImportSettings.getCurrentDefaultFormat().equals( - StructureFormat.MMCIF) ? ".cif" : ".xml"; + String ext = StructureImportSettings.getDefaultStructureFileFormat() + .equalsIgnoreCase(Type.MMCIF.toString()) ? ".cif" : ".xml"; EBIFetchClient ebi = new EBIFetchClient(); file = ebi.fetchDataAsFile("pdb:" + id, - StructureImportSettings.getCurrentDefaultFormat().toLowerCase(), + StructureImportSettings.getDefaultStructureFileFormat().toLowerCase(), ext) .getAbsolutePath(); stopQuery(); @@ -150,7 +150,7 @@ public class Pdb extends EbiFileRetrievedProxy pdbAlignment = new FormatAdapter().readFile(file, jalview.io.AppletFormatAdapter.FILE, - StructureImportSettings.getCurrentDefaultFormat()); + StructureImportSettings.getDefaultStructureFileFormat()); if (pdbAlignment != null) { List toremove = new ArrayList();