Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-30 16:47:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test fixes for bad options name

Browse Source
This commit is contained in:
dragonmacher
2023-03-27 09:20:16 -04:00
parent 0709537f72
commit 1853506b15
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalAddConflictPanel.java
+5 -5
View File
@@ -27,6 +27,7 @@ import docking.widgets.fieldpanel.FieldPanel;
import docking.widgets.fieldpanel.internal.FieldPanelCoordinator; import docking.widgets.fieldpanel.internal.FieldPanelCoordinator;
import docking.widgets.label.GIconLabel; import docking.widgets.label.GIconLabel;
import generic.theme.GIcon; import generic.theme.GIcon;
import ghidra.GhidraOptions;
import ghidra.app.merge.MergeConstants; import ghidra.app.merge.MergeConstants;
import ghidra.app.merge.MergeManager; import ghidra.app.merge.MergeManager;
import ghidra.app.merge.util.ConflictCountPanel; import ghidra.app.merge.util.ConflictCountPanel;
@@ -49,7 +50,7 @@ import ghidra.program.model.symbol.ExternalLocation;
import resources.icons.EmptyIcon; import resources.icons.EmptyIcon;
/** /**
* Panel to select a data type in order to resolve an add conflict in the multi-user * Panel to select a data type in order to resolve an add conflict in the multi-user
* external location merger. * external location merger.
*/ */
class ExternalAddConflictPanel extends JPanel implements CodeFormatService { class ExternalAddConflictPanel extends JPanel implements CodeFormatService {
@@ -90,7 +91,6 @@ class ExternalAddConflictPanel extends JPanel implements CodeFormatService {
ExternalAddConflictPanel(MergeManager mergeManager, int totalConflicts, Program latestProgram, ExternalAddConflictPanel(MergeManager mergeManager, int totalConflicts, Program latestProgram,
Program myProgram, boolean showListingPanel) { Program myProgram, boolean showListingPanel) {
super();
this.tool = mergeManager.getMergeTool(); this.tool = mergeManager.getMergeTool();
this.mergeManager = mergeManager; this.mergeManager = mergeManager;
this.totalConflicts = totalConflicts; this.totalConflicts = totalConflicts;
@@ -168,7 +168,7 @@ class ExternalAddConflictPanel extends JPanel implements CodeFormatService {
} }
private ToolOptions getFieldOptions() { private ToolOptions getFieldOptions() {
ToolOptions fieldOptions = new ToolOptions("field"); ToolOptions fieldOptions = new ToolOptions(GhidraOptions.CATEGORY_BROWSER_FIELDS);
fieldOptions.setBoolean(RegisterFieldFactory.DISPLAY_HIDDEN_REGISTERS_OPTION_NAME, true); fieldOptions.setBoolean(RegisterFieldFactory.DISPLAY_HIDDEN_REGISTERS_OPTION_NAME, true);
return fieldOptions; return fieldOptions;
} }
@@ -310,7 +310,7 @@ class ExternalAddConflictPanel extends JPanel implements CodeFormatService {
} }
/** /**
* Add the latest program's listing model as a listener to the latest program * Add the latest program's listing model as a listener to the latest program
* for domain object events. * for domain object events.
*/ */
public void addDomainObjectListener() { public void addDomainObjectListener() {
@@ -319,7 +319,7 @@ class ExternalAddConflictPanel extends JPanel implements CodeFormatService {
} }
/** /**
* Remove the latest program's listing model as a listener to the latest program * Remove the latest program's listing model as a listener to the latest program
* for domain object events. * for domain object events.
*/ */
public void removeDomainObjectListener() { public void removeDomainObjectListener() {
Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanel.java
+4 -3
View File
@@ -29,6 +29,7 @@ import docking.widgets.fieldpanel.FieldPanel;
import docking.widgets.fieldpanel.internal.FieldPanelCoordinator; import docking.widgets.fieldpanel.internal.FieldPanelCoordinator;
import docking.widgets.fieldpanel.support.BackgroundColorModel; import docking.widgets.fieldpanel.support.BackgroundColorModel;
import generic.theme.GIcon; import generic.theme.GIcon;
import ghidra.GhidraOptions;
import ghidra.app.merge.MergeConstants; import ghidra.app.merge.MergeConstants;
import ghidra.app.nav.Navigatable; import ghidra.app.nav.Navigatable;
import ghidra.app.plugin.core.codebrowser.hover.*; import ghidra.app.plugin.core.codebrowser.hover.*;
@@ -149,7 +150,7 @@ public class ListingMergePanel extends JPanel
} }
private ToolOptions getFieldOptions() { private ToolOptions getFieldOptions() {
ToolOptions fieldOptions = new ToolOptions("field"); ToolOptions fieldOptions = new ToolOptions(GhidraOptions.CATEGORY_BROWSER_FIELDS);
fieldOptions.setBoolean(RegisterFieldFactory.DISPLAY_HIDDEN_REGISTERS_OPTION_NAME, true); fieldOptions.setBoolean(RegisterFieldFactory.DISPLAY_HIDDEN_REGISTERS_OPTION_NAME, true);
return fieldOptions; return fieldOptions;
} }
@@ -382,7 +383,7 @@ public class ListingMergePanel extends JPanel
} }
/** /**
* Add the result program's listing model as a listener to the result program * Add the result program's listing model as a listener to the result program
* for domain object events. * for domain object events.
*/ */
public void addDomainObjectListener() { public void addDomainObjectListener() {
@@ -391,7 +392,7 @@ public class ListingMergePanel extends JPanel
} }
/** /**
* Remove the result program's listing model as a listener to the result program * Remove the result program's listing model as a listener to the result program
* for domain object events. * for domain object events.
*/ */
public void removeDomainObjectListener() { public void removeDomainObjectListener() {