X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fproject%2FJalview2XML.java;h=194cbf24c4a269db0834739101def9992d792cb0;hp=42328b8cff42625407eafc872a8515bda94ed2cd;hb=59d9dfb7b746fcc396af9b572b40636028df9fed;hpb=962217a2b1ded38f78ff36d1875253caa04b0060

diff --git a/src/jalview/project/Jalview2XML.java b/src/jalview/project/Jalview2XML.java
index 42328b8..194cbf2 100644
--- a/src/jalview/project/Jalview2XML.java
+++ b/src/jalview/project/Jalview2XML.java
@@ -130,6 +130,7 @@ import java.awt.Color;
 import java.awt.Font;
 import java.awt.Rectangle;
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -2478,7 +2479,7 @@ public class Jalview2XML
    * @param file
    *          - HTTP URL or filename
    */
-  public AlignFrame loadJalviewAlign(final String file)
+  public AlignFrame loadJalviewAlign(final Object file)
   {
 
     jalview.gui.AlignFrame af = null;
@@ -2522,9 +2523,33 @@ public class Jalview2XML
     return af;
   }
 
-  private jarInputStreamProvider createjarInputStreamProvider(
-          final String file) throws MalformedURLException
+  @SuppressWarnings("unused")
+private jarInputStreamProvider createjarInputStreamProvider(
+          final Object ofile) throws MalformedURLException
   {
+	
+	  // BH 2018 allow for bytes already attached to File object
+	final String file = ofile.toString();
+	byte[] bytes = /** @j2sNative ofile._bytes ||*/null;
+	if (bytes != null) {
+
+	    return new jarInputStreamProvider()
+	    {
+
+	      @Override
+	      public JarInputStream getJarInputStream() throws IOException
+	      {
+	          return new JarInputStream(new ByteArrayInputStream(bytes));
+	      }
+
+	      @Override
+	      public String getFilename()
+	      {
+	        return file;
+	      }
+	    };
+
+	}
     URL url = null;
     errorMessage = null;
     uniqueSetSuffix = null;