*/
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;
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 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;
DataSourceType protocol, FileFormatI format)
{
this.viewport = viewport;
- if (file instanceof File) {
+ if (file instanceof File)
+ {
this.selectedFile = (File) file;
file = selectedFile.getPath();
}
}
/**
+ * 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
protected AlignFrame _LoadFileWaitTillLoaded()
{
this.run();
+
return alignFrame;
}
? "Copied From Clipboard"
: file;
Runtime rt = Runtime.getRuntime();
+
try
{
if (Desktop.instance != null)
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
"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
{
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)
.getFeatureColourScheme();
if (viewport != null)
{
- if (proxyColourScheme != null)
- {
- viewport.applyFeaturesStyle(proxyColourScheme);
- }
// append to existing alignment
viewport.addAlignment(al, title);
+ viewport.applyFeaturesStyle(proxyColourScheme);
}
else
{
if (!(protocol == DataSourceType.PASTE))
{
alignFrame.setFileName(file, format);
+ alignFrame.setFileObject(selectedFile); // BH 2018 SwingJS
+ alignFrame.getViewport().setSavedUpToDate(true);
}
if (proxyColourScheme != null)
{
alignFrame.getViewport()
.applyFeaturesStyle(proxyColourScheme);
}
- alignFrame.statusBar.setText(MessageManager.formatMessage(
+ alignFrame.setStatus(MessageManager.formatMessage(
"label.successfully_loaded_file", new String[]
{ title }));
// 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)
{
}
return tempStructFile.toString();
}
- /**
- *
- * @param file a File, or a String which is a name of a file
- * @return
- * @throws FileNotFoundException
- */
- @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));
- }
-
}
git://source.jalview.org / jalview.git / blobdiff