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 'develop' into releases/Release_2_11_3_Branch
[jalview.git]
/
src
/
jalview
/
io
/
BioJsHTMLOutput.java
diff --git
a/src/jalview/io/BioJsHTMLOutput.java
b/src/jalview/io/BioJsHTMLOutput.java
index
9db3df2
..
6779892
100644
(file)
--- a/
src/jalview/io/BioJsHTMLOutput.java
+++ b/
src/jalview/io/BioJsHTMLOutput.java
@@
-20,12
+20,6
@@
*/
package jalview.io;
*/
package jalview.io;
-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;
@@
-38,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;
@@
-47,12
+48,12
@@
public class BioJsHTMLOutput extends HTMLOutput
public static final String DEFAULT_DIR = System.getProperty("user.home")
+ File.separatorChar + ".biojs_templates" + File.separatorChar;
public static final String DEFAULT_DIR = System.getProperty("user.home")
+ File.separatorChar + ".biojs_templates" + File.separatorChar;
- public static final String BJS_TEMPLATES_LOCAL_DIRECTORY = jalview.bin.Cache
+ public static final String BJS_TEMPLATES_LOCAL_DIRECTORY = Cache
.getDefault("biojs_template_directory", DEFAULT_DIR);
.getDefault("biojs_template_directory", DEFAULT_DIR);
- public static final String BJS_TEMPLATE_GIT_REPO = jalview.bin.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)
{
@@
-275,4
+276,10
@@
public class BioJsHTMLOutput extends HTMLOutput
}
}
+ @Override
+ public void run(String s)
+ {
+ run();
+ }
+
}
}