Button/mouse tests

[jalview.git] / src / jalview / io / FileLoader.java

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index eda3899..dcfdd22 100755 (executable)
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -170,6 +170,24 @@ public class FileLoader implements Runnable
   }
 
   /**
+   * 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
@@ -348,8 +366,13 @@ public class FileLoader implements Runnable
                       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();
             }
@@ -443,13 +466,14 @@ public class FileLoader implements Runnable
             if (!(protocol == DataSourceType.PASTE))
             {
               alignFrame.setFileName(file, format);
+              alignFrame.setFileObject(selectedFile); // BH 2018 SwingJS
             }
             if (proxyColourScheme != null)
             {
               alignFrame.getViewport()
                       .applyFeaturesStyle(proxyColourScheme);
             }
-            alignFrame.statusBar.setText(MessageManager.formatMessage(
+            alignFrame.setStatus(MessageManager.formatMessage(
                     "label.successfully_loaded_file", new String[]
                     { title }));