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

GP-462 break memory pinning of closed tool

Browse source
This commit is contained in:
dev747368 2020-12-08 15:59:00 -05:00
parent 941ba0caf9
commit d3fb6b4758
4 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java
View file

@ -654,6 +654,9 @@ public class DockingWindowManager implements PropertyChangeListener, Placeholder
* @param provider the provider to be removed. * @param provider the provider to be removed.
*/ */
public void removeComponent(ComponentProvider provider) { public void removeComponent(ComponentProvider provider) {
if (provider == defaultProvider) {
defaultProvider = null;
}
placeholderManager.removeComponent(provider); placeholderManager.removeComponent(provider);
} }
@ -822,6 +825,7 @@ public class DockingWindowManager implements PropertyChangeListener, Placeholder
setNextFocusPlaceholder(null); setNextFocusPlaceholder(null);
removeInstance(this); removeInstance(this);
root = null; root = null;
lastActiveWindow = null;
} }
void showComponent(ComponentProvider provider, boolean visibleState, boolean shouldEmphasize) { void showComponent(ComponentProvider provider, boolean visibleState, boolean shouldEmphasize) {

2
Ghidra/Framework/Docking/src/main/java/docking/StatusBar.java
View file

@ -369,7 +369,7 @@ public class StatusBar extends JPanel {
} }
} }
class StatusPanel extends JPanel { static class StatusPanel extends JPanel {
Dimension prefSize; Dimension prefSize;
StatusPanel(Component c, boolean addBorder) { StatusPanel(Component c, boolean addBorder) {

2
Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginTool.java
View file

@ -449,7 +449,7 @@ public abstract class PluginTool extends AbstractDockingTool {
} }
winMgr.setVisible(false); winMgr.setVisible(false);
eventMgr.clearLastEvents(); eventMgr.clear();
pluginMgr.dispose(); pluginMgr.dispose();
toolActions.removeActions(ToolConstants.TOOL_OWNER); toolActions.removeActions(ToolConstants.TOOL_OWNER);

12
Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/EventManager.java
View file

@ -236,6 +236,18 @@ public class EventManager {
lastEventsByType.clear(); lastEventsByType.clear();
} }
/**
* Clear last plugin events fired, current event, listeners, etc.
*/
public void clear() {
allEventListeners.clear();
toolListeners.clear();
currentEvent = null;
lastEventsByType.clear();
listenersByEventType.clear();
eventQ.clear();
}
/** /**
* Return an array of the last plugin events fired. EventManager maps the event class to the * Return an array of the last plugin events fired. EventManager maps the event class to the
* last event fired. * last event fired.