git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
src
/
jalview
/
io
/
BioJsHTMLOutput.java
diff --git
a/src/jalview/io/BioJsHTMLOutput.java
b/src/jalview/io/BioJsHTMLOutput.java
index
9454cae
..
f8fa1f5
100644
(file)
--- a/
src/jalview/io/BioJsHTMLOutput.java
+++ b/
src/jalview/io/BioJsHTMLOutput.java
@@
-25,6
+25,7
@@
import jalview.api.AlignmentViewPanel;
import jalview.datamodel.AlignmentExportData;
import jalview.exceptions.NoFileSelectedException;
import jalview.gui.IProgressIndicator;
import jalview.datamodel.AlignmentExportData;
import jalview.exceptions.NoFileSelectedException;
import jalview.gui.IProgressIndicator;
+import jalview.gui.OOMWarning;
import jalview.json.binding.biojs.BioJSReleasePojo;
import jalview.json.binding.biojs.BioJSRepositoryPojo;
import jalview.util.MessageManager;
import jalview.json.binding.biojs.BioJSReleasePojo;
import jalview.json.binding.biojs.BioJSRepositoryPojo;
import jalview.util.MessageManager;
@@
-81,10
+82,10
@@
public class BioJsHTMLOutput
public void exportJalviewAlignmentAsBioJsHtmlFile()
{
public void exportJalviewAlignmentAsBioJsHtmlFile()
{
+ String outputFile = null;
try
{
try
{
- String outputFile = getOutputFile();
- // String jalviewAlignmentJson = JSONFile.getJSONData(ap);
+ outputFile = getOutputFile();
AlignExportSettingI exportSettings = new AlignExportSettingI()
{
@Override
AlignExportSettingI exportSettings = new AlignExportSettingI()
{
@Override
@@
-151,6
+152,11
@@
public class BioJsHTMLOutput
} catch (NoFileSelectedException ex)
{
// do noting if no file was selected
} catch (NoFileSelectedException ex)
{
// do noting if no file was selected
+ } catch (OutOfMemoryError err)
+ {
+ System.out.println("########################\n" + "OUT OF MEMORY "
+ + outputFile + "\n" + "########################");
+ new OOMWarning("Creating Image for " + outputFile, err);
} catch (Exception e)
{
pIndicator.setProgressBar(MessageManager.formatMessage(
} catch (Exception e)
{
pIndicator.setProgressBar(MessageManager.formatMessage(