yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 02:09:44 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GP-1-dragonmacher-help-headless-fix'

Conflicts:
	Ghidra/Framework/Help/src/main/java/help/GHelpBuilder.java
This commit is contained in:
Ryan Kurtz 2022-11-19 03:43:08 -05:00
commit 75ddd08bbd
10 changed files with 332 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Ghidra/Framework/Help/src/main/java/help/GHelpBuilder.java
View file

@ -22,7 +22,7 @@ import java.nio.file.Paths;
import java.util.*;
import generic.application.GenericApplicationLayout;
import generic.theme.ApplicationThemeManager;
import generic.theme.HeadlessThemeManager;
import ghidra.framework.Application;
import ghidra.framework.ApplicationConfiguration;
import help.validator.*;
@ -70,12 +70,11 @@ public class GHelpBuilder {
ApplicationConfiguration config = new ApplicationConfiguration() {
@Override
protected void initializeApplication() {
ApplicationThemeManager.initialize();
}
@Override
public boolean isHeadless() {
return false;
//
// We must be headless, as we are utility class. But, we also need theme properties
// to be loaded and correct for the help system to function properly.
//
HeadlessThemeManager.initialize();
}
};
Application.initializeApplication(new GenericApplicationLayout("Help Builder", "0.1"),