X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAppletFormatAdapter.java;h=9a4e9823ce1999d4054e8447502679f7d3c4a81d;hb=d4271d32477e99e9fbbfa5db3e11f1b79324e60d;hp=60eb9ccd4d2360839bd3628a9a574db048f63e16;hpb=34ce5193c8766085422c32544246d92f12d0c975;p=jalview.git diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java index 60eb9cc..9a4e982 100755 --- a/src/jalview/io/AppletFormatAdapter.java +++ b/src/jalview/io/AppletFormatAdapter.java @@ -36,7 +36,6 @@ import jalview.datamodel.PDBEntry.Type; import jalview.datamodel.SequenceI; import jalview.ext.jmol.JmolParser; import jalview.structure.StructureImportSettings; -import jalview.structure.StructureImportSettings.TFType; import jalview.util.Platform; /** @@ -168,11 +167,7 @@ public class AppletFormatAdapter { this.selectedFile = selectedFile; - if (selectedFile != null) - { - this.inFile = selectedFile.getPath(); - } - this.inFile = file; + this.inFile = selectedFile != null ? selectedFile.getPath() : file; try { if (fileFormat.isStructureFile()) @@ -184,12 +179,16 @@ public class AppletFormatAdapter .toString()); StructureImportSettings.addSettings(annotFromStructure, localSecondaryStruct, serviceSecondaryStruct); + if (tempfacType != null) + { + StructureImportSettings.setTemperatureFactorType(tempfacType); + } if (isParseWithJMOL) { // needs a File option alignFile = new JmolParser( selectedFile == null ? inFile : selectedFile, sourceType, - tempfacType); + StructureImportSettings.getTemperatureFactorType()); } else {