mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-06-01 07:04:59 +08:00
Merge remote-tracking branch 'origin/GP-0_Dan_fixMemEditorCleanup'
This commit is contained in:
+12
-6
@@ -4,9 +4,9 @@
|
|||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
* You may obtain a copy of the License at
|
* You may obtain a copy of the License at
|
||||||
*
|
*
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
@@ -207,15 +207,21 @@ public class DebuggerControlServicePlugin extends AbstractDebuggerPlugin
|
|||||||
protected final ListenerForEditorInstallation listenerForEditorInstallation =
|
protected final ListenerForEditorInstallation listenerForEditorInstallation =
|
||||||
new ListenerForEditorInstallation();
|
new ListenerForEditorInstallation();
|
||||||
|
|
||||||
public DebuggerControlServicePlugin(PluginTool tool) {
|
|
||||||
super(tool);
|
|
||||||
}
|
|
||||||
|
|
||||||
private final Map<Trace, ControlMode> currentModes = new HashMap<>();
|
private final Map<Trace, ControlMode> currentModes = new HashMap<>();
|
||||||
|
|
||||||
private final ListenerSet<ControlModeChangeListener> listeners =
|
private final ListenerSet<ControlModeChangeListener> listeners =
|
||||||
new ListenerSet<>(ControlModeChangeListener.class, true);
|
new ListenerSet<>(ControlModeChangeListener.class, true);
|
||||||
|
|
||||||
|
public DebuggerControlServicePlugin(PluginTool tool) {
|
||||||
|
super(tool);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void dispose() {
|
||||||
|
super.dispose();
|
||||||
|
uninstallAllMemoryEditors();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ControlMode getCurrentMode(Trace trace) {
|
public ControlMode getCurrentMode(Trace trace) {
|
||||||
synchronized (currentModes) {
|
synchronized (currentModes) {
|
||||||
|
|||||||
Reference in New Issue
Block a user