X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=49571dc7d1b21bd6697e0088cc9e7424b7da7b78;hb=8a2a0cda7067530f8481c2aec203e18d555f2dfd;hp=8e68067fa7579a788c9a8ad424961368a3911748;hpb=4ecd680a70a52359793d2cdc082d48a07573de79;p=jalview.git diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index 8e68067..49571dc 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; @@ -33,27 +40,15 @@ import jalview.datamodel.SequenceI; import jalview.gui.AlignFrame; import jalview.gui.AlignViewport; import jalview.gui.Desktop; -import jalview.gui.Jalview2XML; import jalview.gui.JvOptionPane; +import jalview.gui.QuitHandler; import jalview.json.binding.biojson.v1.ColourSchemeMapper; +import jalview.project.Jalview2XML; import jalview.schemes.ColourSchemeI; import jalview.structure.StructureSelectionManager; import jalview.util.MessageManager; 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.InputStream; -import java.io.InputStreamReader; -import java.util.StringTokenizer; -import java.util.Vector; - -import javax.swing.SwingUtilities; - public class FileLoader implements Runnable { String file; @@ -101,31 +96,51 @@ public class FileLoader implements Runnable public void LoadFile(AlignViewport viewport, Object file, DataSourceType protocol, FileFormatI format) { + LoadFile(viewport, file, protocol, format, true); + } + + public void LoadFile(AlignViewport viewport, Object file, + DataSourceType protocol, FileFormatI format, boolean async) + { this.viewport = viewport; - if (file instanceof File) { + if (file instanceof File) + { this.selectedFile = (File) file; file = selectedFile.getPath(); } - LoadFile(file.toString(), protocol, format); + LoadFile(file.toString(), protocol, format, async); } public void LoadFile(String file, DataSourceType protocol, FileFormatI format) { + LoadFile(file, protocol, format, true); + } + + public void LoadFile(String file, DataSourceType protocol, + FileFormatI format, boolean async) + { this.file = file; this.protocol = protocol; this.format = format; - final Thread loader = new Thread(this); - - SwingUtilities.invokeLater(new Runnable() + if (async) { - @Override - public void run() + final Thread loader = new Thread(this); + + SwingUtilities.invokeLater(new Runnable() { - loader.start(); - } - }); + @Override + public void run() + { + loader.start(); + } + }); + } + else + { + this.run(); + } } /** @@ -214,6 +229,7 @@ public class FileLoader implements Runnable protected AlignFrame _LoadFileWaitTillLoaded() { this.run(); + return alignFrame; } @@ -276,6 +292,7 @@ public class FileLoader implements Runnable ? "Copied From Clipboard" : file; Runtime rt = Runtime.getRuntime(); + try { if (Desktop.instance != null) @@ -290,7 +307,8 @@ public class FileLoader implements Runnable format = new IdentifyFile().identify(source, false); // identify stream and rewind rather than close } - else if (selectedFile != null) { + else if (selectedFile != null) + { format = new IdentifyFile().identify(selectedFile, protocol); } else @@ -303,7 +321,7 @@ public class FileLoader implements Runnable if (format == null) { Desktop.instance.stopLoading(); - System.err.println("The input file \"" + file + jalview.bin.Console.errPrintln("The input file \"" + file + "\" has null or unidentifiable data content!"); if (!Jalview.isHeadlessMode()) { @@ -314,6 +332,8 @@ public class FileLoader implements Runnable MessageManager.getString("label.couldnt_read_data"), JvOptionPane.WARNING_MESSAGE); } + // don't set shouldBeSaved if didn't load anything + // this.setShouldBeSaved(); return; } // TODO: cache any stream datasources as a temporary file (eg. PDBs @@ -334,11 +354,13 @@ public class FileLoader implements Runnable if (source != null) { // Tell the user (developer?) that this is going to cause a problem - System.err.println( + jalview.bin.Console.errPrintln( "IMPLEMENTATION ERROR: Cannot read consecutive Jalview XML projects from a stream."); // We read the data anyway - it might make sense. } - alignFrame = new Jalview2XML(raiseGUI).loadJalviewAlign(file); + // BH 2018 switch to File object here instead of filename + alignFrame = new Jalview2XML(raiseGUI).loadJalviewAlign( + selectedFile == null ? file : selectedFile); } else { @@ -366,22 +388,29 @@ public class FileLoader implements Runnable file.lastIndexOf(".")); String tempStructureFileStr = createNamedJvTempFile( urlLeafName, structExt); - UrlDownloadClient.download(file, tempStructureFileStr); - al = fa.readFile(tempStructureFileStr, DataSourceType.FILE, - format); + + // 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(); } else { - if (selectedFile == null) { - al = fa.readFile(file, protocol, format); - - } else { - al = fa.readFile(selectedFile, protocol, format); - } + if (selectedFile == null) + { + al = fa.readFile(null, file, protocol, format); + + } + else + { + al = fa.readFile(selectedFile, null, protocol, format); + } source = fa.getAlignFile(); // keep reference for later if - - // necessary. + + // necessary. } } } catch (java.io.IOException ex) @@ -415,12 +444,9 @@ public class FileLoader implements Runnable .getFeatureColourScheme(); if (viewport != null) { - if (proxyColourScheme != null) - { - viewport.applyFeaturesStyle(proxyColourScheme); - } // append to existing alignment viewport.addAlignment(al, title); + viewport.applyFeaturesStyle(proxyColourScheme); } else { @@ -468,7 +494,7 @@ public class FileLoader implements Runnable alignFrame.getViewport() .applyFeaturesStyle(proxyColourScheme); } - alignFrame.statusBar.setText(MessageManager.formatMessage( + alignFrame.setStatus(MessageManager.formatMessage( "label.successfully_loaded_file", new String[] { title })); @@ -481,12 +507,18 @@ public class FileLoader implements Runnable // that perform queries to find the 'current working alignment' Desktop.addInternalFrame(alignFrame, title, AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); + + /* + * for an Overview automatically opened with alignment, + * set its title now alignFrame title has been set + */ + alignFrame.alignPanel.setOverviewTitle(alignFrame); } try { - alignFrame.setMaximum(jalview.bin.Cache - .getDefault("SHOW_FULLSCREEN", false)); + alignFrame.setMaximum( + Cache.getDefault("SHOW_FULLSCREEN", false)); } catch (java.beans.PropertyVetoException ex) { } @@ -520,7 +552,7 @@ public class FileLoader implements Runnable } else { - System.err.println(errorMessage); + jalview.bin.Console.errPrintln(errorMessage); } } } @@ -529,7 +561,7 @@ public class FileLoader implements Runnable } catch (Exception er) { - System.err.println("Exception whilst opening file '" + file); + jalview.bin.Console.errPrintln("Exception whilst opening file '" + file); er.printStackTrace(); if (raiseGUI) { @@ -569,7 +601,7 @@ public class FileLoader implements Runnable } }); } - System.err.println("Out of memory loading file " + file + "!!"); + jalview.bin.Console.errPrintln("Out of memory loading file " + file + "!!"); } loadtime += System.currentTimeMillis(); @@ -588,7 +620,7 @@ public class FileLoader implements Runnable { AlignmentI al = alignFrame.getViewport().getAlignment(); - System.out.println("Loaded '" + title + "' in " + jalview.bin.Console.outPrintln("Loaded '" + title + "' in " + (loadtime / 1000.0) + "s, took an additional " + (1.0 * memused / (1024.0 * 1024.0)) + " MB (" + al.getHeight() + " seqs by " + al.getWidth() + " cols)"); @@ -597,7 +629,7 @@ public class FileLoader implements Runnable { // report that we didn't load anything probably due to an out of memory // error - System.out.println("Failed to load '" + title + "' in " + jalview.bin.Console.outPrintln("Failed to load '" + title + "' in " + (loadtime / 1000.0) + "s, took an additional " + (1.0 * memused / (1024.0 * 1024.0)) + " MB (alignment is null)"); @@ -609,6 +641,7 @@ public class FileLoader implements Runnable Desktop.instance.stopLoading(); } + this.setShouldBeSaved(); } /** @@ -634,21 +667,21 @@ 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 + /* + * set whether quit should ask to save when just loaded this source */ - @SuppressWarnings("unused") - public static BufferedReader getBuffereReader(Object file) throws FileNotFoundException { - if (file instanceof String) - return new BufferedReader(new FileReader((String) file)); - - byte[] bytes = /** @j2sNative file._bytes || */ null; - if (bytes != null) - return new BufferedReader(new InputStreamReader(new ByteArrayInputStream(bytes))); - return new BufferedReader(new FileReader((File) file)); + private void setShouldBeSaved() + { + if (protocol == null) + return; + AlignFrame af = this.alignFrame; + if (af == null) + return; + AlignViewport avp = af.getViewport(); + if (avp == null) + return; + avp.setSavedUpToDate(!protocol.isDynamic(), + QuitHandler.Message.UNSAVED_ALIGNMENTS); } }