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

Merge remote-tracking branch 'origin/patch'

Browse source 
Conflicts:
	Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/help/ProcessorListPlugin.java
	Ghidra/Framework/Gui/src/main/java/ghidra/util/HTMLUtilities.java
This commit is contained in:
Ryan Kurtz 2024-02-07 11:18:36 -05:00
commit 80d1031d01
50 changed files with 713 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Framework/Docking/src/main/java/docking/StatusBar.java
View file

@ -190,7 +190,7 @@ public class StatusBar extends JPanel {
*/
public void setStatusText(String text) {
// Run this later in case we are in the midst of a Java focus transition, such as when a
// dialog is closing. If we don't let the focus transition finish, then we will not
// dialog is closing. If we don't let the focus transition finish, then we will not
// correctly locate the active window.
Swing.runLater(() -> doSetStatusText(text));
}
@ -287,7 +287,7 @@ public class StatusBar extends JPanel {
@Override
public String getToolTipText() {
if (messageQueue.size() > 0) {
StringBuffer buffer = new StringBuffer("<HTML>");
StringBuffer buffer = new StringBuffer("<html>");
Iterator<String> iter = messageQueue.iterator();
for (int i = 0; iter.hasNext(); i++) {