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

GP-3 - Updated Navigatable to have a notion of selected text; updated

Browse source 
the SearchTextPlugin to use this feature
This commit is contained in:
dragonmacher 2021-05-18 16:30:08 -04:00
parent 3cc2bc5b06
commit 15a78011e3
19 changed files with 162 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/duallisting/VTListingNavigator.java
View file

@ -1,6 +1,5 @@
/* ###
* IP: GHIDRA
* REVIEWED: YES
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -16,6 +15,11 @@
*/
package ghidra.feature.vt.gui.duallisting;
import java.util.ArrayList;
import java.util.List;
import javax.swing.Icon;
import ghidra.app.nav.*;
import ghidra.app.util.HighlightProvider;
import ghidra.app.util.viewer.listingpanel.ListingCodeComparisonPanel;
@ -25,20 +29,16 @@ import ghidra.program.util.ProgramLocation;
import ghidra.program.util.ProgramSelection;
import ghidra.util.UniversalIdGenerator;
import java.util.ArrayList;
import java.util.List;
import javax.swing.Icon;
public class VTListingNavigator implements Navigatable {
private final ListingCodeComparisonPanel dualListingPanel;
private final ListingPanel listingPanel;
private List<NavigatableRemovalListener> listeners =
new ArrayList<NavigatableRemovalListener>();
new ArrayList<>();
private long id;
public VTListingNavigator(ListingCodeComparisonPanel dualListingPanel, ListingPanel listingPanel) {
public VTListingNavigator(ListingCodeComparisonPanel dualListingPanel,
ListingPanel listingPanel) {
this.dualListingPanel = dualListingPanel;
this.listingPanel = listingPanel;
@ -50,11 +50,21 @@ public class VTListingNavigator implements Navigatable {
listeners.add(listener);
}
@Override
public ProgramSelection getSelection() {
return listingPanel.getProgramSelection();
}
@Override
public ProgramSelection getHighlight() {
return listingPanel.getProgramHighlight();
}
@Override
public String getTextSelection() {
return listingPanel.getTextSelection();
}
@Override
public long getInstanceID() {
return id;
@ -80,11 +90,6 @@ public class VTListingNavigator implements Navigatable {
return listingPanel.getProgram();
}
@Override
public ProgramSelection getSelection() {
return listingPanel.getProgramSelection();
}
@Override
public boolean goTo(Program program, ProgramLocation location) {
boolean went = listingPanel.goTo(location);
@ -133,6 +138,7 @@ public class VTListingNavigator implements Navigatable {
@Override
public void setMemento(LocationMemento memento) {
// unsupported
}
@Override