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
Merge branch 'improvement/JAL-3783_upgrade_to_groovy-4' into bug/JAL-4298_java_consol...
[jalview.git]
/
src
/
jalview
/
io
/
BioJsHTMLOutput.java
diff --git
a/src/jalview/io/BioJsHTMLOutput.java
b/src/jalview/io/BioJsHTMLOutput.java
index
48988cf
..
eef203f
100644
(file)
--- a/
src/jalview/io/BioJsHTMLOutput.java
+++ b/
src/jalview/io/BioJsHTMLOutput.java
@@
-20,13
+20,6
@@
*/
package jalview.io;
*/
package jalview.io;
-import jalview.bin.Cache;
-import jalview.gui.AlignmentPanel;
-import jalview.gui.OOMWarning;
-import jalview.json.binding.biojs.BioJSReleasePojo;
-import jalview.json.binding.biojs.BioJSRepositoryPojo;
-import jalview.util.MessageManager;
-
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.File;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.File;
@@
-39,6
+32,13
@@
import java.net.URL;
import java.util.Objects;
import java.util.TreeMap;
import java.util.Objects;
import java.util.TreeMap;
+import jalview.bin.Cache;
+import jalview.gui.AlignmentPanel;
+import jalview.gui.OOMWarning;
+import jalview.json.binding.biojs.BioJSReleasePojo;
+import jalview.json.binding.biojs.BioJSRepositoryPojo;
+import jalview.util.MessageManager;
+
public class BioJsHTMLOutput extends HTMLOutput
{
private static File currentBJSTemplateFile;
public class BioJsHTMLOutput extends HTMLOutput
{
private static File currentBJSTemplateFile;
@@
-51,9
+51,9
@@
public class BioJsHTMLOutput extends HTMLOutput
public static final String BJS_TEMPLATES_LOCAL_DIRECTORY = Cache
.getDefault("biojs_template_directory", DEFAULT_DIR);
public static final String BJS_TEMPLATES_LOCAL_DIRECTORY = Cache
.getDefault("biojs_template_directory", DEFAULT_DIR);
- public static final String BJS_TEMPLATE_GIT_REPO = Cache
- .getDefault("biojs_template_git_repo",
- "https://raw.githubusercontent.com/jalview/exporter-templates/master/biojs/package.json");
+ public static final String BJS_TEMPLATE_GIT_REPO = Cache.getDefault(
+ "biojs_template_git_repo",
+ "https://raw.githubusercontent.com/jalview/exporter-templates/master/biojs/package.json");
public BioJsHTMLOutput(AlignmentPanel ap)
{
public BioJsHTMLOutput(AlignmentPanel ap)
{
@@
-138,7
+138,7
@@
public class BioJsHTMLOutput extends HTMLOutput
{
if (!biojsDirectory.mkdirs())
{
{
if (!biojsDirectory.mkdirs())
{
- System.out.println("Couldn't create local directory : "
+ jalview.bin.Console.outPrintln("Couldn't create local directory : "
+ BJS_TEMPLATES_LOCAL_DIRECTORY);
return;
}
+ BJS_TEMPLATES_LOCAL_DIRECTORY);
return;
}
@@
-264,7
+264,7
@@
public class BioJsHTMLOutput extends HTMLOutput
} catch (OutOfMemoryError err)
{
} catch (OutOfMemoryError err)
{
- System.out.println("########################\n" + "OUT OF MEMORY "
+ jalview.bin.Console.outPrintln("########################\n" + "OUT OF MEMORY "
+ generatedFile + "\n" + "########################");
new OOMWarning("Creating Image for " + generatedFile, err);
} catch (Exception e)
+ generatedFile + "\n" + "########################");
new OOMWarning("Creating Image for " + generatedFile, err);
} catch (Exception e)
@@
-276,4
+276,10
@@
public class BioJsHTMLOutput extends HTMLOutput
}
}
+ @Override
+ public void run(String s)
+ {
+ run();
+ }
+
}
}