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-591
[jalview.git]
/
src
/
jalview
/
bin
/
Jalview.java
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
fc6d23e
..
6a59093
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-179,6
+179,7
@@
public class Jalview
if (!headless)
{
desktop = new Desktop();
if (!headless)
{
desktop = new Desktop();
+ desktop.setInBatchMode(true); // indicate we are starting up
desktop.setVisible(true);
desktop.startServiceDiscovery();
if (!aparser.contains("nousagestats"))
desktop.setVisible(true);
desktop.startServiceDiscovery();
if (!aparser.contains("nousagestats"))
@@
-411,7
+412,7
@@
public class Jalview
ex.printStackTrace(System.err);
}
}
ex.printStackTrace(System.err);
}
}
- // todo - load PDB structure to alignment
+ // TODO - load PDB structure(s) to alignment JAL-629
// (associate with identical sequence in alignment, or a specified
// sequence)
// (associate with identical sequence in alignment, or a specified
// sequence)
@@
-536,7
+537,7
@@
public class Jalview
startFeatureFetching(getFeatures);
}
}
startFeatureFetching(getFeatures);
}
}
- // execute a groovy script.
+ // Once all other stuff is done, execute any groovy scripts (in order)
if (groovyscript != null)
{
if (jalview.bin.Cache.groovyJarsPresent())
if (groovyscript != null)
{
if (jalview.bin.Cache.groovyJarsPresent())
@@
-551,8
+552,11
@@
public class Jalview
+ groovyscript);
}
}
+ groovyscript);
}
}
-
- // Once all other stuff is done, execute any groovy scripts (in order)
+ // and finally, turn off batch mode indicator - if the desktop still exists
+ if (desktop!=null)
+ {
+ desktop.setInBatchMode(false);
+ }
}
private static void startUsageStats(final Desktop desktop)
}
private static void startUsageStats(final Desktop desktop)