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

Merge remote-tracking branch 'origin/GP-6016-dragonmacher-function-compare-save--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz
2025-10-01 05:07:04 -04:00
parent ad7f0b0bc9 85f07ad803
commit 99ed7ea955
11 changed files with 115 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/CodeCompare/src/main/java/ghidra/features/codecompare/plugin/FunctionComparisonProvider.java
+4 -4
View File
@@ -354,12 +354,12 @@ public class FunctionComparisonProvider extends ComponentProviderAdapter
}
}
public CodeComparisonView getCodeComparisonView(String name) {
return functionComparisonPanel.getCodeComparisonView(name);
public CodeComparisonView getView(String name) {
return functionComparisonPanel.getView(name);
}
public void selectComparisonView(String name) {
functionComparisonPanel.selectComparisonView(name);
public void setActiveView(String name) {
functionComparisonPanel.setActiveView(name);
}
private void dispose() {
Ghidra/Features/CodeCompare/src/test/java/ghidra/features/codecompare/decompile/AbstractDualDecompilerTest.java
+1 -1
View File
@@ -75,7 +75,7 @@ public abstract class AbstractDualDecompilerTest extends AbstractGhidraHeadedInt
protected void setActivePanel(FunctionComparisonProvider provider,
CodeComparisonView comparisonProvider) {
runSwing(
() -> provider.getComponent().setCurrentTabbedComponent(comparisonProvider.getName()));
() -> provider.getComponent().setActiveView(comparisonProvider.getName()));
waitForSwing();
}
Ghidra/Features/CodeCompare/src/test/java/ghidra/features/codecompare/plugin/CompareFunctionsProviderTest.java
+1 -1
View File
@@ -294,7 +294,7 @@ public class CompareFunctionsProviderTest extends AbstractGhidraHeadedIntegratio
private void setActivePanel(FunctionComparisonProvider provider,
CodeComparisonView comparisonProvider) {
runSwing(
() -> provider.getComponent().setCurrentTabbedComponent(comparisonProvider.getName()));
() -> provider.getComponent().setActiveView(comparisonProvider.getName()));
waitForSwing();
}