X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=88f9ae5743f8895fc620859b529310ef3b9f0c18;hb=230fac58c5afe1843bf7177834fe1bd1d7e6f9d5;hp=870d438958e94a63449e60cdf34153d26047fefb;hpb=2106c65bdae427b0b311f6dea60f337e1f601613;p=jalview.git diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index 870d438..88f9ae5 100755 --- a/src/jalview/io/FileLoader.java +++ b/src/jalview/io/FileLoader.java @@ -21,7 +21,10 @@ 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; @@ -31,6 +34,7 @@ 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; @@ -45,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 @@ -83,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; @@ -99,6 +104,7 @@ public class FileLoader implements Runnable SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { loader.start(); @@ -112,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); } @@ -121,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(); } @@ -153,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(); } @@ -190,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); @@ -225,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 @@ -249,19 +258,17 @@ 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 || format.equalsIgnoreCase("EMPTY DATA FILE")) + if (format == null) { Desktop.instance.stopLoading(); System.err.println("The input file \"" + file @@ -291,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) { @@ -305,8 +312,6 @@ public class FileLoader implements Runnable else { String error = AppletFormatAdapter.SUPPORTED_FORMATS; - if (FormatAdapter.isValidFormat(format)) - { try { if (source != null) @@ -327,15 +332,6 @@ public class FileLoader implements Runnable { 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) && al.hasValidSequence()) { @@ -358,8 +354,14 @@ public class FileLoader implements Runnable } } + FeatureSettingsModelI proxyColourScheme = source + .getFeatureColourScheme(); if (viewport != null) { + if (proxyColourScheme != null) + { + viewport.applyFeaturesStyle(proxyColourScheme); + } // append to existing alignment viewport.addAlignment(al, title); } @@ -373,34 +375,44 @@ public class FileLoader implements Runnable .getColumnSelection(); SequenceI[] hiddenSeqs = ((ComplexAlignFile) source) .getHiddenSequences(); - boolean showSeqFeatures = ((ComplexAlignFile) source) - .isShowSeqFeatures(); - ColourSchemeI cs = ((ComplexAlignFile) source) - .getColourScheme(); + String colourSchemeName = ((ComplexAlignFile) source) + .getGlobalColourScheme(); FeaturesDisplayedI fd = ((ComplexAlignFile) source) .getDisplayedFeatures(); alignFrame = new AlignFrame(al, hiddenSeqs, colSel, AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); - - alignFrame.getViewport().setShowSequenceFeatures( - showSeqFeatures); alignFrame.getViewport().setFeaturesDisplayed(fd); - alignFrame.changeColour(cs); + 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.equals(AppletFormatAdapter.PASTE)) + if (!(protocol == DataSourceType.PASTE)) { alignFrame.setFileName(file, format); } - + if (proxyColourScheme != null) + { + alignFrame.getViewport() + .applyFeaturesStyle(proxyColourScheme); + } alignFrame.statusBar.setText(MessageManager.formatMessage( - "label.successfully_loaded_file", new String[] - { title })); + "label.successfully_loaded_file", + new String[] { title })); if (raiseGUI) { @@ -429,14 +441,18 @@ public class FileLoader implements Runnable Desktop.instance.stopLoading(); } - final String errorMessage = "Couldn't 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) { javax.swing.SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showInternalMessageDialog(Desktop.desktop, @@ -463,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); } @@ -484,6 +501,7 @@ public class FileLoader implements Runnable { javax.swing.SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { javax.swing.JOptionPane.showInternalMessageDialog( @@ -542,6 +560,7 @@ public class FileLoader implements Runnable * * @see java.lang.Object#finalize() */ + @Override protected void finalize() throws Throwable { source = null;