From: hansonr Date: Sun, 6 Oct 2019 18:59:56 +0000 (+0200) Subject: JAL-3454 file loading string-only (testNG) fails for PDB file X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=02028a530f7dc72a8a2a873222350b58b39275ba;p=jalview.git JAL-3454 file loading string-only (testNG) fails for PDB file --- diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java index 4916bb3..8c29078 100755 --- a/src/jalview/io/AppletFormatAdapter.java +++ b/src/jalview/io/AppletFormatAdapter.java @@ -158,11 +158,9 @@ public class AppletFormatAdapter { this.selectedFile = selectedFile; - if (selectedFile != null) - { - this.inFile = selectedFile.getPath(); - } - this.inFile = file; + // BH 2019.10.06 PDB.getSequenceRecords calling this and then needs string, + // below + inFile = (selectedFile == null ? file : selectedFile.getPath()); try { if (fileFormat.isStructureFile()) @@ -181,6 +179,8 @@ public class AppletFormatAdapter } else { + // BH: This block is executed by PDBSequenceFetcherTest + // todo is mc_view parsing obsolete yet? JAL-2120 StructureImportSettings.setShowSeqFeatures(true); alignFile = new mc_view.PDBfile(annotFromStructure,