}
/**
+ * Load alignment from (file, protocol) of type format and wait till loaded
+ *
+ * @param file
+ * @param sourceType
+ * @param format
+ * @return alignFrame constructed from file contents
+ */
+ public AlignFrame LoadFileWaitTillLoaded(File file,
+ DataSourceType sourceType, FileFormatI format)
+ {
+ this.selectedFile = file;
+ this.file = file.getPath();
+ this.protocol = sourceType;
+ this.format = format;
+ return _LoadFileWaitTillLoaded();
+ }
+
+ /**
* Load alignment from FileParse source of type format and wait till loaded
*
* @param source
file.lastIndexOf("."));
String tempStructureFileStr = createNamedJvTempFile(
urlLeafName, structExt);
- UrlDownloadClient.download(file, tempStructureFileStr);
- al = fa.readFile(tempStructureFileStr, DataSourceType.FILE,
+
+ // BH - switching to File object here so as to hold
+ // ._bytes array directly
+ File tempFile = new File(tempStructureFileStr);
+ UrlDownloadClient.download(file, tempFile);
+
+ al = fa.readFile(tempFile, DataSourceType.FILE,
format);
source = fa.getAlignFile();
}
if (!(protocol == DataSourceType.PASTE))
{
alignFrame.setFileName(file, format);
+ alignFrame.setFileObject(selectedFile); // BH 2018 SwingJS
}
if (proxyColourScheme != null)
{