X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FPdb.java;h=6f266dd3aa6da9930a6053511b0c6d438bef80d3;hb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;hp=d3a6238c4430e48ffcb1c4b87736efae749d4cab;hpb=834ebffc22ed9e72b139cadf5652d1a7006da9b3;p=jalview.git diff --git a/src/jalview/ws/dbsources/Pdb.java b/src/jalview/ws/dbsources/Pdb.java index d3a6238..6f266dd 100644 --- a/src/jalview/ws/dbsources/Pdb.java +++ b/src/jalview/ws/dbsources/Pdb.java @@ -30,7 +30,7 @@ import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; import jalview.io.FormatAdapter; import jalview.io.PDBFeatureSettings; -import jalview.structure.StructureViewSettings; +import jalview.structure.StructureImportSettings; import jalview.util.MessageManager; import jalview.ws.ebi.EBIFetchClient; @@ -132,12 +132,12 @@ public class Pdb extends EbiFileRetrievedProxy stopQuery(); return null; } - String ext = StructureViewSettings.getCurrentDefaultFormat() + String ext = StructureImportSettings.getCurrentDefaultFormat() .equalsIgnoreCase("mmcif") ? ".cif" : ".xml"; EBIFetchClient ebi = new EBIFetchClient(); file = ebi.fetchDataAsFile("pdb:" + id, - StructureViewSettings.getCurrentDefaultFormat().toLowerCase(), + StructureImportSettings.getCurrentDefaultFormat().toLowerCase(), ext) .getAbsolutePath(); stopQuery(); @@ -149,8 +149,8 @@ public class Pdb extends EbiFileRetrievedProxy { pdbAlignment = new FormatAdapter().readFile(file, - jalview.io.AppletFormatAdapter.FILE, - StructureViewSettings.getCurrentDefaultFormat()); + jalview.io.DataSourceType.FILE, + StructureImportSettings.getCurrentDefaultFormat()); if (pdbAlignment != null) { List toremove = new ArrayList();