Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 14:54:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1-dragonmacher-review-tool-close-bug'

Browse Source
This commit is contained in:
Ryan Kurtz
2025-07-29 09:45:21 -04:00
parent 7fb7f5df1b 24532a377d
commit 0af58800f5
1 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/StandAloneApplication.java
+40 -39
View File
@@ -277,45 +277,46 @@ public abstract class StandAloneApplication implements GenericStandAloneApplicat
@Override @Override
public ToolServices getToolServices() { public ToolServices getToolServices() {
return new ToolServicesAdapter() { return new StandAloneToolServices();
@Override
public void closeTool(PluginTool t) {
System.exit(0);
}
@Override
public void saveTool(PluginTool saveTool) {
Element toolElement = saveTool.saveToXml(true);
Element dataStateElement = saveTool.saveDataStateToXml(false);
Element rootElement = new Element("Root");
rootElement.addContent(toolElement);
rootElement.addContent(dataStateElement);
File savedToolFile =
new File(Application.getUserSettingsDirectory(), SAVED_TOOL_FILE);
OutputStream os = null;
try {
os = new FileOutputStream(savedToolFile);
Document doc = new Document(rootElement);
XMLOutputter xmlout = new GenericXMLOutputter();
xmlout.output(doc, os);
os.close();
}
catch (Exception e) {
Msg.error(this, "Error saving tool", e);
try {
if (os != null) {
os.close();
}
savedToolFile.delete();
}
catch (Exception exc) {
// cleanup, don't care
}
}
}
};
} }
protected static class StandAloneToolServices extends ToolServicesAdapter {
@Override
public void closeTool(PluginTool t) {
System.exit(0);
}
@Override
public void saveTool(PluginTool saveTool) {
Element toolElement = saveTool.saveToXml(true);
Element dataStateElement = saveTool.saveDataStateToXml(false);
Element rootElement = new Element("Root");
rootElement.addContent(toolElement);
rootElement.addContent(dataStateElement);
File savedToolFile =
new File(Application.getUserSettingsDirectory(), SAVED_TOOL_FILE);
OutputStream os = null;
try {
os = new FileOutputStream(savedToolFile);
Document doc = new Document(rootElement);
XMLOutputter xmlout = new GenericXMLOutputter();
xmlout.output(doc, os);
os.close();
}
catch (Exception e) {
Msg.error(this, "Error saving tool", e);
try {
if (os != null) {
os.close();
}
savedToolFile.delete();
}
catch (Exception exc) {
// cleanup, don't care
}
}
}
}
} }