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

GP-2796 - Refactor DockingApplicationLayout to be more generic

Browse source
This commit is contained in:
dragonmacher 2022-11-18 11:57:32 -05:00
parent 3586062eb4
commit 93f9e93cd7
9 changed files with 74 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/UserAgreementDialog.java
View file

@ -24,8 +24,8 @@ import javax.swing.text.html.HTMLEditorKit;
import docking.DialogComponentProvider;
import docking.DockingWindowManager;
import docking.framework.DockingApplicationConfiguration;
import docking.framework.DockingApplicationLayout;
import docking.widgets.label.GDLabel;
import generic.application.GenericApplicationLayout;
import generic.theme.Gui;
import ghidra.framework.Application;
import ghidra.util.HTMLUtilities;
@ -113,7 +113,7 @@ public class UserAgreementDialog extends DialogComponentProvider {
}
public static void main(String[] args) throws Exception {
ApplicationLayout layout = new DockingApplicationLayout("User Agreement Main", "1.0");
ApplicationLayout layout = new GenericApplicationLayout("User Agreement Main", "1.0");
DockingApplicationConfiguration config = new DockingApplicationConfiguration();
Application.initializeApplication(layout, config);
UserAgreementDialog dialog = new UserAgreementDialog(true, true);

8
Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/StandAloneApplication.java
View file

@ -27,7 +27,9 @@ import org.jdom.Element;
import org.jdom.input.SAXBuilder;
import org.jdom.output.XMLOutputter;
import docking.framework.*;
import docking.framework.ApplicationInformationDisplayFactory;
import docking.framework.DockingApplicationConfiguration;
import generic.application.GenericApplicationLayout;
import ghidra.framework.*;
import ghidra.framework.model.ToolServices;
import ghidra.util.Msg;
@ -61,7 +63,7 @@ public abstract class StandAloneApplication implements GenericStandAloneApplicat
* @throws IOException error causing application initialization failure
*/
public StandAloneApplication(String propertiesFilename) throws IOException {
this(new DockingApplicationLayout(readApplicationProperties(propertiesFilename)));
this(new GenericApplicationLayout(readApplicationProperties(propertiesFilename)));
}
/**
@ -72,7 +74,7 @@ public abstract class StandAloneApplication implements GenericStandAloneApplicat
* @throws IOException error causing application initialization failure
*/
public StandAloneApplication(String name, String version) throws IOException {
this(new DockingApplicationLayout(name, version));
this(new GenericApplicationLayout(name, version));
}
/**