X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=3aa433ec41655cdb334fff8394ea866b0723c253;hb=47d13cdd39a8ce2f59adda6bc9b79374dd49be56;hp=95f85e6336e9c259beaad99b8ea88da3d751bce7;hpb=042832306c7e7aa0484079f3bab1e141b2944de5;p=jalview.git

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 95f85e6..3aa433e 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -20,6 +20,13 @@
  */
 package jalview.io;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import javax.swing.SwingUtilities;
+
 import jalview.api.ComplexAlignFile;
 import jalview.api.FeatureSettingsModelI;
 import jalview.api.FeaturesDisplayedI;
@@ -39,21 +46,8 @@ import jalview.project.Jalview2XML;
 import jalview.schemes.ColourSchemeI;
 import jalview.structure.StructureSelectionManager;
 import jalview.util.MessageManager;
-import jalview.util.Platform;
 import jalview.ws.utils.UrlDownloadClient;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import javax.swing.SwingUtilities;
-
 public class FileLoader implements Runnable
 {
   String file;
@@ -214,6 +208,7 @@ public class FileLoader implements Runnable
   protected AlignFrame _LoadFileWaitTillLoaded()
   {
     this.run();
+
     return alignFrame;
   }
 
@@ -640,23 +635,4 @@ public class FileLoader implements Runnable
     return tempStructFile.toString();
   }
 
-  /**
-   * 
-   * @param file a File, or a String which is a name of a file
-   * @return
-   * @throws FileNotFoundException 
-   */
-  public static BufferedReader getBufferedReader(Object file) throws FileNotFoundException {
-    if (file instanceof String)
-    {
-      return new BufferedReader(new FileReader((String) file));
-    }
-    byte[] bytes = Platform.getFileBytes((File) file);
-    if (bytes != null)
-    {
-      return new BufferedReader(new InputStreamReader(new ByteArrayInputStream(bytes)));
-    }
-    return  new BufferedReader(new FileReader((File) file));
-  }
-
 }