j2sNative references moved to Platform

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

diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java
index 4df9165..80b6836 100755 (executable)
--- a/src/jalview/io/FileParse.java
+++ b/src/jalview/io/FileParse.java
@@ -20,11 +20,12 @@
  */
 package jalview.io;
 
-import jalview.api.AlignExportSettingI;
+import jalview.api.AlignExportSettingsI;
 import jalview.api.AlignViewportI;
 import jalview.api.AlignmentViewPanel;
 import jalview.api.FeatureSettingsModelI;
 import jalview.util.MessageManager;
+import jalview.util.Platform;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -72,7 +73,7 @@ public class FileParse
   /**
    * specific settings for exporting data from the current context
    */
-  private AlignExportSettingI exportSettings;
+  private AlignExportSettingsI exportSettings;
 
   /**
    * sequence counter for FileParse object created from same data source
@@ -333,12 +334,7 @@ public class FileParse
   private void parse(File file, String fileStr, DataSourceType sourceType,
           boolean isFileObject) throws MalformedURLException, IOException
   {
-    /**
-     * @j2sNative
-     * 
-     *            this.bytes = file && file._bytes;
-     * 
-     */
+       bytes = Platform.getFileBytes(file);
     this.dataSourceType = sourceType;
     error = false;
 
@@ -375,15 +371,7 @@ public class FileParse
     }
     else if (sourceType == DataSourceType.RELATIVE_URL)
     {
-      /**
-       * BH 2018 hack for no support for access-origin
-       * 
-       * @j2sNative
-       * 
-       * this.bytes = swingjs.JSToolkit.getFileAsBytes(fileStr);
-       * 
-       */
-
+      bytes = Platform.getFileAsBytes(fileStr);
       dataIn = new BufferedReader(new java.io.InputStreamReader(new ByteArrayInputStream(bytes)));      
       dataName = fileStr;
 
@@ -634,7 +622,7 @@ public class FileParse
   /**
    * @return the currently configured exportSettings for writing data.
    */
-  public AlignExportSettingI getExportSettings()
+  public AlignExportSettingsI getExportSettings()
   {
     return exportSettings;
   }
@@ -645,7 +633,7 @@ public class FileParse
    * @param exportSettings
    *          the exportSettings to set
    */
-  public void setExportSettings(AlignExportSettingI exportSettings)
+  public void setExportSettings(AlignExportSettingsI exportSettings)
   {
     this.exportSettings = exportSettings;
   }