X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=4cf77de01e2ad9dd0e1dc54450da135cd7c5fd2c;hb=4a3def9f59cefe629c9a33d87483283aee085928;hp=4f83ab1235e14be8b9879f6797f55d70cd7dceff;hpb=35ce4609cc8a776b1d85a1f2c2c70aaa106c1a3b;p=jalview.git diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index 4f83ab1..4cf77de 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; @@ -27,23 +34,20 @@ import jalview.api.FeaturesSourceI; import jalview.bin.Cache; import jalview.bin.Jalview; import jalview.datamodel.AlignmentI; -import jalview.datamodel.ColumnSelection; +import jalview.datamodel.HiddenColumns; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; +import jalview.ext.archaeopteryx.AptxInit; import jalview.gui.AlignFrame; import jalview.gui.AlignViewport; import jalview.gui.Desktop; -import jalview.gui.Jalview2XML; import jalview.gui.JvOptionPane; import jalview.json.binding.biojson.v1.ColourSchemeMapper; +import jalview.project.Jalview2XML; import jalview.schemes.ColourSchemeI; import jalview.structure.StructureSelectionManager; import jalview.util.MessageManager; - -import java.util.StringTokenizer; -import java.util.Vector; - -import javax.swing.SwingUtilities; +import jalview.ws.utils.UrlDownloadClient; public class FileLoader implements Runnable { @@ -68,6 +72,8 @@ public class FileLoader implements Runnable boolean raiseGUI = true; + private File selectedFile; + /** * default constructor always raised errors in GUI dialog boxes */ @@ -87,11 +93,16 @@ public class FileLoader implements Runnable this.raiseGUI = raiseGUI; } - public void LoadFile(AlignViewport viewport, String file, + public void LoadFile(AlignViewport viewport, Object file, DataSourceType protocol, FileFormatI format) { this.viewport = viewport; - LoadFile(file, protocol, format); + if (file instanceof File) + { + this.selectedFile = (File) file; + file = selectedFile.getPath(); + } + LoadFile(file.toString(), protocol, format); } public void LoadFile(String file, DataSourceType protocol, @@ -101,7 +112,7 @@ public class FileLoader implements Runnable this.protocol = protocol; this.format = format; - final Thread loader = new Thread(this); + final Thread loader = new Thread(this, "LoadFile"); SwingUtilities.invokeLater(new Runnable() { @@ -155,6 +166,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 @@ -173,42 +202,37 @@ public class FileLoader implements Runnable } /** - * start thread and wait until finished, then return the alignFrame that's - * (hopefully) been read. + * runs the 'run' method (in this thread), then return the alignFrame that's + * (hopefully) been read * * @return */ protected AlignFrame _LoadFileWaitTillLoaded() { - Thread loader = new Thread(this); - loader.start(); - - while (loader.isAlive()) - { - try - { - Thread.sleep(500); - } catch (Exception ex) - { - } - } - + this.run(); return alignFrame; } + // add support for recently opened Aptx trees public void updateRecentlyOpened() { - Vector recent = new Vector(); + Vector recent = new Vector<>(); if (protocol == DataSourceType.PASTE) { // do nothing if the file was pasted in as text... there is no filename to // refer to it as. return; } + if (file != null + && file.indexOf(System.getProperty("java.io.tmpdir")) > -1) + { + // ignore files loaded from the system's temporary directory + return; + } String type = protocol == DataSourceType.FILE ? "RECENT_FILE" : "RECENT_URL"; - String historyItems = jalview.bin.Cache.getProperty(type); + String historyItems = Cache.getProperty(type); StringTokenizer st; @@ -218,7 +242,7 @@ public class FileLoader implements Runnable while (st.hasMoreTokens()) { - recent.addElement(st.nextElement().toString().trim()); + recent.addElement(st.nextToken().trim()); } } @@ -245,7 +269,8 @@ public class FileLoader implements Runnable @Override public void run() { - String title = protocol == DataSourceType.PASTE ? "Copied From Clipboard" + String title = protocol == DataSourceType.PASTE + ? "Copied From Clipboard" : file; Runtime rt = Runtime.getRuntime(); try @@ -262,6 +287,10 @@ public class FileLoader implements Runnable format = new IdentifyFile().identify(source, false); // identify stream and rewind rather than close } + else if (selectedFile != null) + { + format = new IdentifyFile().identify(selectedFile, protocol); + } else { format = new IdentifyFile().identify(file, protocol); @@ -276,8 +305,7 @@ public class FileLoader implements Runnable + "\" has null or unidentifiable data content!"); if (!Jalview.isHeadlessMode()) { - JvOptionPane.showInternalMessageDialog( - Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager.getString("label.couldnt_read_data") + " in " + file + "\n" + AppletFormatAdapter.getSupportedFormats(), @@ -304,11 +332,13 @@ public class FileLoader implements Runnable if (source != null) { // Tell the user (developer?) that this is going to cause a problem - System.err - .println("IMPLEMENTATION ERROR: Cannot read consecutive Jalview XML projects from a stream."); + System.err.println( + "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 { @@ -325,9 +355,41 @@ public class FileLoader implements Runnable // open a new source and read from it FormatAdapter fa = new FormatAdapter(); - al = fa.readFile(file, protocol, format); - source = fa.getAlignFile(); // keep reference for later if - // necessary. + boolean downloadStructureFile = format.isStructureFile() + && protocol.equals(DataSourceType.URL); + if (downloadStructureFile) + { + String structExt = format.getExtensions().split(",")[0]; + String urlLeafName = file.substring( + file.lastIndexOf( + System.getProperty("file.separator")), + file.lastIndexOf(".")); + String tempStructureFileStr = createNamedJvTempFile( + urlLeafName, structExt); + + // 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); + } + source = fa.getAlignFile(); // keep reference for later if + + // necessary. + } } } catch (java.io.IOException ex) { @@ -349,8 +411,9 @@ public class FileLoader implements Runnable { // register PDB entries with desktop's structure selection // manager - StructureSelectionManager.getStructureSelectionManager( - Desktop.instance).registerPDBEntry(pdbe); + StructureSelectionManager + .getStructureSelectionManager(Desktop.instance) + .registerPDBEntry(pdbe); } } } @@ -359,12 +422,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 { @@ -372,8 +432,8 @@ public class FileLoader implements Runnable if (source instanceof ComplexAlignFile) { - ColumnSelection colSel = ((ComplexAlignFile) source) - .getColumnSelection(); + HiddenColumns colSel = ((ComplexAlignFile) source) + .getHiddenColumns(); SequenceI[] hiddenSeqs = ((ComplexAlignFile) source) .getHiddenSequences(); String colourSchemeName = ((ComplexAlignFile) source) @@ -385,8 +445,8 @@ public class FileLoader implements Runnable alignFrame.getViewport().setFeaturesDisplayed(fd); alignFrame.getViewport().setShowSequenceFeatures( ((ComplexAlignFile) source).isShowSeqFeatures()); - ColourSchemeI cs = ColourSchemeMapper.getJalviewColourScheme( - colourSchemeName, al); + ColourSchemeI cs = ColourSchemeMapper + .getJalviewColourScheme(colourSchemeName, al); if (cs != null) { alignFrame.changeColour(cs); @@ -405,15 +465,23 @@ 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( - "label.successfully_loaded_file", - new String[] { title })); + if (format.isTreeFile()) + { + // make generic instead of Aptx specific? + AptxInit.createInstancesFromFile(file, + alignFrame.getViewport()); + + } + alignFrame.setStatus(MessageManager.formatMessage( + "label.successfully_loaded_file", new String[] + { title })); if (raiseGUI) { @@ -426,10 +494,11 @@ public class FileLoader implements Runnable AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); } + try { - alignFrame.setMaximum(jalview.bin.Cache.getDefault( - "SHOW_FULLSCREEN", false)); + alignFrame.setMaximum( + Cache.getDefault("SHOW_FULLSCREEN", false)); } catch (java.beans.PropertyVetoException ex) { } @@ -442,11 +511,8 @@ public class FileLoader implements Runnable Desktop.instance.stopLoading(); } - final String errorMessage = MessageManager - .getString("label.couldnt_load_file") - + " " - + title - + "\n" + error; + final String errorMessage = MessageManager.getString( + "label.couldnt_load_file") + " " + title + "\n" + error; // TODO: refactor FileLoader to be independent of Desktop / Applet GUI // bits ? if (raiseGUI && Desktop.desktop != null) @@ -457,7 +523,8 @@ public class FileLoader implements Runnable public void run() { JvOptionPane.showInternalMessageDialog(Desktop.desktop, - errorMessage, MessageManager + errorMessage, + MessageManager .getString("label.error_loading_file"), JvOptionPane.WARNING_MESSAGE); } @@ -483,11 +550,11 @@ public class FileLoader implements Runnable @Override public void run() { - JvOptionPane.showInternalMessageDialog( - Desktop.desktop, MessageManager.formatMessage( - "label.problems_opening_file", - new String[] { file }), MessageManager - .getString("label.file_open_error"), + JvOptionPane.showInternalMessageDialog(Desktop.desktop, + MessageManager.formatMessage( + "label.problems_opening_file", new String[] + { file }), + MessageManager.getString("label.file_open_error"), JvOptionPane.WARNING_MESSAGE); } }); @@ -505,11 +572,11 @@ public class FileLoader implements Runnable @Override public void run() { - JvOptionPane.showInternalMessageDialog( - Desktop.desktop, MessageManager.formatMessage( + JvOptionPane.showInternalMessageDialog(Desktop.desktop, + MessageManager.formatMessage( "warn.out_of_memory_loading_file", new String[] - { file }), MessageManager - .getString("label.out_of_memory"), + { file }), + MessageManager.getString("label.out_of_memory"), JvOptionPane.WARNING_MESSAGE); } }); @@ -556,18 +623,27 @@ public class FileLoader implements Runnable } - /* - * (non-Javadoc) + /** + * This method creates the file - + * {tmpdir}/jalview/{current_timestamp}/fileName.exetnsion using the supplied + * file name and extension * - * @see java.lang.Object#finalize() + * @param fileName + * the name of the temp file to be created + * @param extension + * the extension of the temp file to be created + * @return */ - @Override - protected void finalize() throws Throwable + private static String createNamedJvTempFile(String fileName, + String extension) throws IOException { - source = null; - alignFrame = null; - viewport = null; - super.finalize(); + String seprator = System.getProperty("file.separator"); + String jvTempDir = System.getProperty("java.io.tmpdir") + "jalview" + + seprator + System.currentTimeMillis(); + File tempStructFile = new File( + jvTempDir + seprator + fileName + "." + extension); + tempStructFile.mkdirs(); + return tempStructFile.toString(); } }