Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-12 23:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests - fix for headless task usage

Browse Source
This commit is contained in:
dragonmacher 2019-05-15 16:24:15 -04:00
parent 9f3e323a79
commit 66ef92ae36
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Ghidra/Framework/Docking/src/main/java/ghidra/util/task/TaskBuilder.java
View File

@ -53,6 +53,9 @@ import util.CollectionUtils;
* .setStatusTextAlignment(SwingConstants.LEADING)
* .launchModal();
* </pre>
*
* <p>Note: this class will check to see if it is in a headless environment before launching
* its task. This makes it safe to use this class in headed or headless environments.
*/
public class TaskBuilder {
@ -187,29 +190,41 @@ public class TaskBuilder {
}
/**
* Launches the task built by this builder, using a blocking modal dialog.
* Launches the task built by this builder, using a blocking modal dialog. The task will
* be run in the current thread if in a headless environment.
*/
public void launchModal() {
validate();
boolean isModal = true;
Task t = new TaskBuilderTask(isModal);
if (SystemUtilities.isInHeadlessMode()) {
t.monitoredRun(TaskMonitor.DUMMY);
return;
}
// note: just calling the launcher will trigger the work
int delay = getDelay(launchDelay, isModal);
new TaskLauncher(t, parent, delay, dialogWidth);
}
/**
* Launches the task built by this builder, using a non-blocking dialog.
* @return the launcher that launched the task
* Launches the task built by this builder, using a non-blocking dialog. The task will
* be run in the current thread if in a headless environment.
*/
public TaskLauncher launchNonModal() {
public void launchNonModal() {
validate();
boolean isModal = false;
Task t = new TaskBuilderTask(isModal);
if (SystemUtilities.isInHeadlessMode()) {
t.monitoredRun(TaskMonitor.DUMMY);
return;
}
// note: just calling the launcher will trigger the work
int delay = getDelay(launchDelay, isModal);
TaskLauncher launcher = new TaskLauncher(t, parent, delay, dialogWidth);
return launcher;
new TaskLauncher(t, parent, delay, dialogWidth);
}
private void validate() {