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

GT-2960 - Docking Actions - review fixes; test fixes

Browse source
This commit is contained in:
dragonmacher 2019-07-31 16:55:46 -04:00
parent d8c234d5d0
commit e6a85f9b1b
7 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanelProvider.java
View file

@ -15,9 +15,6 @@
*/
package ghidra.app.merge.tool;
import ghidra.app.util.viewer.listingpanel.ListingPanel;
import ghidra.framework.plugintool.*;
import java.awt.event.MouseEvent;
import java.util.List;
@ -26,8 +23,11 @@ import javax.swing.JComponent;
import docking.*;
import docking.action.DockingActionIf;
import docking.actions.PopupActionProvider;
import ghidra.app.util.viewer.listingpanel.ListingPanel;
import ghidra.framework.plugintool.*;
public class ListingMergePanelProvider extends ComponentProviderAdapter implements PopupActionProvider {
public class ListingMergePanelProvider extends ComponentProviderAdapter
implements PopupActionProvider {
private ListingMergePanel mergePanel;
public ListingMergePanelProvider(PluginTool tool, Plugin plugin, String owner,
@ -51,6 +51,7 @@ public class ListingMergePanelProvider extends ComponentProviderAdapter implemen
}
void dispose() {
tool.removePopupActionProvider(this);
}
@Override

5
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/CodeViewerProvider.java
View file

@ -48,7 +48,8 @@ import ghidra.app.util.viewer.listingpanel.*;
import ghidra.app.util.viewer.multilisting.MultiListingLayoutModel;
import ghidra.app.util.viewer.util.FieldNavigator;
import ghidra.framework.options.SaveState;
import ghidra.framework.plugintool.*;
import ghidra.framework.plugintool.NavigatableComponentProviderAdapter;
import ghidra.framework.plugintool.PluginTool;
import ghidra.program.model.address.*;
import ghidra.program.model.listing.*;
import ghidra.program.util.*;
@ -227,6 +228,8 @@ public class CodeViewerProvider extends NavigatableComponentProviderAdapter
public void dispose() {
super.dispose();
tool.removePopupActionProvider(this);
if (clipboardService != null) {
clipboardService.deRegisterClipboardContentProvider(codeViewerClipboardProvider);
}

10
Ghidra/Features/Base/src/test.slow/java/docking/ComponentProviderActionsTest.java
View file

@ -44,7 +44,7 @@ public class ComponentProviderActionsTest extends AbstractGhidraHeadedIntegratio
private final Icon ICON = ResourceManager.loadImage("images/refresh.png");
private static final String PROVIDER_NAME = "Test Action Provider";
private static final KeyStroke CONTROL_T =
KeyStroke.getKeyStroke(Character.valueOf('T'), DockingUtils.CONTROL_KEY_MODIFIER_MASK);
KeyStroke.getKeyStroke(KeyEvent.VK_T, DockingUtils.CONTROL_KEY_MODIFIER_MASK);
private TestEnv env;
private PluginTool tool;
@ -453,8 +453,12 @@ public class ComponentProviderActionsTest extends AbstractGhidraHeadedIntegratio
}
private void assertProviderIsActive() {
assertTrue("The test provider is not showing and focused",
runSwing(() -> tool.isActive(provider)));
assertTrue("Component provider is not showing", runSwing(() -> tool.isVisible(provider)));
// note: we can't call 'isActive()' due to focus issues in parallel testing
//assertTrue("The test provider is not showing and focused",
// runSwing(() -> tool.isActive(provider)));
}
private void assertProviderIsHidden() {

7
Ghidra/Features/Base/src/test.slow/java/ghidra/framework/plugintool/dialog/KeyBindingsTest.java
View file

@ -97,7 +97,12 @@ public class KeyBindingsTest extends AbstractGhidraHeadedIntegrationTest {
// verify that the description is displayed for the selected action
selectRowForAction(action1);
assertTrue(statusPane.getText().indexOf(action1.getDescription()) != -1);
String actualText = statusPane.getText();
assertTrue(
"Description is not updated for action '" + action1.getName() + "'; instead the " +
"description is '" + actualText + "'",
actualText.indexOf(action1.getDescription()) != -1);
}
@Test

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

@ -807,7 +807,7 @@ public abstract class ComponentProvider implements HelpDescriptor, ActionContext
DockingWindowManager myDwm = DockingWindowManager.getInstance(getComponent());
if (myDwm == null) {
// don't think this can happen
// this can happen when the tool loses focus
dockingTool.showComponentProvider(ComponentProvider.this, true);
return;
}

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

@ -845,9 +845,9 @@ public class DockingWindowManager implements PropertyChangeListener, Placeholder
}
placeholder.show(visibleState);
movePlaceholderToFront(placeholder, false);
if (visibleState) {
movePlaceholderToFront(placeholder, false);
if (placeholder.getNode() == null) {
root.add(placeholder);
}

5
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/projectdata/actions/VersionControlShowHistoryAction.java
View file

@ -28,8 +28,6 @@ import ghidra.framework.plugintool.Plugin;
*/
public class VersionControlShowHistoryAction extends VersionControlAction {
private VersionHistoryDialog dialog;
/**
* Creates an action to show the version history for a single version controlled
* domain file in the repository.
@ -71,11 +69,12 @@ public class VersionControlShowHistoryAction extends VersionControlAction {
if (!checkRepositoryConnected()) {
return;
}
if (domainFiles.size() != 1) {
return;
}
dialog = new VersionHistoryDialog(domainFiles.get(0));
VersionHistoryDialog dialog = new VersionHistoryDialog(domainFiles.get(0));
tool.showDialog(dialog, tool.getToolFrame());
}