file format enum wip changes

[jalview.git] / src / jalview / ws / dbsources / Pdb.java

diff --git a/src/jalview/ws/dbsources/Pdb.java b/src/jalview/ws/dbsources/Pdb.java
index d3a6238..6f266dd 100644 (file)
--- 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<SequenceI> toremove = new ArrayList<SequenceI>();