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

Merge remote-tracking branch 'origin/GT-2629-dragonmacher-decompiler-type-hovers'

Browse source
This commit is contained in:
Ryan Kurtz 2019-06-13 13:58:08 -04:00
commit 96e860856d
6 changed files with 86 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/hover/AbstractHoverProvider.java
View file

@ -31,7 +31,7 @@ import ghidra.app.services.HoverService;
import ghidra.program.model.listing.Program;
import ghidra.program.util.ProgramLocation;
import ghidra.util.Msg;
import ghidra.util.SystemUtilities;
import ghidra.util.Swing;
public abstract class AbstractHoverProvider implements HoverProvider {
@ -40,12 +40,7 @@ public abstract class AbstractHoverProvider implements HoverProvider {
protected Program program;
protected Field lastField;
private static final Comparator<HoverService> HOVER_PRIORITY_COMPARATOR =
new Comparator<HoverService>() {
@Override
public int compare(HoverService service1, HoverService service2) {
return service2.getPriority() - service1.getPriority();// Highest priority is first
}
};
(service1, service2) -> service2.getPriority() - service1.getPriority();
protected HoverService activeHoverService;
protected PopupWindow popupWindow;
@ -121,12 +116,9 @@ public abstract class AbstractHoverProvider implements HoverProvider {
public void dispose() {
// we can be disposed from outside the swing thread
SystemUtilities.runSwingLater(new Runnable() {
@Override
public void run() {
closeHover();
hoverServices.clear();
}
Swing.runLater(() -> {
closeHover();
hoverServices.clear();
});
program = null;
@ -148,25 +140,15 @@ public abstract class AbstractHoverProvider implements HoverProvider {
}
ProgramLocation loc = getHoverLocation(fieldLocation, field, fieldBounds, event);
if (loc == null) {
return;
}
JComponent comp = null;
for (HoverService hoverService : hoverServices) {
comp = hoverService.getHoverComponent(program, loc, fieldLocation, field);
JComponent comp = hoverService.getHoverComponent(program, loc, fieldLocation, field);
if (comp != null) {
closeHover();
activeHoverService = hoverService;
break;
showPopup(comp, field, event, fieldBounds);
return;
}
}
if (comp != null) {
showPopup(comp, field, event, fieldBounds);
}
}
protected void showPopup(JComponent comp, Field field, MouseEvent event,