import jalview.schemes.ColourSchemeI;
import jalview.structure.StructureSelectionManager;
import jalview.util.MessageManager;
+import jalview.ws.utils.UrlDownloadClient;
+import java.io.File;
+import java.io.IOException;
import java.util.StringTokenizer;
import java.util.Vector;
return alignFrame;
}
+ public void LoadFileOntoAlignmentWaitTillLoaded(AlignViewport viewport,
+ String file, DataSourceType sourceType, FileFormatI format)
+ {
+ this.viewport = viewport;
+ this.file = file;
+ this.protocol = sourceType;
+ this.format = format;
+ _LoadAlignmentFileWaitTillLoaded();
+ }
+
+ protected void _LoadAlignmentFileWaitTillLoaded()
+ {
+ Thread loader = new Thread(this);
+ loader.start();
+
+ while (loader.isAlive())
+ {
+ try
+ {
+ Thread.sleep(500);
+ } catch (Exception ex)
+ {
+ }
+ }
+ }
+
public void updateRecentlyOpened()
{
Vector recent = new Vector();
// 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";
@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
+ "\" 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(),
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);
// 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);
+ UrlDownloadClient.download(file, tempStructureFileStr);
+ al = fa.readFile(tempStructureFileStr, DataSourceType.FILE,
+ format);
+ source = fa.getAlignFile();
+ }
+ else
+ {
+ al = fa.readFile(file, protocol, format);
+ source = fa.getAlignFile(); // keep reference for later if
+ // necessary.
+ }
}
} catch (java.io.IOException ex)
{
{
// register PDB entries with desktop's structure selection
// manager
- StructureSelectionManager.getStructureSelectionManager(
- Desktop.instance).registerPDBEntry(pdbe);
+ StructureSelectionManager
+ .getStructureSelectionManager(Desktop.instance)
+ .registerPDBEntry(pdbe);
}
}
}
}
// append to existing alignment
viewport.addAlignment(al, title);
+ if (source instanceof HMMFile)
+ {
+ AlignmentI alignment = viewport.getAlignment();
+ SequenceI seq = alignment
+ .getSequenceAt(alignment.getAbsoluteHeight() - 1);
+ if (seq.hasHMMProfile())
+ {
+ /*
+ * fudge: move HMM consensus sequence from last to first
+ */
+ alignment.deleteSequence(alignment.getAbsoluteHeight() - 1);
+ alignment.insertSequenceAt(0, seq);
+ }
+ viewport.getAlignPanel().adjustAnnotationHeight();
+ viewport.updateSequenceIdColours();
+ }
}
else
{
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);
.applyFeaturesStyle(proxyColourScheme);
}
alignFrame.statusBar.setText(MessageManager.formatMessage(
- "label.successfully_loaded_file",
- new String[] { title }));
+ "label.successfully_loaded_file", new String[]
+ { title }));
if (raiseGUI)
{
try
{
- alignFrame.setMaximum(jalview.bin.Cache.getDefault(
- "SHOW_FULLSCREEN", false));
+ alignFrame.setMaximum(jalview.bin.Cache
+ .getDefault("SHOW_FULLSCREEN", false));
} catch (java.beans.PropertyVetoException ex)
{
}
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)
public void run()
{
JvOptionPane.showInternalMessageDialog(Desktop.desktop,
- errorMessage, MessageManager
+ errorMessage,
+ MessageManager
.getString("label.error_loading_file"),
JvOptionPane.WARNING_MESSAGE);
}
@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);
}
});
@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);
}
});
}
- /*
- * (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();
}
}
git://source.jalview.org / jalview.git / blobdiff