yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

Fixed unnecessary showing of dialog related to saving tool changes

Browse source
This commit is contained in:
dragonmacher 2022-11-17 10:41:55 -05:00
parent 279b58a6e2
commit 6736068df2
1 changed files with 28 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/ToolManagerImpl.java
View file

@ -208,8 +208,7 @@ public class ToolManagerImpl implements ToolManager, PropertyChangeListener {
wsMap.put(name, ws); wsMap.put(name, ws);
// notify listeners of added workspace // notify listeners of added workspace
for (int i = 0; i < changeListeners.size(); i++) { for (WorkspaceChangeListener listener : changeListeners) {
WorkspaceChangeListener listener = changeListeners.get(i);
listener.workspaceAdded(ws); listener.workspaceAdded(ws);
} }
@ -250,8 +249,7 @@ public class ToolManagerImpl implements ToolManager, PropertyChangeListener {
wsMap.remove(wsName); wsMap.remove(wsName);
// notify listeners of removed workspace // notify listeners of removed workspace
for (int i = 0; i < changeListeners.size(); i++) { for (WorkspaceChangeListener listener : changeListeners) {
WorkspaceChangeListener listener = changeListeners.get(i);
listener.workspaceRemoved(ws); listener.workspaceRemoved(ws);
} }
@ -288,8 +286,8 @@ public class ToolManagerImpl implements ToolManager, PropertyChangeListener {
Element root = new Element("TOOL_MANAGER"); Element root = new Element("TOOL_MANAGER");
root.setAttribute("ACTIVE_WORKSPACE", activeWorkspace.getName()); root.setAttribute("ACTIVE_WORKSPACE", activeWorkspace.getName());
for (int i = 0; i < workspaces.size(); i++) { for (Workspace element : workspaces) {
WorkspaceImpl ws = (WorkspaceImpl) workspaces.get(i); WorkspaceImpl ws = (WorkspaceImpl) element;
root.addContent(ws.saveToXml()); root.addContent(ws.saveToXml());
} }
Iterator<String> keys = connectMap.keySet().iterator(); Iterator<String> keys = connectMap.keySet().iterator();
@ -381,8 +379,8 @@ public class ToolManagerImpl implements ToolManager, PropertyChangeListener {
* Close all running tools in the project. * Close all running tools in the project.
*/ */
public void close() { public void close() {
for (int i = 0; i < workspaces.size(); i++) { for (Workspace element : workspaces) {
WorkspaceImpl w = (WorkspaceImpl) workspaces.get(i); WorkspaceImpl w = (WorkspaceImpl) element;
w.close(); w.close();
} }
} }
@ -563,8 +561,8 @@ public class ToolManagerImpl implements ToolManager, PropertyChangeListener {
void closeTool(PluginTool tool) { void closeTool(PluginTool tool) {
// find the workspace running the tool // find the workspace running the tool
for (int i = 0; i < workspaces.size(); i++) { for (Workspace element : workspaces) {
WorkspaceImpl ws = (WorkspaceImpl) workspaces.get(i); WorkspaceImpl ws = (WorkspaceImpl) element;
PluginTool[] tools = ws.getTools(); PluginTool[] tools = ws.getTools();
for (PluginTool tool2 : tools) { for (PluginTool tool2 : tools) {
if (tool == tool2) { if (tool == tool2) {
@ -600,8 +598,7 @@ public class ToolManagerImpl implements ToolManager, PropertyChangeListener {
activeWorkspace = workspace; activeWorkspace = workspace;
// notify listeners of new active workspace // notify listeners of new active workspace
for (int i = 0; i < changeListeners.size(); i++) { for (WorkspaceChangeListener listener : changeListeners) {
WorkspaceChangeListener listener = changeListeners.get(i);
listener.workspaceSetActive(activeWorkspace); listener.workspaceSetActive(activeWorkspace);
} }
} }
@ -648,8 +645,7 @@ public class ToolManagerImpl implements ToolManager, PropertyChangeListener {
// fire property change event // fire property change event
PropertyChangeEvent event = PropertyChangeEvent event =
new PropertyChangeEvent(this, WORKSPACE_NAME_PROPERTY, ws.getName(), name); new PropertyChangeEvent(this, WORKSPACE_NAME_PROPERTY, ws.getName(), name);
for (int i = 0; i < changeListeners.size(); i++) { for (WorkspaceChangeListener l : changeListeners) {
WorkspaceChangeListener l = changeListeners.get(i);
l.propertyChange(event); l.propertyChange(event);
} }
} }
@ -672,8 +668,7 @@ public class ToolManagerImpl implements ToolManager, PropertyChangeListener {
deregisterTool(tool.getToolName(), tool); deregisterTool(tool.getToolName(), tool);
disconnectTool(tool); disconnectTool(tool);
for (int i = 0; i < changeListeners.size(); i++) { for (WorkspaceChangeListener l : changeListeners) {
WorkspaceChangeListener l = changeListeners.get(i);
l.toolRemoved(ws, tool); l.toolRemoved(ws, tool);
} }
} }
@ -714,8 +709,7 @@ public class ToolManagerImpl implements ToolManager, PropertyChangeListener {
} }
void fireToolAddedEvent(Workspace ws, PluginTool tool) { void fireToolAddedEvent(Workspace ws, PluginTool tool) {
for (int i = 0; i < changeListeners.size(); i++) { for (WorkspaceChangeListener l : changeListeners) {
WorkspaceChangeListener l = changeListeners.get(i);
l.toolAdded(ws, tool); l.toolAdded(ws, tool);
} }
} }
@ -778,8 +772,7 @@ public class ToolManagerImpl implements ToolManager, PropertyChangeListener {
private void firePropertyChangeEvent(PropertyChangeEvent ev) { private void firePropertyChangeEvent(PropertyChangeEvent ev) {
// notify listeners of tool change // notify listeners of tool change
for (int i = 0; i < changeListeners.size(); i++) { for (WorkspaceChangeListener l : changeListeners) {
WorkspaceChangeListener l = changeListeners.get(i);
l.propertyChange(ev); l.propertyChange(ev);
} }
} }
@ -812,7 +805,7 @@ public class ToolManagerImpl implements ToolManager, PropertyChangeListener {
} }
// we are in auto mode...if there is only one tool, then we can auto save // we are in auto mode...if there is only one tool, then we can auto save
if (getToolInstanceCount(tool) == 1) { if (getToolInstanceCount(tool) <= 1) {
return true; return true;
} }