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

use SwingUpdateManager for refresh

Browse source 
- this keeps GhidraScriptTableModel accesss on the swing thread and
  prevents unnecessary disk accesses on multiple bundle enable/disable
This commit is contained in:
Jason P. Leasure 2020-06-24 18:12:16 -04:00
parent d8ec1784ec
commit 321331c1c6
2 changed files with 58 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

82
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusComponentProvider.java
View file

@ -134,25 +134,25 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter {
Runnable runnable) {
new ActionBuilder(actionName, this.getName()).popupMenuPath(description)
.popupMenuIcon(icon)
.popupMenuGroup(BUNDLE_GROUP)
.description(description)
.enabled(false)
.enabledWhen(context -> bundleStatusTable.getSelectedRows().length > 0)
.onAction(context -> runnable.run())
.buildAndInstallLocal(this);
.popupMenuIcon(icon)
.popupMenuGroup(BUNDLE_GROUP)
.description(description)
.enabled(false)
.enabledWhen(context -> bundleStatusTable.getSelectedRows().length > 0)
.onAction(context -> runnable.run())
.buildAndInstallLocal(this);
}
private void createActions() {
Icon icon = Icons.REFRESH_ICON;
new ActionBuilder("RefreshBundles", this.getName()).popupMenuPath("Refresh all")
.popupMenuIcon(icon)
.popupMenuGroup(BUNDLE_LIST_GROUP)
.toolBarIcon(icon)
.toolBarGroup(BUNDLE_LIST_GROUP)
.description("Refresh state by cleaning and reactivating all enabled bundles")
.onAction(c -> doRefresh())
.buildAndInstallLocal(this);
.popupMenuIcon(icon)
.popupMenuGroup(BUNDLE_LIST_GROUP)
.toolBarIcon(icon)
.toolBarGroup(BUNDLE_LIST_GROUP)
.description("Refresh state by cleaning and reactivating all enabled bundles")
.onAction(c -> doRefresh())
.buildAndInstallLocal(this);
addBundlesAction("ActivateBundles", "Enable selected bundle(s)",
ResourceManager.loadImage("images/media-playback-start.png"), this::doEnableBundles);
@ -165,25 +165,25 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter {
icon = ResourceManager.loadImage("images/Plus.png");
new ActionBuilder("AddBundles", this.getName()).popupMenuPath("Add bundle(s)")
.popupMenuIcon(icon)
.popupMenuGroup(BUNDLE_LIST_GROUP)
.toolBarIcon(icon)
.toolBarGroup(BUNDLE_LIST_GROUP)
.description("Display file chooser to add bundles to list")
.onAction(c -> showAddBundlesFileChooser())
.buildAndInstallLocal(this);
.popupMenuIcon(icon)
.popupMenuGroup(BUNDLE_LIST_GROUP)
.toolBarIcon(icon)
.toolBarGroup(BUNDLE_LIST_GROUP)
.description("Display file chooser to add bundles to list")
.onAction(c -> showAddBundlesFileChooser())
.buildAndInstallLocal(this);
icon = ResourceManager.loadImage("images/edit-delete.png");
new ActionBuilder("RemoveBundles", this.getName())
.popupMenuPath("Remove selected bundle(s)")
.popupMenuIcon(icon)
.popupMenuGroup(BUNDLE_LIST_GROUP)
.toolBarIcon(icon)
.toolBarGroup(BUNDLE_LIST_GROUP)
.description("Remove selected bundle(s) from the list")
.enabledWhen(c -> bundleStatusTable.getSelectedRows().length > 0)
.onAction(c -> doRemoveBundles())
.buildAndInstallLocal(this);
.popupMenuPath("Remove selected bundle(s)")
.popupMenuIcon(icon)
.popupMenuGroup(BUNDLE_LIST_GROUP)
.toolBarIcon(icon)
.toolBarGroup(BUNDLE_LIST_GROUP)
.description("Remove selected bundle(s) from the list")
.enabledWhen(c -> bundleStatusTable.getSelectedRows().length > 0)
.onAction(c -> doRemoveBundles())
.buildAndInstallLocal(this);
}
/**
@ -203,9 +203,9 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter {
PrintWriter errOut = getTool().getService(ConsoleService.class).getStdErr();
List<BundleStatus> statuses = bundleStatusTableModel.getModelData()
.stream()
.filter(BundleStatus::isEnabled)
.collect(Collectors.toList());
.stream()
.filter(BundleStatus::isEnabled)
.collect(Collectors.toList());
// clean them all..
for (BundleStatus status : statuses) {
@ -330,7 +330,7 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter {
int modelRowIndex = bundleStatusTableModel.getRowIndex(status);
int viewRowIndex = filterPanel.getViewRow(modelRowIndex);
bundleStatusTable
.notifyTableChanged(new TableModelEvent(bundleStatusTableModel, viewRowIndex));
.notifyTableChanged(new TableModelEvent(bundleStatusTableModel, viewRowIndex));
}
private void notifyTableDataChanged() {
@ -362,8 +362,8 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter {
*/
public void setBundleFilesForTesting(List<ResourceFile> bundleFiles) {
bundleStatusTableModel.setModelData(bundleFiles.stream()
.map(f -> new BundleStatus(f, true, false, null))
.collect(Collectors.toList()));
.map(f -> new BundleStatus(f, true, false, null))
.collect(Collectors.toList()));
}
private final class RemoveBundlesTask extends Task {
@ -383,8 +383,8 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter {
if (!monitor.isCancelled()) {
// partition bundles into system (bundles.get(true)) and non-system (bundles.get(false)).
Map<Boolean, List<GhidraBundle>> bundles = statuses.stream()
.map(bs -> bundleHost.getExistingGhidraBundle(bs.getFile()))
.collect(Collectors.partitioningBy(GhidraBundle::isSystemBundle));
.map(bs -> bundleHost.getExistingGhidraBundle(bs.getFile()))
.collect(Collectors.partitioningBy(GhidraBundle::isSystemBundle));
List<GhidraBundle> systemBundles = bundles.get(true);
if (!systemBundles.isEmpty()) {
@ -456,9 +456,9 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter {
@Override
public void run(TaskMonitor monitor) throws CancelledException {
List<GhidraBundle> bundles = statuses.stream()
.filter(status -> status.isActive())
.map(status -> bundleHost.getExistingGhidraBundle(status.getFile()))
.collect(Collectors.toList());
.filter(status -> status.isActive())
.map(status -> bundleHost.getExistingGhidraBundle(status.getFile()))
.collect(Collectors.toList());
monitor.setMaximum(bundles.size());
for (GhidraBundle bundle : bundles) {

29
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptComponentProvider.java
View file

@ -101,6 +101,7 @@ public class GhidraScriptComponentProvider extends ComponentProviderAdapter {
private final BundleHost bundleHost;
private final RefreshingBundleHostListener refreshingBundleHostListener =
new RefreshingBundleHostListener();
final private SwingUpdateManager refreshUpdateManager = new SwingUpdateManager(this::doRefresh);
GhidraScriptComponentProvider(GhidraScriptMgrPlugin plugin, BundleHost bundleHost) {
super(plugin.getTool(), "Script Manager", plugin.getName());
@ -158,7 +159,7 @@ public class GhidraScriptComponentProvider extends ComponentProviderAdapter {
});
scriptCategoryTree.getSelectionModel()
.setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
.setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
}
private void build() {
@ -455,11 +456,11 @@ public class GhidraScriptComponentProvider extends ComponentProviderAdapter {
*/
public List<ResourceFile> getScriptDirectories() {
return bundleHost.getGhidraBundles()
.stream()
.filter(GhidraSourceBundle.class::isInstance)
.filter(GhidraBundle::isEnabled)
.map(GhidraBundle::getFile)
.collect(Collectors.toList());
.stream()
.filter(GhidraSourceBundle.class::isInstance)
.filter(GhidraBundle::isEnabled)
.map(GhidraBundle::getFile)
.collect(Collectors.toList());
}
/**
@ -467,12 +468,12 @@ public class GhidraScriptComponentProvider extends ComponentProviderAdapter {
*/
public List<ResourceFile> getWritableScriptDirectories() {
return bundleHost.getGhidraBundles()
.stream()
.filter(GhidraSourceBundle.class::isInstance)
.filter(Predicate.not(GhidraBundle::isSystemBundle))
.filter(GhidraBundle::isEnabled)
.map(GhidraBundle::getFile)
.collect(Collectors.toList());
.stream()
.filter(GhidraSourceBundle.class::isInstance)
.filter(Predicate.not(GhidraBundle::isSystemBundle))
.filter(GhidraBundle::isEnabled)
.map(GhidraBundle::getFile)
.collect(Collectors.toList());
}
boolean isEditorOpen(ResourceFile script) {
@ -712,6 +713,10 @@ public class GhidraScriptComponentProvider extends ComponentProviderAdapter {
}
void refresh() {
refreshUpdateManager.update();
}
void doRefresh() {
hasBeenRefreshed = true;
TreePath preRefreshSelectionPath = scriptCategoryTree.getSelectionPath();