X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FPdb.java;h=68dda8862ff7240c56d012e4b47ef6f41445e1d1;hb=2b6a2fdd887521f16ec777aab3126d6209f2a0a6;hp=0aae38f7b69aedd5d7fd7aa7f099537f14ddc204;hpb=775f6ea659bce2510739e5a5f8bd3f156662d6df;p=jalview.git diff --git a/src/jalview/ws/dbsources/Pdb.java b/src/jalview/ws/dbsources/Pdb.java index 0aae38f..68dda88 100644 --- a/src/jalview/ws/dbsources/Pdb.java +++ b/src/jalview/ws/dbsources/Pdb.java @@ -40,7 +40,6 @@ import jalview.ws.ebi.EBIFetchClient; import java.util.ArrayList; import java.util.List; -import java.util.Vector; import com.stevesoft.pat.Regex; @@ -155,9 +154,10 @@ public class Pdb extends EbiFileRetrievedProxy } try { - // convert Type.PDB/MMCIF to FileFormat.PDB/MMCIF - // todo get rid of Type? - FileFormatI fileFormat = FileFormat.valueOf(pdbFileFormat.toString()); + // todo get rid of Type and use FileFormatI instead? + // todo get rid of "ext" and just use "tmp"? + FileFormatI fileFormat = pdbFileFormat == Type.PDB ? FileFormat.PDB + : FileFormat.MMCif; pdbAlignment = new FormatAdapter().readFile(file, DataSourceType.FILE, fileFormat); if (pdbAlignment != null)