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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
ghidra1 2019-12-05 11:48:31 -05:00
commit e07c83334d
11 changed files with 43 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/core/help/AboutDomainObjectUtils.java
View file

@ -62,7 +62,7 @@ public class AboutDomainObjectUtils {
if (helpLocation != null) {
dialog.setHelpLocation(helpLocation);
}
tool.showDialog(dialog, (Component) null);
tool.showDialog(dialog);
}
private static void addInfo(JPanel panel, String name, String value) {

3
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/FindCheckoutsDialog.java
View file

@ -128,7 +128,8 @@ public class FindCheckoutsDialog extends DialogComponentProvider {
@Override
public ActionContext getActionContext(MouseEvent event) {
return new ProjectDataActionContext(null, null, null, null, getFileList(), null, true);
return new ProjectDataActionContext(null, folder.getProjectData(), null, null,
getFileList(), null, true);
}
private class MyCellRenderer extends GTableCellRenderer {

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

@ -75,7 +75,7 @@ public class VersionControlShowHistoryAction extends VersionControlAction {
}
VersionHistoryDialog dialog = new VersionHistoryDialog(domainFiles.get(0));
tool.showDialog(dialog, tool.getToolFrame());
tool.showDialog(dialog);
}
}