Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 19:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ryanmkurtz_GT-2702_listner' into Ghidra_9.0.2

Browse Source
This commit is contained in:
ghidravore 2019-04-02 18:07:12 -04:00
commit 2fcf698408
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/archive/ArchivePlugin.java
View File

@ -93,7 +93,7 @@ public class ArchivePlugin extends Plugin implements FrontEndOnly, ProjectListen
private volatile boolean isArchiving;
private volatile boolean isRestoring;
private TaskListener archivingListener;
private TaskListener restoringListner;
private TaskListener restoringListener;
//////////////////////////////////////////////////////////////////
@ -282,7 +282,7 @@ public class ArchivePlugin extends Plugin implements FrontEndOnly, ProjectListen
isRestoring = true;
restoringListner = new TaskListener() {
restoringListener = new TaskListener() {
@Override
public void taskCompleted(Task task) {
isRestoring = false;
@ -295,7 +295,7 @@ public class ArchivePlugin extends Plugin implements FrontEndOnly, ProjectListen
};
Task task = new RestoreTask(lastRestoreLocator, archiveJar, this);
task.addTaskListener(restoringListner);
task.addTaskListener(restoringListener);
new TaskLauncher(task, tool.getToolFrame());
}

2
Ghidra/Features/Base/src/test/java/ghidra/framework/options/OptionsTest.java
View File

@ -623,7 +623,7 @@ public class OptionsTest extends AbstractGenericTest {
@Override
public int hashCode() {
return 1;// set so that this listener gets called after the storingOptionsListnere
return 1;// set so that this listener gets called after the storingOptionsListener
}
}

2
Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/ObjectChooserDialog.java
View File

@ -63,7 +63,7 @@ public class ObjectChooserDialog<T> extends DialogComponentProvider {
table.addSelectionListener(t -> objectSelected(t));
table.setItemPickListner(t -> objectPicked(t));
table.setItemPickListener(t -> objectPicked(t));
return table;
}

2
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableWidget.java
View File

@ -133,7 +133,7 @@ public class GTableWidget<T> extends JPanel {
listener.itemPicked(gFilterTable.getSelectedRowObject());
}
public void setItemPickListner(TableItemPickedListener<T> listener) {
public void setItemPickListener(TableItemPickedListener<T> listener) {
this.listener = listener;
}

2
Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java
View File

@ -867,7 +867,7 @@ public class GTree extends JPanel implements BusyListener {
tree.getModel().addTreeModelListener(listener);
}
public void removeGTModelListner(TreeModelListener listener) {
public void removeGTModelListener(TreeModelListener listener) {
tree.getModel().removeTreeModelListener(listener);
}

2
Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystem.java
View File

@ -254,7 +254,7 @@ public interface FileSystem {
/**
* Adds the given listener to be notified of file system changes.
* @param listener the listner to be added.
* @param listener the listener to be added.
*/
public void addFileSystemListener(FileSystemListener listener);

2
Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/edge/PathHighlightListner.java → Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/edge/PathHighlightListener.java
View File

@ -15,7 +15,7 @@
*/
package ghidra.graph.viewer.edge;
public interface PathHighlightListner {
public interface PathHighlightListener {
/**
* Called when the a path is highlighted.

4
Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/edge/VisualGraphPathHighlighter.java
View File

@ -99,7 +99,7 @@ public class VisualGraphPathHighlighter<V extends VisualVertex, E extends Visual
private CompletableFuture<ChkDominanceAlgorithm<V, E>> postDominanceFuture;
private CompletableFuture<Circuits> circuitFuture;
private PathHighlightListner listener = isHover -> {
private PathHighlightListener listener = isHover -> {
// stub
};
@ -108,7 +108,7 @@ public class VisualGraphPathHighlighter<V extends VisualVertex, E extends Visual
private SwingUpdateManager focusedVertexUpdater =
new SwingUpdateManager(() -> doUpdateFocusedVertex());
public VisualGraphPathHighlighter(VisualGraph<V, E> graph, PathHighlightListner listener) {
public VisualGraphPathHighlighter(VisualGraph<V, E> graph, PathHighlightListener listener) {
this.graph = graph;
if (listener != null) {
this.listener = listener;

12
Ghidra/Framework/Project/src/main/java/ghidra/framework/task/gui/GProgressBar.java
View File

@ -59,12 +59,12 @@ public class GProgressBar extends JPanel {
private Timer updateTimer;
private EmptyBorderButton cancelButton;
private CancelledListener cancelledListner;
private CancelledListener cancelledListener;
public GProgressBar(CancelledListener cancelledListner, boolean includeTextField,
public GProgressBar(CancelledListener cancelledListener, boolean includeTextField,
boolean includeCancelButton, boolean includeAnimatedIcon, float fontSize) {
super(new BorderLayout(5, 1));
this.cancelledListner = cancelledListner;
this.cancelledListener = cancelledListener;
this.fontSize = fontSize;
buildProgressPanel(includeTextField, includeCancelButton, includeAnimatedIcon);
@ -199,13 +199,13 @@ public class GProgressBar extends JPanel {
}
public void cancel() {
if (cancelledListner != null) {
cancelledListner.cancelled();
if (cancelledListener != null) {
cancelledListener.cancelled();
}
}
public void setCancelledListener(CancelledListener listener) {
this.cancelledListner = listener;
this.cancelledListener = listener;
}
private void buildProgressPanel(boolean includeTextField, boolean includeCancelButton,