mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-3189 corrected tool launch issue when file(s) dragged onto tool icon in toolchest. Removed single-DomainFile launch methods on ToolServices API.

Browse Source
This commit is contained in:
ghidra1
2023-03-13 19:23:19 -04:00
parent d84d6df8f6
commit 62501f70c1
9 changed files with 41 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Ghidra/Debug/ProposedUtils/src/main/java/ghidra/framework/plugintool/PluginToolUtils.java
View File

@@ -15,6 +15,8 @@
*/
package ghidra.framework.plugintool;
import java.util.List;
import java.util.Objects;
import java.util.function.Function;
import docking.DockingWindowManager;
@@ -63,11 +65,12 @@ public enum PluginToolUtils {
* that case, it'll pick any compatible tool, no matter how recently it had focus.
*
* @param tool the front-end tool
* @param domainFile the domain file to open
* @param domainFile the domain file to open (may not be null)
* @return the (possibly new) plugin tool which accepted the domain file
*/
public static PluginTool openInMostRecentOrLaunchedCompatibleTool(PluginTool tool,
DomainFile domainFile) {
Objects.requireNonNull(domainFile);
DomainFile[] data = new DomainFile[] { domainFile };
PluginTool result = inRunningToolsPreferringActive(tool, pt -> {
return pt.acceptDomainFiles(data) ? pt : null;
@@ -75,7 +78,7 @@ public enum PluginToolUtils {
if (result != null) {
return result;
}
return tool.getToolServices().launchDefaultTool(domainFile);
return tool.getToolServices().launchDefaultTool(List.of(domainFile));
}
/**