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

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

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramCompilerSpec.java
View file

@ -244,7 +244,7 @@ public class ProgramCompilerSpec extends BasicCompilerSpec {
return;
}
StringBuilder buffer = new StringBuilder();
buffer.append("<HTML>User-defined extensions failed to parse: ");
buffer.append("<html>User-defined extensions failed to parse: ");
buffer.append("<ul>");
for (String line : errorList) {
buffer.append("<li>").append(line).append("</li>");

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeArchiveTransformerPanel.java
View file

@ -57,9 +57,9 @@ public class DataTypeArchiveTransformerPanel extends JPanel {
private void setupDescription() {
JLabel label = new GHtmlLabel(
"<HTML>Specify the files for converting a new data type archive (.gdt)<BR>" +
"<html>Specify the files for converting a new data type archive (.gdt)<BR>" +
"to match the IDs of data types in an old data type archive.<BR>" +
"The result will be saved to the destination archive.</HTML>");
"The result will be saved to the destination archive.</html>");
label.setBorder(BorderFactory.createEmptyBorder(0, 0, 8, 0));
label.setHorizontalAlignment(SwingConstants.CENTER);
add(label, BorderLayout.NORTH);