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

Merge remote-tracking branch 'origin/GT-3456-dragonmacher-toolbar-action-fixes'

Browse source
This commit is contained in:
ghidorahrex 2020-01-17 13:39:39 -05:00
commit 1d77647007
23 changed files with 217 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndTool.java
View file

@ -356,12 +356,11 @@ public class FrontEndTool extends PluginTool implements OptionsChangeListener {
*
* @param tool tool that has the domain file opened
* @param domainFile domain file to check in
* @param taskListener listener that is notified when task completes
*/
public void checkIn(PluginTool tool, DomainFile domainFile, TaskListener taskListener) {
public void checkIn(PluginTool tool, DomainFile domainFile) {
ArrayList<DomainFile> list = new ArrayList<>();
list.add(domainFile);
checkIn(tool, list, taskListener, tool.getToolFrame());
checkIn(tool, list, tool.getToolFrame());
}
/**
@ -369,11 +368,9 @@ public class FrontEndTool extends PluginTool implements OptionsChangeListener {
*
* @param tool tool that has the domain files opened
* @param fileList list of DomainFile objects
* @param taskListener listener that is notified when task completes
* @param parent parent of dialog if an error occurs during checkin
*/
public void checkIn(PluginTool tool, List<DomainFile> fileList, TaskListener taskListener,
Component parent) {
public void checkIn(PluginTool tool, List<DomainFile> fileList, Component parent) {
if (!checkRepositoryConnected(tool)) {
return;
@ -913,7 +910,11 @@ public class FrontEndTool extends PluginTool implements OptionsChangeListener {
private void notifyTaskListener() {
SystemUtilities.runSwingNow(() -> {
if (taskListener == null) {
return;
}
Swing.runNow(() -> {
if (wasCanceled) {
taskListener.taskCancelled(MergeTask.this);
}

31
Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProjectManager.java
View file

@ -47,7 +47,7 @@ public class DefaultProjectManager implements ProjectManager {
*/
private final static String LAST_OPENED_PROJECT = "LastOpenedProject";
private static final Logger LOGGER = LogManager.getLogger(DefaultProjectManager.class);
private static final Logger LOG = LogManager.getLogger(DefaultProjectManager.class);
private static final String RECENT_PROJECTS = "RecentProjects";
private static final String VIEWED_PROJECTS = "ViewedProjects";
@ -151,11 +151,11 @@ public class DefaultProjectManager implements ProjectManager {
return null;
}
catch (ReadOnlyException e) {
Msg.showError(LOGGER, null, "Read-only Project!",
Msg.showError(LOG, null, "Read-only Project!",
"Cannot open project for update: " + projectLocator);
}
catch (IOException e) {
Msg.showError(LOGGER, null, "Open Project Failed!",
Msg.showError(LOG, null, "Open Project Failed!",
"Could not open project " + projectLocator + "\n \nCAUSE: " + e.getMessage());
}
finally {
@ -310,7 +310,7 @@ public class DefaultProjectManager implements ProjectManager {
Set<ToolTemplate> tools = ToolUtils.getDefaultApplicationTools();
if (tools == null || tools.isEmpty()) {
Msg.showError(LOGGER, null, "Default Tools Not Found",
Msg.showError(LOG, null, "Default Tools Not Found",
"Could not find default tools for project.");
return;
}
@ -321,10 +321,11 @@ public class DefaultProjectManager implements ProjectManager {
}
private void installTools(ToolChest toolChest) {
LOGGER.debug("No tools found; Installing default tools");
LOG.debug("No tools found; Installing default tools");
File recoveryDirectory = getMostRecentValidProjectDirectory();
if (recoveryDirectory == null) {
LOG.debug("\tno recent project directories found");
addDefaultTools(toolChest);
return;
}
@ -332,7 +333,7 @@ public class DefaultProjectManager implements ProjectManager {
// get old tools
Set<ToolTemplate> tools = ToolUtils.getDefaultApplicationTools();
if (tools == null || tools.isEmpty()) {
Msg.showError(LOGGER, null, "Default Tools Not Found",
Msg.showError(LOG, null, "Default Tools Not Found",
"Could not find default tools for project.");
return;
}
@ -376,14 +377,14 @@ public class DefaultProjectManager implements ProjectManager {
return new HashSet<>(defaultTools);
}
LOGGER.debug("Found the following default tools: ");
LOG.debug("Found the following default tools: ");
for (ToolTemplate tool : defaultTools) {
LOGGER.debug("-" + tool);
LOG.debug("-" + tool);
}
LOGGER.debug("Found existing tools; merging existing tools: ");
LOG.debug("Found existing tools; merging existing tools: ");
for (ToolTemplate tool : userTools) {
LOGGER.debug("-" + tool);
LOG.debug("-" + tool);
}
//@formatter:off
@ -425,7 +426,7 @@ public class DefaultProjectManager implements ProjectManager {
file -> file.isDirectory() && file.getName().equals(APPLICATION_TOOLS_DIR_NAME);
File[] toolDirs = previousUserDir.listFiles(dirFilter);
if (toolDirs == null || toolDirs.length != 1) {
LOGGER.debug("No user tools found in '" + previousUserDir + "'");
LOG.debug("No user tools found in '" + previousUserDir + "'");
return Collections.emptySet();
}
@ -450,7 +451,7 @@ public class DefaultProjectManager implements ProjectManager {
saveTool(template);
}
catch (Exception e) {
Msg.error(LOGGER,
Msg.error(LOG,
"Unable to save user tool '" + template.getName() + "': " + e.getMessage(), e);
}
}
@ -465,9 +466,9 @@ public class DefaultProjectManager implements ProjectManager {
// this implies that there exist multiple *default* tools with the same name, which
// is an error condition.
if (toolChest.getToolTemplate(template.getName()) != null) {
Msg.showWarn(LOGGER, null, "Error Adding Tool",
Msg.showWarn(LOG, null, "Error Adding Tool",
"Found multiple default tools with the same name: " + template.getName() +
". Check the classpath for " +
".\nCheck the classpath for " +
"entries that contain tools that share the same tool name");
}
@ -487,7 +488,7 @@ public class DefaultProjectManager implements ProjectManager {
}
}
catch (Exception e) {
Msg.showError(LOGGER, null, "Tool Chest Error", "Failed to create tool chest.", e);
Msg.showError(LOG, null, "Tool Chest Error", "Failed to create tool chest.", e);
}
}