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-3171 raise warning when a dataset reference exists *and* a different dataset...
[jalview.git]
/
src
/
jalview
/
io
/
BioJsHTMLOutput.java
diff --git
a/src/jalview/io/BioJsHTMLOutput.java
b/src/jalview/io/BioJsHTMLOutput.java
index
fd9c584
..
52ce845
100644
(file)
--- a/
src/jalview/io/BioJsHTMLOutput.java
+++ b/
src/jalview/io/BioJsHTMLOutput.java
@@
-53,8
+53,7
@@
public class BioJsHTMLOutput extends HTMLOutput
.getDefault("biojs_template_directory", DEFAULT_DIR);
public static final String BJS_TEMPLATE_GIT_REPO = jalview.bin.Cache
.getDefault("biojs_template_directory", DEFAULT_DIR);
public static final String BJS_TEMPLATE_GIT_REPO = jalview.bin.Cache
- .getDefault(
- "biojs_template_git_repo",
+ .getDefault("biojs_template_git_repo",
"https://raw.githubusercontent.com/jalview/exporter-templates/master/biojs/package.json");
public BioJsHTMLOutput(AlignmentPanel ap)
"https://raw.githubusercontent.com/jalview/exporter-templates/master/biojs/package.json");
public BioJsHTMLOutput(AlignmentPanel ap)
@@
-80,8
+79,8
@@
public class BioJsHTMLOutput extends HTMLOutput
return;
} catch (Exception e)
{
return;
} catch (Exception e)
{
- setProgressMessage(MessageManager.formatMessage(
- "info.error_creating_file", "BioJS MSA"));
+ setProgressMessage(MessageManager
+ .formatMessage("info.error_creating_file", "BioJS MSA"));
e.printStackTrace();
return;
}
e.printStackTrace();
return;
}
@@
-89,8
+88,6
@@
public class BioJsHTMLOutput extends HTMLOutput
}
}
-
-
public static void refreshVersionInfo(String dirName)
throws URISyntaxException
{
public static void refreshVersionInfo(String dirName)
throws URISyntaxException
{
@@
-133,7
+130,8
@@
public class BioJsHTMLOutput extends HTMLOutput
{
try
{
{
try
{
- String gitRepoPkgJson = getURLContentAsString(BJS_TEMPLATE_GIT_REPO);
+ String gitRepoPkgJson = getURLContentAsString(
+ BJS_TEMPLATE_GIT_REPO);
if (gitRepoPkgJson != null)
{
BioJSRepositoryPojo release = new BioJSRepositoryPojo(
if (gitRepoPkgJson != null)
{
BioJSRepositoryPojo release = new BioJSRepositoryPojo(
@@
-235,8
+233,8
@@
public class BioJsHTMLOutput extends HTMLOutput
}
}
}
}
}
}
- return responseStrBuilder == null ? null : responseStrBuilder
- .toString();
+ return responseStrBuilder == null ? null
+ : responseStrBuilder.toString();
}
public static File getCurrentBJSTemplateFile()
}
public static File getCurrentBJSTemplateFile()
@@
-289,13
+287,13
@@
public class BioJsHTMLOutput extends HTMLOutput
String generatedBioJsWithJalviewAlignmentAsJson = bioJSTemplateString
.replaceAll("#sequenceData#", bioJSON).toString();
String generatedBioJsWithJalviewAlignmentAsJson = bioJSTemplateString
.replaceAll("#sequenceData#", bioJSON).toString();
- PrintWriter out = new java.io.PrintWriter(new java.io.FileWriter(
- generatedFile));
+ PrintWriter out = new java.io.PrintWriter(
+ new java.io.FileWriter(generatedFile));
out.print(generatedBioJsWithJalviewAlignmentAsJson);
out.flush();
out.close();
out.print(generatedBioJsWithJalviewAlignmentAsJson);
out.flush();
out.close();
- setProgressMessage(MessageManager.formatMessage(
- "status.export_complete", "BioJS"));
+ setProgressMessage(MessageManager
+ .formatMessage("status.export_complete", "BioJS"));
exportCompleted();
} catch (OutOfMemoryError err)
exportCompleted();
} catch (OutOfMemoryError err)
@@
-305,8
+303,8
@@
public class BioJsHTMLOutput extends HTMLOutput
new OOMWarning("Creating Image for " + generatedFile, err);
} catch (Exception e)
{
new OOMWarning("Creating Image for " + generatedFile, err);
} catch (Exception e)
{
- setProgressMessage(MessageManager.formatMessage(
- "info.error_creating_file", "HTML"));
+ setProgressMessage(MessageManager
+ .formatMessage("info.error_creating_file", "HTML"));
e.printStackTrace();
}
e.printStackTrace();
}