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 'Jalview-JS/develop' into merge_js_develop
[jalview.git]
/
src
/
jalview
/
bin
/
Jalview.java
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
70aaa42
..
75504be
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-186,8
+186,8
@@
public class Jalview implements ApplicationSingletonI
class FeatureFetcher
{
/*
class FeatureFetcher
{
/*
- * TODO: generalise to track all jalview events to orchestrate batch processing
- * events.
+ * TODO: generalise to track all jalview events to orchestrate batch
+ * processing events.
*/
private int queued = 0;
*/
private int queued = 0;
@@
-461,7
+461,12
@@
public class Jalview implements ApplicationSingletonI
System.out.println("Error setting Taskbar: " + t.getMessage());
}
desktop.setVisible(true);
System.out.println("Error setting Taskbar: " + t.getMessage());
}
desktop.setVisible(true);
-
+ if (Platform.isJS())
+ Cache.setProperty("SHOW_JWS2_SERVICES", "false");
+ if (allowServices)
+ {
+ desktop.startServiceDiscovery();
+ }
if (!isJS)
/**
* Java only
if (!isJS)
/**
* Java only
@@
-469,8
+474,6
@@
public class Jalview implements ApplicationSingletonI
* @j2sIgnore
*/
{
* @j2sIgnore
*/
{
- if (allowServices)
- desktop.startServiceDiscovery();
if (!aparser.contains("nousagestats"))
{
startUsageStats(desktop);
if (!aparser.contains("nousagestats"))
{
startUsageStats(desktop);
@@
-763,6
+766,10
@@
public class Jalview implements ApplicationSingletonI
createOutputFiles(aparser, format);
}
}
createOutputFiles(aparser, format);
}
}
+ if (headless)
+ {
+ af.getViewport().getCalcManager().shutdown();
+ }
}
// extract groovy arguments before anything else.
// Once all other stuff is done, execute any groovy scripts (in order)
}
// extract groovy arguments before anything else.
// Once all other stuff is done, execute any groovy scripts (in order)