X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=88f9ae5743f8895fc620859b529310ef3b9f0c18;hb=230fac58c5afe1843bf7177834fe1bd1d7e6f9d5;hp=38033ff1a19542d495789270535d32b217483027;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index 38033ff..88f9ae5 100755 --- a/src/jalview/io/FileLoader.java +++ b/src/jalview/io/FileLoader.java @@ -20,17 +20,25 @@ */ package jalview.io; +import jalview.api.ComplexAlignFile; +import jalview.api.FeatureSettingsModelI; +import jalview.api.FeaturesDisplayedI; +import jalview.api.FeaturesSourceI; +import jalview.bin.Cache; +import jalview.bin.Jalview; import jalview.datamodel.AlignmentI; +import jalview.datamodel.ColumnSelection; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; import jalview.gui.AlignFrame; import jalview.gui.AlignViewport; import jalview.gui.Desktop; import jalview.gui.Jalview2XML; +import jalview.json.binding.biojson.v1.ColourSchemeMapper; +import jalview.schemes.ColourSchemeI; import jalview.structure.StructureSelectionManager; import jalview.util.MessageManager; -import java.util.List; import java.util.StringTokenizer; import java.util.Vector; @@ -41,11 +49,11 @@ public class FileLoader implements Runnable { String file; - String protocol; + DataSourceType protocol; - String format; + FileFormatI format; - FileParse source = null; // alternative specification of where data comes + AlignmentFileI source = null; // alternative specification of where data comes // from @@ -79,13 +87,14 @@ public class FileLoader implements Runnable } public void LoadFile(AlignViewport viewport, String file, - String protocol, String format) + DataSourceType protocol, FileFormatI format) { this.viewport = viewport; LoadFile(file, protocol, format); } - public void LoadFile(String file, String protocol, String format) + public void LoadFile(String file, DataSourceType protocol, + FileFormatI format) { this.file = file; this.protocol = protocol; @@ -95,6 +104,7 @@ public class FileLoader implements Runnable SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { loader.start(); @@ -108,7 +118,7 @@ public class FileLoader implements Runnable * @param file * @param protocol */ - public void LoadFile(String file, String protocol) + public void LoadFile(String file, DataSourceType protocol) { LoadFile(file, protocol, null); } @@ -117,27 +127,28 @@ public class FileLoader implements Runnable * Load alignment from (file, protocol) and wait till loaded * * @param file - * @param protocol + * @param sourceType * @return alignFrame constructed from file contents */ - public AlignFrame LoadFileWaitTillLoaded(String file, String protocol) + public AlignFrame LoadFileWaitTillLoaded(String file, + DataSourceType sourceType) { - return LoadFileWaitTillLoaded(file, protocol, null); + return LoadFileWaitTillLoaded(file, sourceType, null); } /** * Load alignment from (file, protocol) of type format and wait till loaded * * @param file - * @param protocol + * @param sourceType * @param format * @return alignFrame constructed from file contents */ - public AlignFrame LoadFileWaitTillLoaded(String file, String protocol, - String format) + public AlignFrame LoadFileWaitTillLoaded(String file, + DataSourceType sourceType, FileFormatI format) { this.file = file; - this.protocol = protocol; + this.protocol = sourceType; this.format = format; return _LoadFileWaitTillLoaded(); } @@ -149,12 +160,13 @@ public class FileLoader implements Runnable * @param format * @return alignFrame constructed from file contents */ - public AlignFrame LoadFileWaitTillLoaded(FileParse source, String format) + public AlignFrame LoadFileWaitTillLoaded(AlignmentFileI source, + FileFormatI format) { this.source = source; file = source.getInFile(); - protocol = source.type; + protocol = source.getDataSourceType(); this.format = format; return _LoadFileWaitTillLoaded(); } @@ -186,13 +198,13 @@ public class FileLoader implements Runnable public void updateRecentlyOpened() { Vector recent = new Vector(); - if (protocol.equals(FormatAdapter.PASTE)) + if (protocol == DataSourceType.PASTE) { // do nothing if the file was pasted in as text... there is no filename to // refer to it as. return; } - String type = protocol.equals(FormatAdapter.FILE) ? "RECENT_FILE" + String type = protocol == DataSourceType.FILE ? "RECENT_FILE" : "RECENT_URL"; String historyItems = jalview.bin.Cache.getProperty(type); @@ -221,17 +233,18 @@ public class FileLoader implements Runnable newHistory.append(recent.elementAt(i)); } - jalview.bin.Cache.setProperty(type, newHistory.toString()); + Cache.setProperty(type, newHistory.toString()); - if (protocol.equals(FormatAdapter.FILE)) + if (protocol == DataSourceType.FILE) { - jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", format); + Cache.setProperty("DEFAULT_FILE_FORMAT", format.toString()); } } + @Override public void run() { - String title = protocol.equals(AppletFormatAdapter.PASTE) ? "Copied From Clipboard" + String title = protocol == DataSourceType.PASTE ? "Copied From Clipboard" : file; Runtime rt = Runtime.getRuntime(); try @@ -245,15 +258,32 @@ public class FileLoader implements Runnable // just in case the caller didn't identify the file for us if (source != null) { - format = new IdentifyFile().Identify(source, false); // identify - // stream and - // rewind rather - // than close + format = new IdentifyFile().identify(source, false); + // identify stream and rewind rather than close } else { - format = new IdentifyFile().Identify(file, protocol); + format = new IdentifyFile().identify(file, protocol); + } + + } + + if (format == null) + { + Desktop.instance.stopLoading(); + System.err.println("The input file \"" + file + + "\" has null or unidentifiable data content!"); + if (!Jalview.isHeadlessMode()) + { + javax.swing.JOptionPane.showInternalMessageDialog( + Desktop.desktop, + MessageManager.getString("label.couldnt_read_data") + + " in " + file + "\n" + + AppletFormatAdapter.SUPPORTED_FORMATS, + MessageManager.getString("label.couldnt_read_data"), + JOptionPane.WARNING_MESSAGE); } + return; } // TODO: cache any stream datasources as a temporary file (eg. PDBs // retrieved via URL) @@ -268,7 +298,7 @@ public class FileLoader implements Runnable loadtime = -System.currentTimeMillis(); AlignmentI al = null; - if (format.equalsIgnoreCase("Jalview")) + if (format == FileFormat.Jalview) { if (source != null) { @@ -282,8 +312,6 @@ public class FileLoader implements Runnable else { String error = AppletFormatAdapter.SUPPORTED_FORMATS; - if (FormatAdapter.isValidFormat(format)) - { try { if (source != null) @@ -297,67 +325,95 @@ 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.afile; // keep reference for later if necessary. + source = fa.getAlignFile(); // keep reference for later if + // necessary. } } catch (java.io.IOException ex) { error = ex.getMessage(); } - } - else - { - if (format != null && format.length() > 7) - { - // ad hoc message in format. - error = format + "\n" + error; - } - } - if ((al != null) && (al.getHeight() > 0)) + if ((al != null) && (al.getHeight() > 0) && al.hasValidSequence()) { + // construct and register dataset sequences for (SequenceI sq : al.getSequences()) { while (sq.getDatasetSequence() != null) { sq = sq.getDatasetSequence(); } - if (sq.getPDBId() != null) + if (sq.getAllPDBEntries() != null) { - for (PDBEntry pdbe : (List) sq.getPDBId()) + for (PDBEntry pdbe : sq.getAllPDBEntries()) { + // register PDB entries with desktop's structure selection + // manager StructureSelectionManager.getStructureSelectionManager( Desktop.instance).registerPDBEntry(pdbe); } } } + + FeatureSettingsModelI proxyColourScheme = source + .getFeatureColourScheme(); if (viewport != null) { - // TODO: create undo object for this JAL-1101 - for (int i = 0; i < al.getHeight(); i++) + if (proxyColourScheme != null) { - viewport.getAlignment().addSequence(al.getSequenceAt(i)); + viewport.applyFeaturesStyle(proxyColourScheme); } - viewport.firePropertyChange("alignment", null, viewport - .getAlignment().getSequences()); + // append to existing alignment + viewport.addAlignment(al, title); } else { - alignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH, - AlignFrame.DEFAULT_HEIGHT); - - alignFrame.statusBar.setText(MessageManager.formatMessage( - "label.successfully_loaded_file", new String[] - { title })); + // otherwise construct the alignFrame - if (!protocol.equals(AppletFormatAdapter.PASTE)) + if (source instanceof ComplexAlignFile) + { + ColumnSelection colSel = ((ComplexAlignFile) source) + .getColumnSelection(); + SequenceI[] hiddenSeqs = ((ComplexAlignFile) source) + .getHiddenSequences(); + String colourSchemeName = ((ComplexAlignFile) source) + .getGlobalColourScheme(); + FeaturesDisplayedI fd = ((ComplexAlignFile) source) + .getDisplayedFeatures(); + alignFrame = new AlignFrame(al, hiddenSeqs, colSel, + AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); + alignFrame.getViewport().setFeaturesDisplayed(fd); + alignFrame.getViewport().setShowSequenceFeatures( + ((ComplexAlignFile) source).isShowSeqFeatures()); + ColourSchemeI cs = ColourSchemeMapper.getJalviewColourScheme( + colourSchemeName, al); + if (cs != null) + { + alignFrame.changeColour(cs); + } + } + else + { + alignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH, + AlignFrame.DEFAULT_HEIGHT); + if (source instanceof FeaturesSourceI) + { + alignFrame.getViewport().setShowSequenceFeatures(true); + } + } + // add metadata and update ui + if (!(protocol == DataSourceType.PASTE)) { alignFrame.setFileName(file, format); } - if (source instanceof HtmlFile) + if (proxyColourScheme != null) { - ((HtmlFile) source).LoadAlignmentFeatures(alignFrame); - + alignFrame.getViewport() + .applyFeaturesStyle(proxyColourScheme); } + alignFrame.statusBar.setText(MessageManager.formatMessage( + "label.successfully_loaded_file", + new String[] { title })); + if (raiseGUI) { // add the window to the GUI @@ -385,12 +441,18 @@ public class FileLoader implements Runnable Desktop.instance.stopLoading(); } - final String errorMessage = "Couldn't load file " + title + "\n" - + error; - if (raiseGUI) + 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) { javax.swing.SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showInternalMessageDialog(Desktop.desktop, @@ -417,12 +479,13 @@ public class FileLoader implements Runnable { javax.swing.SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { javax.swing.JOptionPane.showInternalMessageDialog( Desktop.desktop, MessageManager.formatMessage( - "label.problems_opening_file", new String[] - { file }), MessageManager + "label.problems_opening_file", + new String[] { file }), MessageManager .getString("label.file_open_error"), javax.swing.JOptionPane.WARNING_MESSAGE); } @@ -438,14 +501,15 @@ public class FileLoader implements Runnable { javax.swing.SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { - javax.swing.JOptionPane - .showInternalMessageDialog( - Desktop.desktop, - MessageManager.formatMessage("warn.out_of_memory_loading_file", new String[]{file}), - MessageManager.getString("label.out_of_memory"), - javax.swing.JOptionPane.WARNING_MESSAGE); + javax.swing.JOptionPane.showInternalMessageDialog( + Desktop.desktop, MessageManager.formatMessage( + "warn.out_of_memory_loading_file", new String[] + { file }), MessageManager + .getString("label.out_of_memory"), + javax.swing.JOptionPane.WARNING_MESSAGE); } }); } @@ -496,6 +560,7 @@ public class FileLoader implements Runnable * * @see java.lang.Object#finalize() */ + @Override protected void finalize() throws Throwable { source = null;