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

5
Ghidra/Features/Base/ghidra_scripts/BuildGhidraJarScript.java
View file

@ -62,9 +62,12 @@ public class BuildGhidraJarScript extends GhidraScript {
builder.addExcludedFileExtension(".pdf"); builder.addExcludedFileExtension(".pdf");
File installDir = Application.getInstallationDirectory().getFile(true); File installDir = Application.getInstallationDirectory().getFile(true);
builder.buildJar(new File(installDir, "ghidra.jar"), null, monitor); File file = new File(installDir, "ghidra.jar");
builder.buildJar(file, null, monitor);
// uncomment the following line to create a src zip for debugging. // uncomment the following line to create a src zip for debugging.
// builder.buildSrcZip(new File(installDir, "GhidraSrc.zip"), monitor); // builder.buildSrcZip(new File(installDir, "GhidraSrc.zip"), monitor);
println("Finsished writing jar: " + file);
} }
} }

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/rust/RustDemanglerAnalyzer.java
View file

@ -27,9 +27,7 @@ import ghidra.app.util.demangler.*;
import ghidra.app.util.importer.MessageLog; import ghidra.app.util.importer.MessageLog;
import ghidra.framework.options.*; import ghidra.framework.options.*;
import ghidra.program.model.address.Address; import ghidra.program.model.address.Address;
import ghidra.program.model.listing.Function;
import ghidra.program.model.listing.Program; import ghidra.program.model.listing.Program;
import ghidra.program.model.symbol.SourceType;
import ghidra.util.HelpLocation; import ghidra.util.HelpLocation;
import ghidra.util.SystemUtilities; import ghidra.util.SystemUtilities;
import ghidra.util.task.TaskMonitor; import ghidra.util.task.TaskMonitor;

5
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/calltree/CallTreeProvider.java
View file

@ -49,7 +49,6 @@ import ghidra.program.model.listing.Function;
import ghidra.program.model.listing.Program; import ghidra.program.model.listing.Program;
import ghidra.program.model.symbol.Symbol; import ghidra.program.model.symbol.Symbol;
import ghidra.program.util.*; import ghidra.program.util.*;
import ghidra.util.HTMLUtilities;
import ghidra.util.HelpLocation; import ghidra.util.HelpLocation;
import ghidra.util.exception.CancelledException; import ghidra.util.exception.CancelledException;
import ghidra.util.task.SwingUpdateManager; import ghidra.util.task.SwingUpdateManager;
@ -448,10 +447,10 @@ public class CallTreeProvider extends ComponentProviderAdapter {
navigateIncomingToggleAction.setSelected(isPrimary); navigateIncomingToggleAction.setSelected(isPrimary);
navigateIncomingToggleAction.setToolBarData(new ToolBarData( navigateIncomingToggleAction.setToolBarData(new ToolBarData(
Icons.NAVIGATE_ON_INCOMING_EVENT_ICON, navigationOptionsToolbarGroup, "2")); Icons.NAVIGATE_ON_INCOMING_EVENT_ICON, navigationOptionsToolbarGroup, "2"));
navigateIncomingToggleAction.setDescription(HTMLUtilities.toHTML("Incoming Navigation" + navigateIncomingToggleAction.setDescription("<html>Incoming Navigation" +
"<br><br>Toggle <b>On</b> - change the displayed " + "<br><br>Toggle <b>On</b> - change the displayed " +
"function on Listing navigation events" + "function on Listing navigation events" +
"<br>Toggled <b>Off</b> - don't change the displayed function on Listing navigation events")); "<br>Toggled <b>Off</b> - don't change the displayed function on Listing navigation events");
navigateIncomingToggleAction.setHelpLocation( navigateIncomingToggleAction.setHelpLocation(
new HelpLocation(plugin.getName(), "Call_Tree_Action_Incoming_Navigation")); new HelpLocation(plugin.getName(), "Call_Tree_Action_Incoming_Navigation"));
tool.addLocalAction(this, navigateIncomingToggleAction); tool.addLocalAction(this, navigateIncomingToggleAction);

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearDialog.java
View file

@ -124,7 +124,7 @@ public class ClearDialog extends DialogComponentProvider {
symbolsCb = new GCheckBox("Symbols"); symbolsCb = new GCheckBox("Symbols");
commentsCb = new GHtmlCheckBox( commentsCb = new GHtmlCheckBox(
"<HTML>Comments <FONT SIZE=\"2\">(does not affect automatic comments)</FONT>"); "<html>Comments <FONT SIZE=\"2\">(does not affect automatic comments)</FONT>");
commentsCb.setVerticalTextPosition(SwingConstants.TOP); commentsCb.setVerticalTextPosition(SwingConstants.TOP);
propertiesCb = new GCheckBox("Properties"); propertiesCb = new GCheckBox("Properties");
codeCb = new GCheckBox("Code"); codeCb = new GCheckBox("Code");

8
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/hover/DataTypeListingHover.java
View file

@ -103,17 +103,17 @@ public class DataTypeListingHover extends AbstractConfigurableHover implements L
toolTipText = toolTipText.replace("Unsized", Integer.toString(dataLen)); toolTipText = toolTipText.replace("Unsized", Integer.toString(dataLen));
} }
if (dataInstance != null) { if (dataInstance != null) {
toolTipText = toolTipText.replace("</HTML>", toolTipText = toolTipText.replace("</html>",
getLocationSupplimentalToolTipText(dt, dataInstance) + "</HTML>"); getLocationSupplimentalToolTipText(dt, dataInstance) + "</html>");
} }
String warningMsg = ""; String warningMsg = "";
if (hasInvalidStorage) { if (hasInvalidStorage) {
warningMsg += "WARNING! Invalid Storage"; warningMsg += "WARNING! Invalid Storage";
} }
if (warningMsg.length() != 0) { if (warningMsg.length() != 0) {
String errorText = "<HTML><center><font color=\"" + Messages.ERROR.toHexString() + String errorText = "<html><center><font color=\"" + Messages.ERROR.toHexString() +
"\">" + warningMsg + "!</font></center><BR>"; "\">" + warningMsg + "!</font></center><BR>";
toolTipText = toolTipText.replace("<HTML>", errorText); toolTipText = toolTipText.replace("<html>", errorText);
} }
return createTooltipComponent(toolTipText); return createTooltipComponent(toolTipText);
} }

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/hover/ProgramAddressRelationshipListingHover.java
View file

@ -84,7 +84,7 @@ public class ProgramAddressRelationshipListingHover extends AbstractConfigurable
return null; return null;
} }
StringBuilder sb = new StringBuilder("<HTML><table>"); StringBuilder sb = new StringBuilder("<html><table>");
Address loc = programLocation.getAddress(); Address loc = programLocation.getAddress();
if (isInDefaultSpace(program, loc)) { if (isInDefaultSpace(program, loc)) {

4
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/BitFieldPlacementComponent.java
View file

@ -623,9 +623,9 @@ public class BitFieldPlacementComponent extends JPanel implements Scrollable {
conflictMsg += "<div style=\"color: red;font-style: italic\">overlaps " + conflictMsg += "<div style=\"color: red;font-style: italic\">overlaps " +
HTMLUtilities.escapeHTML(conflictTip) + "</div>"; HTMLUtilities.escapeHTML(conflictTip) + "</div>";
} }
return "<HTML><div style=\"text-align:center\">" + HTMLUtilities.escapeHTML(tip) + return "<html><div style=\"text-align:center\">" + HTMLUtilities.escapeHTML(tip) +
conflictMsg + conflictMsg +
"<div style=\"color: gray;font-style: italic\">(Shift-wheel to zoom)</div></div></HTML>"; "<div style=\"color: gray;font-style: italic\">(Shift-wheel to zoom)</div></div>";
} }
@Override @Override

28
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorPanel.java
View file

@ -394,10 +394,10 @@ public class CompEditorPanel extends CompositeEditorPanel {
new HelpLocation(provider.getHelpTopic(), provider.getHelpName() + "_" + "Align")); new HelpLocation(provider.getHelpTopic(), provider.getHelpName() + "_" + "Align"));
} }
String alignmentToolTip = String alignmentToolTip =
"<HTML>The <B>align</B> control allows the overall minimum alignment of this<BR>" + "<html>The <B>align</B> control allows the overall minimum alignment of this<BR>" +
"data type to be specified. The actual computed alignment<BR>" + "data type to be specified. The actual computed alignment<BR>" +
"may be any multiple of this value. " + "<font color=\"" + "may be any multiple of this value. " + "<font color=\"" +
Palette.BLUE.toHexString() + "\" size=\"-2\">(&lt;F1&gt; for help)</HTML>"; Palette.BLUE.toHexString() + "\" size=\"-2\">(&lt;F1&gt; for help)</html>";
alignPanel.setToolTipText(alignmentToolTip); alignPanel.setToolTipText(alignmentToolTip);
addMinimumAlignmentComponents(); addMinimumAlignmentComponents();
@ -449,10 +449,10 @@ public class CompEditorPanel extends CompositeEditorPanel {
private void setupDefaultMinAlignButton() { private void setupDefaultMinAlignButton() {
defaultAlignButton.setName("Default Alignment"); defaultAlignButton.setName("Default Alignment");
String alignmentToolTip = "<HTML>Sets this data type to use <B>default</B> alignment.<BR>" + String alignmentToolTip = "<html>Sets this data type to use <B>default</B> alignment.<BR>" +
"If packing is disabled, the default will be 1 byte. If packing<BR>" + "If packing is disabled, the default will be 1 byte. If packing<BR>" +
"is enabled, the alignment is computed based upon the pack<BR>" + "is enabled, the alignment is computed based upon the pack<BR>" +
"setting and the alignment of each component data type.</HTML>"; "setting and the alignment of each component data type.</html>";
defaultAlignButton.addActionListener(e -> { defaultAlignButton.addActionListener(e -> {
((CompEditorModel) model).setAlignmentType(AlignmentType.DEFAULT, -1); ((CompEditorModel) model).setAlignmentType(AlignmentType.DEFAULT, -1);
@ -468,10 +468,10 @@ public class CompEditorPanel extends CompositeEditorPanel {
private void setupMachineMinAlignButton() { private void setupMachineMinAlignButton() {
machineAlignButton.setName("Machine Alignment"); machineAlignButton.setName("Machine Alignment");
String alignmentToolTip = String alignmentToolTip =
"<HTML>Sets this data type to use the <B>machine</B> alignment<BR>" + "<html>Sets this data type to use the <B>machine</B> alignment<BR>" +
"as specified by the compiler specification. If packing is<BR>" + "as specified by the compiler specification. If packing is<BR>" +
"enabled, the computed alignment of this composite should be<BR>" + "enabled, the computed alignment of this composite should be<BR>" +
"the machine alignment value.</HTML>"; "the machine alignment value.</html>";
machineAlignButton.setToolTipText(alignmentToolTip); machineAlignButton.setToolTipText(alignmentToolTip);
machineAlignButton.addActionListener(e -> { machineAlignButton.addActionListener(e -> {
@ -487,9 +487,9 @@ public class CompEditorPanel extends CompositeEditorPanel {
private void setupExplicitAlignButton() { private void setupExplicitAlignButton() {
explicitAlignButton.setName("Explicit Alignment"); explicitAlignButton.setName("Explicit Alignment");
String alignmentToolTip = String alignmentToolTip =
"<HTML>Sets this data type to use the <B>explicit</B> alignment value<BR>" + "<html>Sets this data type to use the <B>explicit</B> alignment value<BR>" +
"specified. If packing is enabled, the computed alignment of<BR>" + "specified. If packing is enabled, the computed alignment of<BR>" +
"this composite may be any multiple of this value.</HTML>"; "this composite may be any multiple of this value.</html>";
explicitAlignButton.setToolTipText(alignmentToolTip); explicitAlignButton.setToolTipText(alignmentToolTip);
explicitAlignButton.addActionListener(e -> { explicitAlignButton.addActionListener(e -> {
@ -555,10 +555,10 @@ public class CompEditorPanel extends CompositeEditorPanel {
private void setupActualAlignment() { private void setupActualAlignment() {
GridBagConstraints gridBagConstraints = new GridBagConstraints(); GridBagConstraints gridBagConstraints = new GridBagConstraints();
String actualAlignmentToolTip = String actualAlignmentToolTip =
"<HTML>The actual alignment to be used for this data type.<BR>" + "<html>The actual alignment to be used for this data type.<BR>" +
"A combination of the pack and alignment settings made to this datatype<BR>" + "A combination of the pack and alignment settings made to this datatype<BR>" +
"combined with alignments of the individual components are used to<BR>" + "combined with alignments of the individual components are used to<BR>" +
"to compute the actual alignment of this datatype.</HTML>"; "to compute the actual alignment of this datatype.</html>";
JPanel actualAlignmentPanel = new JPanel(new BorderLayout()); JPanel actualAlignmentPanel = new JPanel(new BorderLayout());
actualAlignmentLabel = new GDLabel("Alignment:"); actualAlignmentLabel = new GDLabel("Alignment:");
@ -672,10 +672,10 @@ public class CompEditorPanel extends CompositeEditorPanel {
private void setupPackingEnablementButton() { private void setupPackingEnablementButton() {
packingEnablementButton.setName("Packing Enablement"); packingEnablementButton.setName("Packing Enablement");
String packingToolTipText = String packingToolTipText =
"<HTML>Enable packing when details of all components are known (including sizing and" + "<html>Enable packing when details of all components are known (including sizing and" +
" alignment).<BR>" + "Disable packing when Reverse Engineering composite. " + " alignment).<BR>" + "Disable packing when Reverse Engineering composite. " +
"<font color=\"" + Palette.BLUE.toHexString() + "<font color=\"" + Palette.BLUE.toHexString() +
"\" size=\"-2\">(&lt;F1&gt; for help)</font></HTML>"; "\" size=\"-2\">(&lt;F1&gt; for help)</font></html>";
packingEnablementButton.addActionListener(e -> { packingEnablementButton.addActionListener(e -> {
((CompEditorModel) model).setPackingType( ((CompEditorModel) model).setPackingType(
packingEnablementButton.isSelected() ? PackingType.DEFAULT : PackingType.DISABLED, packingEnablementButton.isSelected() ? PackingType.DEFAULT : PackingType.DISABLED,
@ -692,7 +692,7 @@ public class CompEditorPanel extends CompositeEditorPanel {
private void setupDefaultPackingButton() { private void setupDefaultPackingButton() {
defaultPackingButton.setName("Default Packing"); defaultPackingButton.setName("Default Packing");
String packingToolTipText = String packingToolTipText =
"<HTML>Indicates <B>default</B> compiler packing rules should be applied.</HTML>"; "<html>Indicates <B>default</B> compiler packing rules should be applied.</html>";
defaultPackingButton.addActionListener(e -> { defaultPackingButton.addActionListener(e -> {
((CompEditorModel) model).setPackingType(PackingType.DEFAULT, -1); ((CompEditorModel) model).setPackingType(PackingType.DEFAULT, -1);
@ -708,7 +708,7 @@ public class CompEditorPanel extends CompositeEditorPanel {
private void setupExplicitPackingButton() { private void setupExplicitPackingButton() {
explicitPackingButton.setName("Explicit Packing"); explicitPackingButton.setName("Explicit Packing");
String packingToolTipText = String packingToolTipText =
"<HTML>Indicates an explicit pack size should be applied.</HTML>"; "<html>Indicates an explicit pack size should be applied.</html>";
explicitPackingButton.addActionListener(e -> chooseByValuePacking()); explicitPackingButton.addActionListener(e -> chooseByValuePacking());
explicitPackingButton.setToolTipText(packingToolTipText); explicitPackingButton.setToolTipText(packingToolTipText);

4
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/DataTypeCellRenderer.java
View file

@ -94,8 +94,8 @@ public class DataTypeCellRenderer extends GTableCellRenderer {
displayName = HTMLUtilities.friendlyEncodeHTML(displayName); displayName = HTMLUtilities.friendlyEncodeHTML(displayName);
String toolTipText = ToolTipUtils.getToolTipText(dataType); String toolTipText = ToolTipUtils.getToolTipText(dataType);
String headerText = "<HTML><b>" + displayName + "</b><BR>"; String headerText = "<html><b>" + displayName + "</b><BR>";
toolTipText = toolTipText.replace("<HTML>", headerText); toolTipText = toolTipText.replace("<html>", headerText);
return toolTipText; return toolTipText;
} }
} }

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/data/CreateStructureDialog.java
View file

@ -572,7 +572,7 @@ public class CreateStructureDialog extends ReusableDialogComponentProvider {
message = EXISITING_STRUCTURE_STATUS_PREFIX; message = EXISITING_STRUCTURE_STATUS_PREFIX;
} }
setStatusText("<HTML>" + message + "<BR>\"" + HTMLUtilities.escapeHTML(name) + "\""); setStatusText("<html>" + message + "<BR>\"" + HTMLUtilities.escapeHTML(name) + "\"");
} }
// this class is used instead of a cell renderer so that sorting will // this class is used instead of a cell renderer so that sorting will

6
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/DataTypeSynchronizer.java
View file

@ -359,7 +359,7 @@ public class DataTypeSynchronizer {
// aesthetically pleasing // aesthetically pleasing
String spacerString = createHTMLSpacerString(htmlContent, otherContent); String spacerString = createHTMLSpacerString(htmlContent, otherContent);
StringBuilder buffy = new StringBuilder(); StringBuilder buffy = new StringBuilder();
buffy.append("<HTML>"); buffy.append("<html>");
// -we use CELLPADDING here to allow us to create a narrow column within the table // -we use CELLPADDING here to allow us to create a narrow column within the table
// -the CELLSPACING gives us some space around the narrow column // -the CELLSPACING gives us some space around the narrow column
@ -412,8 +412,8 @@ public class DataTypeSynchronizer {
private static String createHTMLSpacerString(String htmlContent, String otherHTMLContent) { private static String createHTMLSpacerString(String htmlContent, String otherHTMLContent) {
// unfortunately, to get the displayed widths, we have to have rendered content, which // unfortunately, to get the displayed widths, we have to have rendered content, which
// is what the JLabels below are doing for us // is what the JLabels below are doing for us
JLabel label1 = new GDHtmlLabel("<HTML>" + htmlContent); JLabel label1 = new GDHtmlLabel("<html>" + htmlContent);
JLabel label2 = new GDHtmlLabel("<HTML>" + otherHTMLContent); JLabel label2 = new GDHtmlLabel("<html>" + otherHTMLContent);
int maxPixelWidth = int maxPixelWidth =
Math.max(label1.getPreferredSize().width, label2.getPreferredSize().width); Math.max(label1.getPreferredSize().width, label2.getPreferredSize().width);

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/DisassembledViewPlugin.java
View file

@ -336,7 +336,7 @@ public class DisassembledViewPlugin extends ProgramPlugin implements DomainObjec
* the help key triggers (Ctrl-F1) did not work correctly. * the help key triggers (Ctrl-F1) did not work correctly.
*/ */
private static final String TOOLTIP_TEXT_PREPEND = private static final String TOOLTIP_TEXT_PREPEND =
"<HTML>Currently selected<br> Code Browser program location<br>" + "address: "; "<html>Currently selected<br> Code Browser program location<br>address: ";
/** /**
* The component that will house our view. * The component that will house our view.

4
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/editor/FunctionEditorDialog.java
View file

@ -656,9 +656,9 @@ public class FunctionEditorDialog extends DialogComponentProvider implements Mod
color = getErrorForegroundColor(isSelected); color = getErrorForegroundColor(isSelected);
} }
String toolTipText = ToolTipUtils.getToolTipText(dataType); String toolTipText = ToolTipUtils.getToolTipText(dataType);
String headerText = "<HTML><b>" + String headerText = "<html><b>" +
HTMLUtilities.friendlyEncodeHTML(dataType.getPathName()) + "</b><BR>"; HTMLUtilities.friendlyEncodeHTML(dataType.getPathName()) + "</b><BR>";
toolTipText = toolTipText.replace("<HTML>", headerText); toolTipText = toolTipText.replace("<html>", headerText);
setToolTipText(toolTipText); setToolTipText(toolTipText);
} }
else { else {

292
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/help/ProcessorListPlugin.java Normal file
View file

@ -0,0 +1,292 @@
/* ###
* IP: GHIDRA
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package ghidra.app.plugin.core.help;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.Transferable;
import java.util.*;
import javax.swing.*;
import docking.ActionContext;
import docking.ReusableDialogComponentProvider;
import docking.action.DockingAction;
import docking.action.MenuData;
import docking.dnd.GClipboard;
import docking.dnd.StringTransferable;
import docking.tool.ToolConstants;
import docking.widgets.table.AbstractSortedTableModel;
import docking.widgets.table.GTable;
import ghidra.app.CorePluginPackage;
import ghidra.app.plugin.PluginCategoryNames;
import ghidra.app.util.HelpTopics;
import ghidra.framework.main.ApplicationLevelPlugin;
import ghidra.framework.plugintool.*;
import ghidra.framework.plugintool.util.PluginStatus;
import ghidra.program.model.lang.*;
import ghidra.program.util.DefaultLanguageService;
import ghidra.util.HelpLocation;
import ghidra.util.SystemUtilities;
//@formatter:off
@PluginInfo(
status = PluginStatus.RELEASED,
packageName = CorePluginPackage.NAME,
category = PluginCategoryNames.COMMON,
shortDescription = "Displays list of installed processor modules",
description = "This plugin provides a Help action that displays a list of installed processor modules"
)
//@formatter:on
public class ProcessorListPlugin extends Plugin implements ApplicationLevelPlugin {
private DockingAction processorListAction;
private ProcessorListDialogProvider dialogProvider;
public ProcessorListPlugin(PluginTool tool) {
super(tool);
}
@Override
protected void init() {
setupActions();
}
@Override
public void dispose() {
tool.removeAction(processorListAction);
processorListAction.dispose();
if (dialogProvider != null) {
dialogProvider.dispose();
}
super.dispose();
}
private void setupActions() {
processorListAction = new DockingAction("Installed Processors", this.getName()) {
@Override
public void actionPerformed(ActionContext context) {
showProcessorList();
}
};
processorListAction.setEnabled(true);
processorListAction.setMenuBarData(new MenuData(
new String[] { ToolConstants.MENU_HELP, processorListAction.getName() }, null, "AAAZ"));
processorListAction.setHelpLocation(new HelpLocation(HelpTopics.ABOUT, "ProcessorList"));
processorListAction.setDescription(getPluginDescription().getDescription());
tool.addAction(processorListAction);
}
private void dialogClosed() {
dialogProvider = null;
}
private void showProcessorList() {
if (dialogProvider == null) {
dialogProvider = new ProcessorListDialogProvider();
}
tool.showDialog(dialogProvider);
}
private void copy(boolean asHtml) {
Clipboard systemClipboard = GClipboard.getSystemClipboard();
Transferable transferable = new StringTransferable(getProcessorList(asHtml));
systemClipboard.setContents(transferable, null);
}
private Set<Processor> getProcessors() {
TreeSet<Processor> processors = new TreeSet<>();
LanguageService languageService = DefaultLanguageService.getLanguageService();
for (LanguageDescription languageDescription : languageService.getLanguageDescriptions(
true)) {
processors.add(languageDescription.getProcessor());
}
return processors;
}
private String getProcessorList(boolean asHtml) {
StringBuilder strBuilder = new StringBuilder();
if (asHtml) {
strBuilder.append("<html><BODY>\n");
strBuilder.append("<table width=\"100%\" cellpadding=\"0\" cellspacing=\"0\">\n<tr>");
}
Set<Processor> processors = getProcessors();
int itemsPerColum = (processors.size() + 2) / 3;
int colCnt = 0;
for (Processor processor : processors) {
if (asHtml) {
if ((colCnt % itemsPerColum) == 0) {
if (colCnt != 0) {
strBuilder.append("</ul>\n</td>");
}
strBuilder.append("<td width=\"33%\">\n<ul>");
}
strBuilder.append("<li>");
}
++colCnt;
strBuilder.append(processor.toString());
if (asHtml) {
strBuilder.append("</li>");
}
strBuilder.append("\n");
}
if (asHtml) {
strBuilder.append("</ul>\n</td></tr>\n</table>");
strBuilder.append("</BODY></html>");
}
return strBuilder.toString();
}
private class ProcessorListDialogProvider extends ReusableDialogComponentProvider {
ProcessorListDialogProvider() {
super("Installed Processor Modules", false, false, true, false);
ProcessorListTableProvider tableProvider =
new ProcessorListTableProvider(tool, getName());
setRememberLocation(true);
addWorkPanel(tableProvider.getComponent());
setHelpLocation(new HelpLocation(HelpTopics.ABOUT, "ProcessorList"));
if (SystemUtilities.isInDevelopmentMode()) {
JButton copyButton = new JButton("Copy");
copyButton.addActionListener(e -> copy(false));
addButton(copyButton);
JButton copyHtmlButton = new JButton("Copy as HTML");
copyHtmlButton.addActionListener(e -> copy(true));
addButton(copyHtmlButton);
}
JButton closeButton = new JButton("Close");
closeButton.addActionListener(e -> close());
addButton(closeButton);
}
@Override
protected void dialogClosed() {
super.dialogClosed();
ProcessorListPlugin.this.dialogClosed();
}
}
public class ProcessorListTableProvider extends ComponentProviderAdapter {
GTable table;
private ProcessorListTableModel processorTableModel;
private JScrollPane scrollPane;
public ProcessorListTableProvider(PluginTool tool, String owner) {
super(tool, "Processor Table", owner);
buildTable();
}
@Override
public JComponent getComponent() {
return scrollPane;
}
private void buildTable() {
TreeSet<Processor> processors = new TreeSet<>();
LanguageService languageService = DefaultLanguageService.getLanguageService();
for (LanguageDescription languageDescription : languageService.getLanguageDescriptions(
true)) {
processors.add(languageDescription.getProcessor());
}
processorTableModel = new ProcessorListTableModel(new ArrayList<>(processors));
table = new GTable(processorTableModel);
scrollPane = new JScrollPane(table);
table.getSelectionManager().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
}
}
public class ProcessorListTableModel extends AbstractSortedTableModel<Processor> {
private static final int PROCESSOR_COL = 0;
private List<Processor> processors;
public ProcessorListTableModel(List<Processor> processors) {
this.processors = processors;
}
@Override
public Object getColumnValueForRow(Processor p, int columnIndex) {
switch (columnIndex) {
case PROCESSOR_COL:
return p.toString();
}
return null;
}
@Override
public String getName() {
return "Processors";
}
@Override
public List<Processor> getModelData() {
return processors;
}
@Override
public boolean isSortable(int columnIndex) {
return false; // maybe later when we add more columns
}
@Override
public int getColumnCount() {
return 1;
}
@Override
public int getRowCount() {
return processors.size();
}
@Override
public String getColumnName(int column) {
switch (column) {
case PROCESSOR_COL:
return "Processor";
}
return null;
}
@Override
public Class<?> getColumnClass(int columnIndex) {
switch (columnIndex) {
case PROCESSOR_COL:
return String.class;
}
return Object.class;
}
}
}

6
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptComponentProvider.java
View file

@ -93,12 +93,12 @@ public class GhidraScriptComponentProvider extends ComponentProviderAdapter {
private TaskListener cleanupTaskSetListener = new TaskListener() { private TaskListener cleanupTaskSetListener = new TaskListener() {
@Override @Override
public void taskCompleted(Task task) { public void taskCompleted(Task task) {
runningScriptTaskSet.remove((RunScriptTask) task); runningScriptTaskSet.remove(task);
} }
@Override @Override
public void taskCancelled(Task task) { public void taskCancelled(Task task) {
runningScriptTaskSet.remove((RunScriptTask) task); runningScriptTaskSet.remove(task);
} }
}; };
@ -1012,7 +1012,7 @@ public class GhidraScriptComponentProvider extends ComponentProviderAdapter {
return list; return list;
} }
}); });
tableFilterPanel.setToolTipText("<HTML>Include scripts with <b>Names</b> or " + tableFilterPanel.setToolTipText("<html>Include scripts with <b>Names</b> or " +
"<b>Descriptions</b> containing this text."); "<b>Descriptions</b> containing this text.");
tableFilterPanel.setFocusComponent(scriptCategoryTree); tableFilterPanel.setFocusComponent(scriptCategoryTree);
} }

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/ScriptSelectionEditor.java
View file

@ -265,7 +265,7 @@ public class ScriptSelectionEditor {
@Override @Override
public String getString(ScriptInfo info) { public String getString(ScriptInfo info) {
StringBuilder buffy = new StringBuilder("<HTML><P>"); StringBuilder buffy = new StringBuilder("<html><P>");
KeyStroke keyBinding = info.getKeyBinding(); KeyStroke keyBinding = info.getKeyBinding();
if (keyBinding != null) { if (keyBinding != null) {

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/ProgramTextWriter.java
View file

@ -81,7 +81,7 @@ class ProgramTextWriter {
//boolean sk = false; //boolean sk = false;
if (options.isHTML()) { if (options.isHTML()) {
writer.print("<HTML><BODY BGCOLOR=#ffffe0>"); writer.print("<html><BODY BGCOLOR=#ffffe0>");
writer.println("<FONT FACE=COURIER SIZE=3><STRONG><PRE>"); writer.println("<FONT FACE=COURIER SIZE=3><STRONG><PRE>");
} }
TemplateSimplifier simplifier = new TemplateSimplifier(); TemplateSimplifier simplifier = new TemplateSimplifier();
@ -339,7 +339,7 @@ class ProgramTextWriter {
} }
if (options.isHTML()) { if (options.isHTML()) {
writer.println("</PRE></STRONG></FONT></BODY></HTML>"); writer.println("</PRE></STRONG></FONT></BODY></html>");
} }
writer.close(); writer.close();

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/HeadlessAnalyzer.java
View file

@ -185,8 +185,10 @@ public class HeadlessAnalyzer {
layout = new GhidraApplicationLayout(); layout = new GhidraApplicationLayout();
} }
catch (IOException e) { catch (IOException e) {
Msg.debug(HeadlessAnalyzer.class,
"Unable to load the standard Ghidra application layout. " + e.getMessage() +
". Attempting to load the Ghidra Jar application layout.");
layout = new GhidraJarApplicationLayout(); layout = new GhidraJarApplicationLayout();
} }
return layout; return layout;
} }

11
Ghidra/Features/Base/src/main/java/ghidra/app/util/html/HTMLDataTypeRepresentation.java
View file

@ -40,9 +40,10 @@ public abstract class HTMLDataTypeRepresentation {
protected final static int MAX_CHARACTER_LENGTH = 80; protected final static int MAX_CHARACTER_LENGTH = 80;
protected final static int MAX_LINE_LENGTH = MAX_CHARACTER_LENGTH * 3; protected final static int MAX_LINE_LENGTH = MAX_CHARACTER_LENGTH * 3;
// HTML Tag constants // HTML Tag constants. Intentionally lower-case to match external checks for isHtml(), some of
protected static final String HTML_OPEN = "<HTML>"; // which check case-sensitive for "<html>"
protected static final String HTML_CLOSE = "</HTML>"; protected static final String HTML_OPEN = "<html>";
protected static final String HTML_CLOSE = "</html>";
// single HTML space // single HTML space
protected static final String HTML_SPACE = "&nbsp;"; protected static final String HTML_SPACE = "&nbsp;";
@ -300,11 +301,11 @@ public abstract class HTMLDataTypeRepresentation {
*/ */
protected HTMLDataTypeRepresentation(String htmlText) { protected HTMLDataTypeRepresentation(String htmlText) {
this.originalHTMLData = htmlText.trim(); this.originalHTMLData = htmlText.trim();
// NOTE: the text expected here should not have <HTML></HTML> tags! // NOTE: the text expected here should not have <html></html> tags!
boolean htmlStart = StringUtilities.startsWithIgnoreCase(htmlText, HTML_OPEN); boolean htmlStart = StringUtilities.startsWithIgnoreCase(htmlText, HTML_OPEN);
boolean htmlEnd = StringUtilities.startsWithIgnoreCase(htmlText, HTML_CLOSE); boolean htmlEnd = StringUtilities.startsWithIgnoreCase(htmlText, HTML_CLOSE);
if (htmlStart || htmlEnd) { if (htmlStart || htmlEnd) {
throw new AssertException("Invalid HTML format: text must not include HTML tag"); throw new AssertException("Invalid HTML format: text must not include <html> tag");
} }
} }

6
Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/EolExtraCommentsPropertyEditor.java
View file

@ -37,7 +37,7 @@ public class EolExtraCommentsPropertyEditor extends PropertyEditorSupport
private static final String ABBREVIATED_LABEL = "Use Abbreviated Comments"; private static final String ABBREVIATED_LABEL = "Use Abbreviated Comments";
private static final String REPEATABLE_TOOLTIP = private static final String REPEATABLE_TOOLTIP =
"<HTML>For repeatable comments:" + "<html>For repeatable comments:" +
"<UL>" + "<UL>" +
" <LI>ALWAYS - show even if an EOL comment exists</LI>" + " <LI>ALWAYS - show even if an EOL comment exists</LI>" +
" <LI>DEFAULT - show only when no EOL comment exists</LI>" + " <LI>DEFAULT - show only when no EOL comment exists</LI>" +
@ -45,7 +45,7 @@ public class EolExtraCommentsPropertyEditor extends PropertyEditorSupport
"</UL>"; "</UL>";
private static final String REF_REPEATABLE_TOOLTIP = private static final String REF_REPEATABLE_TOOLTIP =
"<HTML>For referenced repeatable comments:" + "<html>For referenced repeatable comments:" +
"<UL>" + "<UL>" +
" <LI>ALWAYS - show even if a higher priority comment exists</LI>" + " <LI>ALWAYS - show even if a higher priority comment exists</LI>" +
" <LI>DEFAULT - show only when no higher priority comment exists</LI>" + " <LI>DEFAULT - show only when no higher priority comment exists</LI>" +
@ -53,7 +53,7 @@ public class EolExtraCommentsPropertyEditor extends PropertyEditorSupport
"</UL>"; "</UL>";
private static final String AUTO_TOOLTIP = private static final String AUTO_TOOLTIP =
"<HTML>For automatic comments:" + "<html>For automatic comments:" +
"<UL>" + "<UL>" +
" <LI>ALWAYS - show even if a higher priority comment exists</LI>" + " <LI>ALWAYS - show even if a higher priority comment exists</LI>" +
" <LI>DEFAULT - show only when no higher priority comment exists</LI>" + " <LI>DEFAULT - show only when no higher priority comment exists</LI>" +

6
Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ListingFieldDescriptionProvider.java
View file

@ -18,6 +18,7 @@ package ghidra.app.util.viewer.field;
import docking.widgets.fieldpanel.FieldDescriptionProvider; import docking.widgets.fieldpanel.FieldDescriptionProvider;
import docking.widgets.fieldpanel.field.Field; import docking.widgets.fieldpanel.field.Field;
import docking.widgets.fieldpanel.support.FieldLocation; import docking.widgets.fieldpanel.support.FieldLocation;
import ghidra.program.model.address.Address;
import ghidra.program.util.ProgramLocation; import ghidra.program.util.ProgramLocation;
public class ListingFieldDescriptionProvider implements FieldDescriptionProvider { public class ListingFieldDescriptionProvider implements FieldDescriptionProvider {
@ -27,8 +28,9 @@ public class ListingFieldDescriptionProvider implements FieldDescriptionProvider
if (field instanceof ListingField listingField) { if (field instanceof ListingField listingField) {
FieldFactory fieldFactory = listingField.getFieldFactory(); FieldFactory fieldFactory = listingField.getFieldFactory();
ProgramLocation location = fieldFactory.getProgramLocation(0, 0, listingField); ProgramLocation location = fieldFactory.getProgramLocation(0, 0, listingField);
return fieldFactory.getFieldName() + " Field at Address " + location.getAddress() + Address address = location.getAddress();
" text = " + field.getText(); String addressString = address.toString(address.getAddressSpace().showSpaceName(), 1);
return fieldFactory.getFieldName() + " Field at Address " + addressString;
} }
return "Unknown Field"; return "Unknown Field";
} }

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingCodeComparisonPanel.java
View file

@ -522,7 +522,7 @@ public class ListingCodeComparisonPanel
class ToggleOrientationAction extends ToggleDockingAction { class ToggleOrientationAction extends ToggleDockingAction {
ToggleOrientationAction() { ToggleOrientationAction() {
super("Dual Listing Toggle Orientation", owner); super("Dual Listing Toggle Orientation", owner);
setDescription("<HTML>Toggle the layout of the listings " + setDescription("<html>Toggle the layout of the listings " +
"<BR>between side-by-side and one above the other.</HTML>"); "<BR>between side-by-side and one above the other.</HTML>");
setEnabled(true); setEnabled(true);
setSelected(isSideBySide); setSelected(isSideBySide);
@ -1871,7 +1871,7 @@ public class ListingCodeComparisonPanel
if (!titlePrefix.isEmpty()) { if (!titlePrefix.isEmpty()) {
titlePrefix += " "; // Add a space between prefix and title. titlePrefix += " "; // Add a space between prefix and title.
} }
String htmlPrefix = "<HTML>"; String htmlPrefix = "<html>";
if (title.startsWith(htmlPrefix)) { if (title.startsWith(htmlPrefix)) {
titlePanel.setTitleName(htmlPrefix + HTMLUtilities.friendlyEncodeHTML(titlePrefix) + titlePanel.setTitleName(htmlPrefix + HTMLUtilities.friendlyEncodeHTML(titlePrefix) +
title.substring(htmlPrefix.length())); title.substring(htmlPrefix.length()));

2
Ghidra/Features/Base/src/main/java/ghidra/framework/main/InfoPanel.java
View file

@ -193,7 +193,7 @@ class InfoPanel extends JPanel {
private HyperlinkComponent buildJavaVersionComponent() { private HyperlinkComponent buildJavaVersionComponent() {
String anchorName = "java_version"; String anchorName = "java_version";
final HyperlinkComponent javaVersionComponent = final HyperlinkComponent javaVersionComponent =
new HyperlinkComponent("<HTML><CENTER>Java Version " + "<A HREF=\"" + anchorName + new HyperlinkComponent("<html><CENTER>Java Version " + "<A HREF=\"" + anchorName +
"\">" + System.getProperty("java.version") + "</A></CENTER>"); "\">" + System.getProperty("java.version") + "</A></CENTER>");
javaVersionComponent.addHyperlinkListener(anchorName, e -> { javaVersionComponent.addHyperlinkListener(anchorName, e -> {
if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED) { if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED) {

2
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/ClearTest.java
View file

@ -52,7 +52,7 @@ import ghidra.test.TestEnv;
public class ClearTest extends AbstractGhidraHeadedIntegrationTest { public class ClearTest extends AbstractGhidraHeadedIntegrationTest {
private static final String COMMENTS_CHECK_BOX_TEXT = private static final String COMMENTS_CHECK_BOX_TEXT =
"<HTML>Comments <FONT SIZE=\"2\">(does not affect automatic comments)</FONT>"; "<html>Comments <FONT SIZE=\"2\">(does not affect automatic comments)</FONT>";
private TestEnv env; private TestEnv env;
private PluginTool tool; private PluginTool tool;

2
Ghidra/Features/Base/src/test/java/ghidra/app/util/html/HTMLDataTypeRepresentationTest.java
View file

@ -362,7 +362,7 @@ public class HTMLDataTypeRepresentationTest extends AbstractGenericTest {
private String getParamText(String html) { private String getParamText(String html) {
// function html format: // function html format:
// <HTML>void&nbsp;myFunction(<BR>&nbsp;&nbsp;&nbsp;&nbsp;byte&nbsp;)<BR></HTML> // <html>void&nbsp;myFunction(<BR>&nbsp;&nbsp;&nbsp;&nbsp;byte&nbsp;)<BR></HTML>
Pattern p = Pattern.compile("\\((.*)\\)"); Pattern p = Pattern.compile("\\((.*)\\)");
Matcher matcher = p.matcher(html); Matcher matcher = p.matcher(html);

15
Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerComponent.java
View file

@ -102,13 +102,22 @@ public class ByteViewerComponent extends FieldPanel implements FieldMouseListene
ByteBlockInfo info = indexMap.getBlockInfo(fieldLoc.getIndex(), fieldLoc.getFieldNum()); ByteBlockInfo info = indexMap.getBlockInfo(fieldLoc.getIndex(), fieldLoc.getFieldNum());
if (info != null) { if (info != null) {
String modelName = model.getName(); String modelName = model.getName();
return modelName + " format at " + String location = getAccessibleLocationInfo(info.getBlock(), info.getOffset());
info.getBlock().getLocationRepresentation(info.getOffset()) + ", value = " + return modelName + " format at " + location;
field.getText();
} }
return null; return null;
} }
private String getAccessibleLocationInfo(ByteBlock block, BigInteger offset) {
if (block instanceof MemoryByteBlock memBlock) {
// location represents an address, remove leading zeros to make screen reading concise
Address address = memBlock.getAddress(offset);
return address.toString(address.getAddressSpace().showSpaceName(), 1);
}
// otherwise use generic location representation
return block.getLocationRepresentation(offset);
}
@Override @Override
public void buttonPressed(FieldLocation fieldLocation, Field field, MouseEvent mouseEvent) { public void buttonPressed(FieldLocation fieldLocation, Field field, MouseEvent mouseEvent) {
if (fieldLocation == null || field == null) { if (fieldLocation == null || field == null) {

8
Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerCodeComparisonPanel.java
View file

@ -26,7 +26,6 @@ import docking.ComponentProvider;
import docking.action.*; import docking.action.*;
import docking.options.OptionsService; import docking.options.OptionsService;
import docking.widgets.fieldpanel.FieldPanel; import docking.widgets.fieldpanel.FieldPanel;
import docking.widgets.fieldpanel.internal.FieldPanelCoordinator;
import docking.widgets.fieldpanel.support.FieldLocation; import docking.widgets.fieldpanel.support.FieldLocation;
import docking.widgets.label.GDHtmlLabel; import docking.widgets.label.GDHtmlLabel;
import ghidra.GhidraOptions; import ghidra.GhidraOptions;
@ -40,7 +39,8 @@ import ghidra.program.model.address.AddressSetView;
import ghidra.program.model.listing.*; import ghidra.program.model.listing.*;
import ghidra.program.util.FunctionUtility; import ghidra.program.util.FunctionUtility;
import ghidra.program.util.ProgramLocation; import ghidra.program.util.ProgramLocation;
import ghidra.util.*; import ghidra.util.HTMLUtilities;
import ghidra.util.HelpLocation;
/** /**
* Panel that displays two decompilers for comparison * Panel that displays two decompilers for comparison
@ -133,7 +133,7 @@ public abstract class DecompilerCodeComparisonPanel<T extends DualDecompilerFiel
if (!titlePrefix.isEmpty()) { if (!titlePrefix.isEmpty()) {
titlePrefix += " "; // Add a space between prefix and title. titlePrefix += " "; // Add a space between prefix and title.
} }
String htmlPrefix = "<HTML>"; String htmlPrefix = "<html>";
if (title.startsWith(htmlPrefix)) { if (title.startsWith(htmlPrefix)) {
titlePanel.setTitleName(htmlPrefix + HTMLUtilities.friendlyEncodeHTML(titlePrefix) + titlePanel.setTitleName(htmlPrefix + HTMLUtilities.friendlyEncodeHTML(titlePrefix) +
title.substring(htmlPrefix.length())); title.substring(htmlPrefix.length()));
@ -780,7 +780,7 @@ public abstract class DecompilerCodeComparisonPanel<T extends DualDecompilerFiel
ToggleOrientationAction() { ToggleOrientationAction() {
super("Dual Decompiler Toggle Orientation", "FunctionComparison"); super("Dual Decompiler Toggle Orientation", "FunctionComparison");
setDescription("<HTML>Toggle the layout of the decompiler " + setDescription("<html>Toggle the layout of the decompiler " +
"<BR>between side-by-side and one above the other."); "<BR>between side-by-side and one above the other.");
setEnabled(true); setEnabled(true);
setSelected(isSideBySide); setSelected(isSideBySide);

7
Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerPanel.java
View file

@ -16,9 +16,7 @@
package ghidra.app.decompiler.component; package ghidra.app.decompiler.component;
import java.awt.*; import java.awt.*;
import java.awt.event.ComponentAdapter; import java.awt.event.*;
import java.awt.event.ComponentEvent;
import java.awt.event.MouseEvent;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.*; import java.util.*;
import java.util.List; import java.util.List;
@ -45,7 +43,6 @@ import ghidra.app.decompiler.component.hover.DecompilerHoverService;
import ghidra.app.decompiler.component.margin.*; import ghidra.app.decompiler.component.margin.*;
import ghidra.app.plugin.core.decompile.DecompilerClipboardProvider; import ghidra.app.plugin.core.decompile.DecompilerClipboardProvider;
import ghidra.app.plugin.core.decompile.actions.FieldBasedSearchLocation; import ghidra.app.plugin.core.decompile.actions.FieldBasedSearchLocation;
import ghidra.app.util.viewer.listingpanel.MarginProvider;
import ghidra.app.util.viewer.util.ScrollpaneAlignedHorizontalLayout; import ghidra.app.util.viewer.util.ScrollpaneAlignedHorizontalLayout;
import ghidra.program.model.address.*; import ghidra.program.model.address.*;
import ghidra.program.model.listing.Function; import ghidra.program.model.listing.Function;
@ -1317,7 +1314,7 @@ public class DecompilerPanel extends JPanel implements FieldMouseListener, Field
if (f == null) { if (f == null) {
return null; return null;
} }
return "line " + (l.getIndex().intValue() + 1) + ", " + f.getText(); return "line " + (l.getIndex().intValue() + 1);
}); });
} }

9
Ghidra/Features/GraphFunctionCalls/src/main/java/functioncalls/plugin/FcgProvider.java
View file

@ -52,7 +52,8 @@ import ghidra.graph.viewer.vertex.VertexClickListener;
import ghidra.program.model.address.Address; import ghidra.program.model.address.Address;
import ghidra.program.model.listing.*; import ghidra.program.model.listing.*;
import ghidra.program.util.ProgramLocation; import ghidra.program.util.ProgramLocation;
import ghidra.util.*; import ghidra.util.HelpLocation;
import ghidra.util.SystemUtilities;
import ghidra.util.exception.CancelledException; import ghidra.util.exception.CancelledException;
import ghidra.util.task.TaskMonitor; import ghidra.util.task.TaskMonitor;
import resources.Icons; import resources.Icons;
@ -425,10 +426,10 @@ public class FcgProvider
navigateIncomingToggleAction.setSelected(true); navigateIncomingToggleAction.setSelected(true);
navigateIncomingToggleAction.setToolBarData( navigateIncomingToggleAction.setToolBarData(
new ToolBarData(Icons.NAVIGATE_ON_INCOMING_EVENT_ICON, TOOLBAR_GROUP_A)); new ToolBarData(Icons.NAVIGATE_ON_INCOMING_EVENT_ICON, TOOLBAR_GROUP_A));
navigateIncomingToggleAction.setDescription(HTMLUtilities.toHTML( navigateIncomingToggleAction.setDescription(
"Incoming Navigation<br><br>Toggle <b>On</b> - change the graphed " + "<html>Incoming Navigation<br><br>Toggle <b>On</b> - change the graphed " +
"function on Listing navigation events" + "function on Listing navigation events" +
"<br>Toggled <b>Off</b> - don't change the graph on Listing navigation events")); "<br>Toggled <b>Off</b> - don't change the graph on Listing navigation events");
navigateIncomingToggleAction.setHelpLocation( navigateIncomingToggleAction.setHelpLocation(
new HelpLocation(plugin.getName(), "Navigation_Incoming")); new HelpLocation(plugin.getName(), "Navigation_Incoming"));
addLocalAction(navigateIncomingToggleAction); addLocalAction(navigateIncomingToggleAction);

2
Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/AttributedToolTipInfo.java
View file

@ -79,7 +79,7 @@ public class AttributedToolTipInfo extends ToolTipInfo<Attributed> {
} }
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
buf.append("<HTML>"); buf.append("<html>");
if (graphObject instanceof AttributedVertex) { if (graphObject instanceof AttributedVertex) {
addToolTipTextForVertex(buf, (AttributedVertex) graphObject); addToolTipTextForVertex(buf, (AttributedVertex) graphObject);

2
Ghidra/Features/ProgramDiff/src/main/java/ghidra/app/plugin/core/diff/DiffApplySettingsProvider.java
View file

@ -262,7 +262,7 @@ public class DiffApplySettingsProvider extends ComponentProviderAdapter {
createChoices(); createChoices();
VariableHeightPanel panel = new VariableHeightPanel(false, 10, 3); VariableHeightPanel panel = new VariableHeightPanel(false, 10, 3);
panel.setToolTipText("<HTML>" + panel.setToolTipText("<html>" +
"For each difference type, select whether to ignore, replace, or merge." + "For each difference type, select whether to ignore, replace, or merge." +
"<BR>&nbsp&nbsp<B>Ignore</B> - don't apply this type of difference." + "<BR>&nbsp&nbsp<B>Ignore</B> - don't apply this type of difference." +
"<BR>&nbsp&nbsp<B>Replace</B> - replace the difference type with the one from program 2." + "<BR>&nbsp&nbsp<B>Replace</B> - replace the difference type with the one from program 2." +

76
Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/matchtable/ApplyMarkupPropertyEditor.java
View file

@ -51,68 +51,68 @@ public class ApplyMarkupPropertyEditor implements OptionsEditor {
// help tooltips // help tooltips
private static final String DATA_MATCH_DATA_TYPE_TOOLTIP = private static final String DATA_MATCH_DATA_TYPE_TOOLTIP =
"<HTML>The apply action for the <b>data type on a data match</b> when performing bulk apply operations</HTML>"; "<html>The apply action for the <b>data type on a data match</b> when performing bulk apply operations</html>";
private static final String LABELS_TOOLTIP = private static final String LABELS_TOOLTIP =
"<HTML>The apply action for <b>labels</b> when performing bulk apply operations</HTML>"; "<html>The apply action for <b>labels</b> when performing bulk apply operations</html>";
private static final String FUNCTION_NAME_TOOLTIP = private static final String FUNCTION_NAME_TOOLTIP =
"<HTML>The apply action for <b>function name</b> when performing bulk apply operations</HTML>"; "<html>The apply action for <b>function name</b> when performing bulk apply operations</html>";
private static final String FUNCTION_SIGNATURE_TOOLTIP = private static final String FUNCTION_SIGNATURE_TOOLTIP =
"<HTML>The apply action for the <b>function signature</b> " + "<html>The apply action for the <b>function signature</b> " +
"when performing bulk apply operations</HTML>"; "when performing bulk apply operations</html>";
private static final String PLATE_COMMENT_TOOLTIP = private static final String PLATE_COMMENT_TOOLTIP =
"<HTML>The apply action for <b>plate comments</b> when performing bulk apply operations</HTML>"; "<html>The apply action for <b>plate comments</b> when performing bulk apply operations</html>";
private static final String PRE_COMMENT_TOOLTIP = private static final String PRE_COMMENT_TOOLTIP =
"<HTML>The apply action for <b>pre comments</b> when performing bulk apply operations</HTML>"; "<html>The apply action for <b>pre comments</b> when performing bulk apply operations</html>";
private static final String END_OF_LINE_COMMENT_TOOLTIP = private static final String END_OF_LINE_COMMENT_TOOLTIP =
"<HTML>The apply action for <b>end of line comments</b> when performing bulk apply operations</HTML>"; "<html>The apply action for <b>end of line comments</b> when performing bulk apply operations</html>";
private static final String REPEATABLE_COMMENT_TOOLTIP = private static final String REPEATABLE_COMMENT_TOOLTIP =
"<HTML>The apply action for <b>repeatable comments</b> when performing bulk apply operations</HTML>"; "<html>The apply action for <b>repeatable comments</b> when performing bulk apply operations</html>";
private static final String POST_COMMENT_TOOLTIP = private static final String POST_COMMENT_TOOLTIP =
"<HTML>The apply action for <b>post comments</b> when performing bulk apply operations</HTML>"; "<html>The apply action for <b>post comments</b> when performing bulk apply operations</html>";
private static final String FUNCTION_RETURN_TYPE_TOOLTIP = private static final String FUNCTION_RETURN_TYPE_TOOLTIP =
"<HTML>The apply action for <b>function return type</b> when the function signature is applied</HTML>"; "<html>The apply action for <b>function return type</b> when the function signature is applied</html>";
private static final String INLINE_TOOLTIP = private static final String INLINE_TOOLTIP =
"<HTML>The apply action to use for the <b>function inline flag</b> " + "<html>The apply action to use for the <b>function inline flag</b> " +
"when applying the function signature</HTML>"; "when applying the function signature</html>";
private static final String NO_RETURN_TOOLTIP = private static final String NO_RETURN_TOOLTIP =
"<HTML>The apply action to use for the <b>function no return flag</b> " + "<html>The apply action to use for the <b>function no return flag</b> " +
"when applying the function signature</HTML>"; "when applying the function signature</html>";
private static final String CALLING_CONVENTION_TOOLTIP = private static final String CALLING_CONVENTION_TOOLTIP =
"<HTML>The apply action to use for the <b>function calling convention</b> " + "<html>The apply action to use for the <b>function calling convention</b> " +
"when applying the function signature</HTML>"; "when applying the function signature</html>";
private static final String CALL_FIXUP_TOOLTIP = private static final String CALL_FIXUP_TOOLTIP =
"<HTML>The apply action for <b>whether or not to apply call fixup</b> " + "<html>The apply action for <b>whether or not to apply call fixup</b> " +
"when applying the function signature</HTML>"; "when applying the function signature</html>";
private static final String VAR_ARGS_TOOLTIP = private static final String VAR_ARGS_TOOLTIP =
"<HTML>The apply action to use for the <b>var args flag</b> " + "<html>The apply action to use for the <b>var args flag</b> " +
"when applying the function signature</HTML>"; "when applying the function signature</html>";
private static final String PARAMETER_DATA_TYPES_TOOLTIP = private static final String PARAMETER_DATA_TYPES_TOOLTIP =
"<HTML>The apply action for <b>function parameter data types</b> when applying the function signature</HTML>"; "<html>The apply action for <b>function parameter data types</b> when applying the function signature</html>";
private static final String PARAMETER_NAMES_TOOLTIP = private static final String PARAMETER_NAMES_TOOLTIP =
"<HTML>The apply action for <b>function parameter names</b> when applying the function signature</HTML>"; "<html>The apply action for <b>function parameter names</b> when applying the function signature</html>";
private static final String PARAMETER_NAME_PRIORITY_TOOTIP = private static final String PARAMETER_NAME_PRIORITY_TOOTIP =
"<HTML>Choose whether a parameter name with a User source type or Import source type is highest " + "<html>Choose whether a parameter name with a User source type or Import source type is highest " +
"priority when determining whether to replace the name or not when using the priority.</HTML>"; "priority when determining whether to replace the name or not when using the priority.</html>";
private static final String HIGHEST_NAME_PRIORITY_TOOLTIP = private static final String HIGHEST_NAME_PRIORITY_TOOLTIP =
"<HTML>The apply action for <b>which source type is the highest priority</b> " + "<html>The apply action for <b>which source type is the highest priority</b> " +
"when applying parameter names using a priority replace</HTML>"; "when applying parameter names using a priority replace</html>";
private static final String USER_PRIORITY_TOOLTIP = private static final String USER_PRIORITY_TOOLTIP =
"<HTML>Parameter Name Source Type Priority <br>from highest to lowest:<br>" + "<html>Parameter Name Source Type Priority <br>from highest to lowest:<br>" +
"<blockquote>User Defined<br>Imported<br>Analysis<br>default (i.e. param_...)</blockquote></HTML>"; "<blockquote>User Defined<br>Imported<br>Analysis<br>default (i.e. param_...)</blockquote></html>";
private static final String IMPORT_PRIORITY_TOOLTIP = private static final String IMPORT_PRIORITY_TOOLTIP =
"<HTML>Parameter Name Source Type Priority <br>from highest to lowest:<br>" + "<html>Parameter Name Source Type Priority <br>from highest to lowest:<br>" +
"<blockquote>Imported<br>User Defined<br>Analysis<br>default (i.e. param_...)</blockquote></HTML>"; "<blockquote>Imported<br>User Defined<br>Analysis<br>default (i.e. param_...)</blockquote></html>";
private static final String PARAMETER_NAMES_REPLACE_IF_SAME_PRIORITY_TOOLTIP = private static final String PARAMETER_NAMES_REPLACE_IF_SAME_PRIORITY_TOOLTIP =
"<HTML>When function signature parameter names are being replaced based on source type priority, " + "<html>When function signature parameter names are being replaced based on source type priority, " +
"replace the destination name with the source name if their source types are the same.</HTML>"; "replace the destination name with the source name if their source types are the same.</html>";
private static final String PARAMETER_COMMENTS_TOOLTIP = private static final String PARAMETER_COMMENTS_TOOLTIP =
"<HTML>The apply action for <b>parameter comments</b> when applying the function signature</HTML>"; "<html>The apply action for <b>parameter comments</b> when applying the function signature</html>";
private static final String IGNORE_EXCLUDED_TOOLTIP = private static final String IGNORE_EXCLUDED_TOOLTIP =
"<HTML>Markup items whose \"apply option\" is set to <b>Do Not Apply</b> should be" + "<html>Markup items whose \"apply option\" is set to <b>Do Not Apply</b> should be" +
" changed to a status of <b>Ignored</b> by applying a match.</HTML>"; " changed to a status of <b>Ignored</b> by applying a match.</html>";
private static final String IGNORE_INCOMPLETE_TOOLTIP = private static final String IGNORE_INCOMPLETE_TOOLTIP =
"<HTML>Markup items that are <b>incomplete</b> (for example, no destination address is specified) " + "<html>Markup items that are <b>incomplete</b> (for example, no destination address is specified) " +
"should be changed to a status of <b>Ignored</b> by applying a match.</HTML>"; "should be changed to a status of <b>Ignored</b> by applying a match.</html>";
private JComponent editorComponent; private JComponent editorComponent;

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

@ -287,7 +287,7 @@ public class StatusBar extends JPanel {
@Override @Override
public String getToolTipText() { public String getToolTipText() {
if (messageQueue.size() > 0) { if (messageQueue.size() > 0) {
StringBuffer buffer = new StringBuffer("<HTML>"); StringBuffer buffer = new StringBuffer("<html>");
Iterator<String> iter = messageQueue.iterator(); Iterator<String> iter = messageQueue.iterator();
for (int i = 0; iter.hasNext(); i++) { for (int i = 0; iter.hasNext(); i++) {

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

@ -52,8 +52,8 @@ class DockingToolBarUtils {
private static String combingToolTipTextWithKeyBinding(String toolTipText, private static String combingToolTipTextWithKeyBinding(String toolTipText,
String keyBindingText) { String keyBindingText) {
StringBuilder buffy = new StringBuilder(toolTipText); StringBuilder buffy = new StringBuilder(toolTipText);
if (StringUtilities.startsWithIgnoreCase(toolTipText, "<HTML>")) { if (StringUtilities.startsWithIgnoreCase(toolTipText, "<html>")) {
String endHTMLTag = "</HTML>"; String endHTMLTag = "</html>";
int closeTagIndex = StringUtils.indexOfIgnoreCase(toolTipText, endHTMLTag); int closeTagIndex = StringUtils.indexOfIgnoreCase(toolTipText, endHTMLTag);
if (closeTagIndex < 0) { if (closeTagIndex < 0) {
// no closing tag, which is acceptable // no closing tag, which is acceptable

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

@ -56,13 +56,13 @@ public class HorizontalRuleAction extends DockingAction {
String topHtml = HTMLUtilities.escapeHTML(topName); String topHtml = HTMLUtilities.escapeHTML(topName);
String bottomHtml = HTMLUtilities.escapeHTML(bottomName); String bottomHtml = HTMLUtilities.escapeHTML(bottomName);
menuData.setMenuItemNamePlain(String.format(""" menuData.setMenuItemNamePlain(String.format("""
<HTML><CENTER><FONT SIZE=2 COLOR="%s">%s<BR>%s</FONT></CENTER> <html><CENTER><FONT SIZE=2 COLOR="%s">%s<BR>%s</FONT></CENTER>
""", Palette.SILVER, topHtml, bottomHtml)); """, Palette.SILVER, topHtml, bottomHtml));
setMenuBarData(menuData); setMenuBarData(menuData);
// the description is meant to be used for the tooltip and is larger // the description is meant to be used for the tooltip and is larger
setDescription(String.format(""" setDescription(String.format("""
<HTML><CENTER><B>%s</B><HR><B>%s</B></CENTER> <html><CENTER><B>%s</B><HR><B>%s</B></CENTER>
""", PADDING + topHtml + PADDING, PADDING + bottomHtml + PADDING)); """, PADDING + topHtml + PADDING, PADDING + bottomHtml + PADDING));
} }

2
Ghidra/Framework/Docking/src/main/java/docking/options/editor/ColorEditor.java
View file

@ -91,7 +91,7 @@ public class ColorEditor extends PropertyEditorSupport {
String colorString = String colorString =
WebColors.toString(ColorUtils.contrastForegroundColor(newColor), false); WebColors.toString(ColorUtils.contrastForegroundColor(newColor), false);
previewLabel.setText( previewLabel.setText(
"<HTML><CENTER><I><FONT SIZE=2 COLOR=" + colorString + ">click</FONT></I></CENTER>"); "<html><CENTER><I><FONT SIZE=2 COLOR=" + colorString + ">click</FONT></I></CENTER>");
previewLabel.setBackground(color); previewLabel.setBackground(color);
} }

6
Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/AbstractNumberInputDialog.java
View file

@ -102,7 +102,11 @@ public abstract class AbstractNumberInputDialog extends DialogComponentProvider
*/ */
protected JPanel buildMainPanel(String prompt, boolean showAsHex) { protected JPanel buildMainPanel(String prompt, boolean showAsHex) {
JPanel panel = createPanel(prompt); JPanel panel = createPanel(prompt);
numberInputField.addActionListener(e -> okCallback()); numberInputField.addActionListener(e -> {
if (okButton.isEnabled()) {
okCallback();
}
});
if (showAsHex) { if (showAsHex) {
numberInputField.setHexMode(); numberInputField.setHexMode();

47
Ghidra/Framework/Gui/src/main/java/ghidra/util/HTMLUtilities.java
View file

@ -123,11 +123,13 @@ public class HTMLUtilities {
private static final int MAX_TOOLTIP_LENGTH = 2000; // arbitrary private static final int MAX_TOOLTIP_LENGTH = 2000; // arbitrary
private static final int TAB_SIZE = 4; private static final int TAB_SIZE = 4;
public static final String HTML = "<HTML>"; // Intentionally lower-case to match external checks for isHtml(), some of which check
public static final String HTML_CLOSE = "</HTML>"; // case-sensitive for "<html>"
public static final String BR = "<BR>"; public static final String HTML = "<html>";
public static final String PRE = "<PRE>"; public static final String HTML_CLOSE = "</html>";
public static final String PRE_CLOSE = "</PRE>"; public static final String BR = "<br>";
public static final String PRE = "<pre>";
public static final String PRE_CLOSE = "</pre>";
/** /**
* A tag to mark code that could be made into a hyperlink. This allows you to mark * A tag to mark code that could be made into a hyperlink. This allows you to mark
@ -171,35 +173,35 @@ public class HTMLUtilities {
*/ */
public static String colorString(Color color, String text) { public static String colorString(Color color, String text) {
String rgb = toHexString(color); String rgb = toHexString(color);
return "<FONT COLOR=\"" + rgb + "\">" + text + "</FONT>"; return "<font color=\"" + rgb + "\">" + text + "</font>";
} }
/** /**
* Surrounds the indicated text with HTML font coloring tags so that the * Surrounds the indicated text with HTML font coloring tags so that the
* text will display in color within HTML. * text will display in color within HTML.
* @param rgbColor (eg. "#8c0000") a string indicating the RGB hexadecimal color * @param rgbColor (e.g., "#8c0000") a string indicating the RGB hexadecimal color
* @param text the original text * @param text the original text
* @return the string for HTML colored text * @return the string for HTML colored text
*/ */
public static String colorString(String rgbColor, String text) { public static String colorString(String rgbColor, String text) {
return "<FONT COLOR=\"" + rgbColor + "\">" + text + "</FONT>"; return "<font color=\"" + rgbColor + "\">" + text + "</font>";
} }
/** /**
* Surrounds the indicated numeric value with HTML font coloring tags so that the * Surrounds the indicated numeric value with HTML font coloring tags so that the
* numeric value will display in color within HTML. * numeric value will display in color within HTML.
* @param rgbColor (eg. "#8c0000") a string indicating the RGB hexadecimal color * @param rgbColor (e.g., "#8c0000") a string indicating the RGB hexadecimal color
* @param value the numeric value to be converted to text and wrapped with color tags. * @param value the numeric value to be converted to text and wrapped with color tags.
* @return the string for the HTML colored number * @return the string for the HTML colored number
*/ */
public static String colorString(String rgbColor, int value) { public static String colorString(String rgbColor, int value) {
return "<FONT COLOR=\"" + rgbColor + "\">" + value + "</FONT>"; return "<font color=\"" + rgbColor + "\">" + value + "</font>";
} }
/** /**
* Creates a string with the indicated number of HTML space characters (<code>&#x26;nbsp;</code>). * Creates a string with the indicated number of HTML space characters (<code>&#x26;nbsp;</code>).
* @param num the number of HTML spaces * @param num the number of HTML spaces
* @return the string o HTML spaces * @return the string of HTML spaces
*/ */
public static String spaces(int num) { public static String spaces(int num) {
StringBuilder buf = new StringBuilder(HTML_SPACE.length() * num); StringBuilder buf = new StringBuilder(HTML_SPACE.length() * num);
@ -289,7 +291,7 @@ public class HTMLUtilities {
} }
/** /**
* Sets the font size of the given text by wrapping it in &lt;font&gt; tags. * Sets the font size of the given text by wrapping it in &lt;span&gt; tags.
* *
* @param text the text to size * @param text the text to size
* @param ptSize the point size of the text * @param ptSize the point size of the text
@ -303,19 +305,19 @@ public class HTMLUtilities {
} }
StringBuilder buffy = new StringBuilder(text); StringBuilder buffy = new StringBuilder(text);
buffy.insert(start, "<SPAN STYLE=\"font-size: " + ptSize + "pt\">"); buffy.insert(start, "<span style=\"font-size: " + ptSize + "pt\">");
int end = buffy.length(); int end = buffy.length();
if (StringUtilities.endsWithIgnoreCase(text, HTML_CLOSE)) { if (StringUtilities.endsWithIgnoreCase(text, HTML_CLOSE)) {
end = end - HTML_CLOSE.length(); end = end - HTML_CLOSE.length();
} }
buffy.insert(end, "</SPAN>"); buffy.insert(end, "</span>");
return buffy.toString(); return buffy.toString();
} }
/** /**
* Sets the font size and color of the given text by wrapping it in &lt;font&gt; tags. * Sets the font size and color of the given text by wrapping it in &lt;span&gt; tags.
* *
* @param text the text to size * @param text the text to size
* @param color the color of the text * @param color the color of the text
@ -330,14 +332,14 @@ public class HTMLUtilities {
} }
StringBuilder buffy = new StringBuilder(text); StringBuilder buffy = new StringBuilder(text);
buffy.insert(start, "<SPAN STYLE=\"font-size: " + ptSize + "pt; color: " + rgb + "\">"); buffy.insert(start, "<span style=\"font-size: " + ptSize + "pt; color: " + rgb + "\">");
int end = buffy.length(); int end = buffy.length();
if (StringUtilities.endsWithIgnoreCase(text, HTML_CLOSE)) { if (StringUtilities.endsWithIgnoreCase(text, HTML_CLOSE)) {
end = end - HTML_CLOSE.length(); end = end - HTML_CLOSE.length();
} }
buffy.insert(end, "</SPAN>"); buffy.insert(end, "</span>");
return buffy.toString(); return buffy.toString();
} }
@ -363,8 +365,8 @@ public class HTMLUtilities {
/** /**
* Takes HTML text wrapped by {@link #wrapWithLinkPlaceholder(String, String)} and replaces * Takes HTML text wrapped by {@link #wrapWithLinkPlaceholder(String, String)} and replaces
* the custom link comment tags with HTML anchor (<code>A</code>) tags, where the <code>HREF</code> * the custom link comment tags with HTML anchor (<code>A</code>) tags, where the
* value is the value that was in the <code>CONTENT</code> attribute. * <code>HREF</code> value is the value that was in the <code>CONTENT</code> attribute.
* *
* @param text the text for which to replace the markup * @param text the text for which to replace the markup
* @return the updated text * @return the updated text
@ -378,14 +380,14 @@ public class HTMLUtilities {
while (matcher.find()) { while (matcher.find()) {
String content = matcher.group(1); String content = matcher.group(1);
String escaped = content.replace("$", "\\$"); String escaped = content.replace("$", "\\$");
String updated = "<A HREF=\"" + escaped + "\">"; String updated = "<a href=\"" + escaped + "\">";
matcher.appendReplacement(buffy, updated); matcher.appendReplacement(buffy, updated);
} }
matcher.appendTail(buffy); matcher.appendTail(buffy);
String pass1 = buffy.toString(); String pass1 = buffy.toString();
String pass2 = pass1.replaceAll(LINK_PLACEHOLDER_CLOSE, "</A>"); String pass2 = pass1.replaceAll(LINK_PLACEHOLDER_CLOSE, "</a>");
return pass2; return pass2;
} }
@ -398,8 +400,7 @@ public class HTMLUtilities {
*/ */
public static String toHTML(String text) { public static String toHTML(String text) {
int noMax = 0; int noMax = 0;
String html = toWrappedHTML(text, noMax); return toWrappedHTML(text, noMax);
return html;
} }
/** /**

4
Ghidra/Framework/Gui/src/test/java/ghidra/util/HTMLUtilitiesTest.java
View file

@ -107,7 +107,7 @@ public class HTMLUtilitiesTest {
@Test @Test
public void testToLiteralHTML_AlreadyStartingWithHTML() { public void testToLiteralHTML_AlreadyStartingWithHTML() {
String s = "<HTML>Wrap<BR>here"; String s = "<html>Wrap<BR>here";
String html = HTMLUtilities.toLiteralHTML(s, 4); String html = HTMLUtilities.toLiteralHTML(s, 4);
assertEquals(HTML + "&lt;HTM<BR>\nL&gt;Wr<BR>\nap&lt;B<BR>\nR&gt;he<BR>\nre", html); assertEquals(HTML + "&lt;HTM<BR>\nL&gt;Wr<BR>\nap&lt;B<BR>\nR&gt;he<BR>\nre", html);
} }
@ -121,7 +121,7 @@ public class HTMLUtilitiesTest {
@Test @Test
public void testFromHTML() { public void testFromHTML() {
String s = "<HTML><b>Bold</b>, <i>italics</i>, <font size='3'>sized font!</font>"; String s = "<html><b>Bold</b>, <i>italics</i>, <font size='3'>sized font!</font>";
String text = Swing.runNow(() -> HTMLUtilities.fromHTML(s)); String text = Swing.runNow(() -> HTMLUtilities.fromHTML(s));
assertEquals("Bold, italics, sized font!", text); assertEquals("Bold, italics, sized font!", text);
} }

56
Ghidra/Framework/Help/src/main/java/help/screenshot/HelpMissingScreenShotReportGenerator.java
View file

@ -15,14 +15,6 @@
*/ */
package help.screenshot; package help.screenshot;
import help.GHelpBuilder;
import help.HelpBuildUtils;
import help.validator.UnusedHelpImageFileFinder;
import help.validator.location.DirectoryHelpModuleLocation;
import help.validator.location.HelpModuleLocation;
import help.validator.model.HelpTopic;
import help.validator.model.IMG;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.*; import java.io.*;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -36,6 +28,14 @@ import java.util.Map.Entry;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import help.GHelpBuilder;
import help.HelpBuildUtils;
import help.validator.UnusedHelpImageFileFinder;
import help.validator.location.DirectoryHelpModuleLocation;
import help.validator.location.HelpModuleLocation;
import help.validator.model.HelpTopic;
import help.validator.model.IMG;
public class HelpMissingScreenShotReportGenerator { public class HelpMissingScreenShotReportGenerator {
private static boolean debugEnabled; private static boolean debugEnabled;
@ -68,17 +68,17 @@ public class HelpMissingScreenShotReportGenerator {
generator.generateReport(); generator.generateReport();
} }
private Set<HelpModuleLocation> helpDirectories = new HashSet<HelpModuleLocation>(); private Set<HelpModuleLocation> helpDirectories = new HashSet<>();
private Map<String, HelpTopic> topicNameToTopic = new HashMap<String, HelpTopic>(); private Map<String, HelpTopic> topicNameToTopic = new HashMap<>();
private Set<HelpTestCase> testCases = new HashSet<HelpTestCase>(); private Set<HelpTestCase> testCases = new HashSet<>();
private Map<String, HelpTestCase> imageNameToTestCase = new HashMap<String, HelpTestCase>(); private Map<String, HelpTestCase> imageNameToTestCase = new HashMap<>();
private SortedSet<String> badlyNamedTestFiles = new TreeSet<String>(); private SortedSet<String> badlyNamedTestFiles = new TreeSet<>();
private SortedSet<HelpTestCase> badlyNamedTestCases = new TreeSet<HelpTestCase>(); private SortedSet<HelpTestCase> badlyNamedTestCases = new TreeSet<>();
// private Map<HelpDirectory, IMG> untestedImages = new TreeMap<HelpDirectory, IMG>(); // private Map<HelpDirectory, IMG> untestedImages = new TreeMap<HelpDirectory, IMG>();
private Map<HelpTopic, Set<IMG>> untestedImages = new TreeMap<HelpTopic, Set<IMG>>(); private Map<HelpTopic, Set<IMG>> untestedImages = new TreeMap<>();
private Set<Path> examinedImageFiles = new HashSet<Path>(); private Set<Path> examinedImageFiles = new HashSet<>();
private File outputFile; private File outputFile;
@ -432,7 +432,7 @@ public class HelpMissingScreenShotReportGenerator {
Set<IMG> set = untestedImages.get(topic); Set<IMG> set = untestedImages.get(topic);
if (set == null) { if (set == null) {
set = new TreeSet<IMG>(); set = new TreeSet<>();
untestedImages.put(topic, set); untestedImages.put(topic, set);
} }
@ -619,7 +619,7 @@ public class HelpMissingScreenShotReportGenerator {
} }
private void writeHeader(BufferedWriter writer) throws IOException { private void writeHeader(BufferedWriter writer) throws IOException {
writer.write("<HTML>\n"); writer.write("<html>\n");
writer.write("<HEAD>\n"); writer.write("<HEAD>\n");
createStyleSheet(writer); createStyleSheet(writer);
writer.write("</HEAD>\n"); writer.write("</HEAD>\n");
@ -635,7 +635,7 @@ public class HelpMissingScreenShotReportGenerator {
writer.write("<BR>\n"); writer.write("<BR>\n");
writer.write("</BODY>\n"); writer.write("</BODY>\n");
writer.write("</HTML>\n"); writer.write("</html>\n");
} }
private void createStyleSheet(BufferedWriter writer) throws IOException { private void createStyleSheet(BufferedWriter writer) throws IOException {
@ -643,11 +643,16 @@ public class HelpMissingScreenShotReportGenerator {
writer.write("<!--\n"); writer.write("<!--\n");
writer.write("body { font-family:arial; font-size:22pt }\n"); writer.write("body { font-family:arial; font-size:22pt }\n");
writer.write("h1 { color:#000080; font-family:times new roman; font-size:28pt; font-weight:bold; text-align:center; }\n"); writer.write(
writer.write("h2 { color:#984c4c; font-family:times new roman; font-size:28pt; font-weight:bold; }\n"); "h1 { color:#000080; font-family:times new roman; font-size:28pt; font-weight:bold; text-align:center; }\n");
writer.write("h2.title { color:#000080; font-family:times new roman; font-size:14pt; font-weight:bold; text-align:center;}\n"); writer.write(
writer.write("h3 { color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; margin-left:.5in }\n"); "h2 { color:#984c4c; font-family:times new roman; font-size:28pt; font-weight:bold; }\n");
writer.write("table { margin-left:1in; margin-right:1in; min-width:20em; width:90%; background-color:#EEEEFF }\n"); writer.write(
"h2.title { color:#000080; font-family:times new roman; font-size:14pt; font-weight:bold; text-align:center;}\n");
writer.write(
"h3 { color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; margin-left:.5in }\n");
writer.write(
"table { margin-left:1in; margin-right:1in; min-width:20em; width:90%; background-color:#EEEEFF }\n");
writer.write("th { text-align:center; }\n"); writer.write("th { text-align:center; }\n");
writer.write("td { text-align:left; padding: 20px }\n"); writer.write("td { text-align:left; padding: 20px }\n");
@ -665,7 +670,8 @@ public class HelpMissingScreenShotReportGenerator {
private Path filePath; private Path filePath;
private HelpTopic helpTopic; private HelpTopic helpTopic;
HelpTestFile(HelpModuleLocation helpDir, HelpTopic helpTopic, Path filePath, String filename) { HelpTestFile(HelpModuleLocation helpDir, HelpTopic helpTopic, Path filePath,
String filename) {
this.helpDir = helpDir; this.helpDir = helpDir;
this.helpTopic = helpTopic; this.helpTopic = helpTopic;
this.filePath = filePath; this.filePath = filePath;

4
Ghidra/Framework/Help/src/main/java/help/screenshot/HelpScreenShotReportGenerator.java
View file

@ -146,7 +146,7 @@ public class HelpScreenShotReportGenerator {
} }
private void writeHeader(BufferedWriter writer) throws IOException { private void writeHeader(BufferedWriter writer) throws IOException {
writer.write("<HTML>\n"); writer.write("<html>\n");
writer.write("<HEAD>\n"); writer.write("<HEAD>\n");
createStyleSheet(writer); createStyleSheet(writer);
writer.write("</HEAD>\n"); writer.write("</HEAD>\n");
@ -178,7 +178,7 @@ public class HelpScreenShotReportGenerator {
writer.write("</P>\n"); writer.write("</P>\n");
writer.write("</BODY>\n"); writer.write("</BODY>\n");
writer.write("</HTML>\n"); writer.write("</html>\n");
} }
private void createStyleSheet(BufferedWriter writer) throws IOException { private void createStyleSheet(BufferedWriter writer) throws IOException {

10
Ghidra/Framework/Help/src/test/java/help/AbstractHelpTest.java
View file

@ -115,7 +115,7 @@ public abstract class AbstractHelpTest extends AbstractGenericTest {
//@formatter:off //@formatter:off
String HTML = String HTML =
"<HTML>\n" + "<html>\n" +
"<HEAD>\n" + "<HEAD>\n" +
"<TITLE>Configure Tool</TITLE>\n" + "<TITLE>Configure Tool</TITLE>\n" +
"<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" + "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" +
@ -141,7 +141,7 @@ public abstract class AbstractHelpTest extends AbstractGenericTest {
//@formatter:off //@formatter:off
String HTML = String HTML =
"<HTML>\n" + "<html>\n" +
"<HEAD>\n" + "<HEAD>\n" +
"<TITLE>Configure Tool</TITLE>\n" + "<TITLE>Configure Tool</TITLE>\n" +
"<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" + "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" +
@ -152,7 +152,7 @@ public abstract class AbstractHelpTest extends AbstractGenericTest {
" And this is a link <A HREF=\""+HREF+"\">Click Me</A>" + " And this is a link <A HREF=\""+HREF+"\">Click Me</A>" +
" \n" + " \n" +
"</BODY>\n" + "</BODY>\n" +
"</HTML>\n"; "</html>\n";
//@formatter:on //@formatter:on
Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE); Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE);
@ -168,7 +168,7 @@ public abstract class AbstractHelpTest extends AbstractGenericTest {
//@formatter:off //@formatter:off
String HTML = String HTML =
"<HTML>\n" + "<html>\n" +
"<HEAD>\n" + "<HEAD>\n" +
"<TITLE>Configure Tool</TITLE>\n" + "<TITLE>Configure Tool</TITLE>\n" +
"<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" + "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" +
@ -179,7 +179,7 @@ public abstract class AbstractHelpTest extends AbstractGenericTest {
" Some text with reference to shared image <IMG src=\""+SRC+"\">\n" + " Some text with reference to shared image <IMG src=\""+SRC+"\">\n" +
" \n" + " \n" +
"</BODY>\n" + "</BODY>\n" +
"</HTML>\n"; "</html>\n";
//@formatter:on //@formatter:on
Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE); Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE);

20
Ghidra/Framework/Help/src/test/java/help/validator/model/HelpFileTest.java
View file

@ -184,7 +184,7 @@ public class HelpFileTest extends AbstractHelpTest {
//@formatter:off //@formatter:off
String HTML = String HTML =
"<HTML>\n" + "<html>\n" +
"<HEAD>\n" + "<HEAD>\n" +
"<TITLE>Configure Tool</TITLE>\n" + "<TITLE>Configure Tool</TITLE>\n" +
"<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" + "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" +
@ -194,7 +194,7 @@ public class HelpFileTest extends AbstractHelpTest {
"Some text with reference to shared image <a "+badAttr+">Click me</a>\n" + "Some text with reference to shared image <a "+badAttr+">Click me</a>\n" +
"\n" + "\n" +
"</BODY>\n" + "</BODY>\n" +
"</HTML>\n"; "</html>\n";
//@formatter:on //@formatter:on
Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE); Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE);
@ -209,7 +209,7 @@ public class HelpFileTest extends AbstractHelpTest {
//@formatter:off //@formatter:off
String HTML = String HTML =
"<HTML>\n" + "<html>\n" +
"<HEAD>\n" + "<HEAD>\n" +
"<TITLE>Configure Tool</TITLE>\n" + "<TITLE>Configure Tool</TITLE>\n" +
"<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" + "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" +
@ -219,7 +219,7 @@ public class HelpFileTest extends AbstractHelpTest {
"Some text with reference to shared image <IMG "+badAttr+"s>\n" + "Some text with reference to shared image <IMG "+badAttr+"s>\n" +
"\n" + "\n" +
"</BODY>\n" + "</BODY>\n" +
"</HTML>\n"; "</html>\n";
//@formatter:on //@formatter:on
Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE); Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE);
@ -234,7 +234,7 @@ public class HelpFileTest extends AbstractHelpTest {
//@formatter:off //@formatter:off
String HTML = String HTML =
"<HTML>\n" + "<html>\n" +
"<HEAD>\n" + "<HEAD>\n" +
"<TITLE>Configure Tool</TITLE>\n" + "<TITLE>Configure Tool</TITLE>\n" +
"<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" + "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" +
@ -244,7 +244,7 @@ public class HelpFileTest extends AbstractHelpTest {
"Some text with reference to shared image <a href=\""+badURI+"\">Click me</a>\n" + "Some text with reference to shared image <a href=\""+badURI+"\">Click me</a>\n" +
"\n" + "\n" +
"</BODY>\n" + "</BODY>\n" +
"</HTML>\n"; "</html>\n";
//@formatter:on //@formatter:on
Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE); Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE);
@ -259,7 +259,7 @@ public class HelpFileTest extends AbstractHelpTest {
//@formatter:off //@formatter:off
String HTML = String HTML =
"<HTML>\n" + "<html>\n" +
"<HEAD>\n" + "<HEAD>\n" +
"<TITLE>Configure Tool</TITLE>\n" + "<TITLE>Configure Tool</TITLE>\n" +
"<LINK rel=\"stylesheet\" type=\"text/css\" href=\"../../shared/"+badName+".css\">\n" + "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"../../shared/"+badName+".css\">\n" +
@ -269,7 +269,7 @@ public class HelpFileTest extends AbstractHelpTest {
"Some text with reference to shared image <IMG src=\"help/shared/DefaultStyle.css\">\n" + "Some text with reference to shared image <IMG src=\"help/shared/DefaultStyle.css\">\n" +
"\n" + "\n" +
"</BODY>\n" + "</BODY>\n" +
"</HTML>\n"; "</html>\n";
//@formatter:on //@formatter:on
Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE); Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE);
@ -285,7 +285,7 @@ public class HelpFileTest extends AbstractHelpTest {
//@formatter:off //@formatter:off
String HTML = String HTML =
"<HTML>\n" + "<html>\n" +
"<HEAD>\n" + "<HEAD>\n" +
"<TITLE>Configure Tool</TITLE>\n" + "<TITLE>Configure Tool</TITLE>\n" +
"<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" + "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"help/shared/DefaultStyle.css\">\n" +
@ -297,7 +297,7 @@ public class HelpFileTest extends AbstractHelpTest {
" -->" + " -->" +
"\n" + "\n" +
"</BODY>\n" + "</BODY>\n" +
"</HTML>\n"; "</html>\n";
//@formatter:on //@formatter:on
Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE); Files.write(file, HTML.getBytes(), StandardOpenOption.CREATE);

7
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatable/ProjectDataTablePanel.java
View file

@ -54,9 +54,9 @@ public class ProjectDataTablePanel extends JPanel {
public Set<DomainFile> filesPendingSelection; public Set<DomainFile> filesPendingSelection;
private GHtmlLabel capacityExceededText = private GHtmlLabel capacityExceededText =
new GHtmlLabel("<HTML><CENTER><I>Table view disabled for very large projects, or<BR>" + new GHtmlLabel("<html><CENTER><I>Table view disabled for very large projects, or<BR>" +
"if an older project/repository filesystem is in use.<BR>" + "if an older project/repository filesystem is in use.<BR>" +
"View will remain disabled until project is closed.</I></CENTER></HTML>"); "View will remain disabled until project is closed.</I></CENTER></html>");
private GGlassPanePainter painter = new TableGlassPanePainter(); private GGlassPanePainter painter = new TableGlassPanePainter();
@ -95,7 +95,8 @@ public class ProjectDataTablePanel extends JPanel {
checkOpen(e); checkOpen(e);
} }
}); });
gTable.getSelectionModel().addListSelectionListener( gTable.getSelectionModel()
.addListSelectionListener(
e -> plugin.getTool().contextChanged(null)); e -> plugin.getTool().contextChanged(null));
gTable.setDefaultRenderer(Date.class, new DateCellRenderer()); gTable.setDefaultRenderer(Date.class, new DateCellRenderer());
gTable.setDefaultRenderer(DomainFileType.class, new TypeCellRenderer()); gTable.setDefaultRenderer(DomainFileType.class, new TypeCellRenderer());

6
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/projectdata/actions/ProjectDataDeleteAction.java
View file

@ -89,17 +89,17 @@ public class ProjectDataDeleteAction extends FrontendProjectTreeAction {
if (fileCount == 1) { if (fileCount == 1) {
if (!selectedFiles.isEmpty()) { if (!selectedFiles.isEmpty()) {
DomainFile file = CollectionUtils.any(selectedFiles); DomainFile file = CollectionUtils.any(selectedFiles);
return "<HTML>Are you sure you want to <B><U>permanently</U></B> delete \"" + return "<html>Are you sure you want to <B><U>permanently</U></B> delete \"" +
HTMLUtilities.escapeHTML(file.getName()) + "\"?"; HTMLUtilities.escapeHTML(file.getName()) + "\"?";
} }
// only folders are selected, but they contain files // only folders are selected, but they contain files
return "<HTML>Are you sure you want to <B><U>permanently</U></B> delete the " + return "<html>Are you sure you want to <B><U>permanently</U></B> delete the " +
" selected files and folders?"; " selected files and folders?";
} }
// multiple files selected // multiple files selected
return "<HTML>Are you sure you want to <B><U>permanently</U></B> delete the " + fileCount + return "<html>Are you sure you want to <B><U>permanently</U></B> delete the " + fileCount +
" selected files?"; " selected files?";
} }

2
Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/PluginDetailsPanel.java
View file

@ -68,7 +68,7 @@ class PluginDetailsPanel extends AbstractDetailsPanel {
List<PluginDescription> dependencies = model.getDependencies(descriptor); List<PluginDescription> dependencies = model.getDependencies(descriptor);
Collections.sort(dependencies, (pd1, pd2) -> pd1.getName().compareTo(pd2.getName())); Collections.sort(dependencies, (pd1, pd2) -> pd1.getName().compareTo(pd2.getName()));
StringBuilder buffer = new StringBuilder("<HTML>"); StringBuilder buffer = new StringBuilder("<html>");
buffer.append("<TABLE cellpadding=2>"); buffer.append("<TABLE cellpadding=2>");

2
Ghidra/Framework/Project/src/main/java/ghidra/framework/project/extensions/ExtensionDetailsPanel.java
View file

@ -94,7 +94,7 @@ class ExtensionDetailsPanel extends AbstractDetailsPanel {
return; return;
} }
StringBuilder buffer = new StringBuilder("<HTML>"); StringBuilder buffer = new StringBuilder("<html>");
buffer.append("<TABLE cellpadding=2>"); buffer.append("<TABLE cellpadding=2>");
insertRowTitle(buffer, "Name"); insertRowTitle(buffer, "Name");

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

@ -244,7 +244,7 @@ public class ProgramCompilerSpec extends BasicCompilerSpec {
return; return;
} }
StringBuilder buffer = new StringBuilder(); 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>"); buffer.append("<ul>");
for (String line : errorList) { for (String line : errorList) {
buffer.append("<li>").append(line).append("</li>"); 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() { private void setupDescription() {
JLabel label = new GHtmlLabel( 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>" + "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.setBorder(BorderFactory.createEmptyBorder(0, 0, 8, 0));
label.setHorizontalAlignment(SwingConstants.CENTER); label.setHorizontalAlignment(SwingConstants.CENTER);
add(label, BorderLayout.NORTH); add(label, BorderLayout.NORTH);

15
Ghidra/Framework/Utility/src/main/java/ghidra/GhidraJarApplicationLayout.java
View file

@ -23,7 +23,7 @@ import java.util.*;
import generic.jar.ResourceFile; import generic.jar.ResourceFile;
import ghidra.framework.ApplicationProperties; import ghidra.framework.ApplicationProperties;
import ghidra.framework.GModule; import ghidra.framework.GModule;
import utility.application.ApplicationLayout; import ghidra.util.Msg;
import utility.module.ModuleUtilities; import utility.module.ModuleUtilities;
/** /**
@ -51,7 +51,11 @@ public class GhidraJarApplicationLayout extends GhidraApplicationLayout {
protected Collection<ResourceFile> findGhidraApplicationRootDirs() { protected Collection<ResourceFile> findGhidraApplicationRootDirs() {
List<ResourceFile> dirs = new ArrayList<>(); List<ResourceFile> dirs = new ArrayList<>();
String appPropPath = "/_Root/Ghidra/" + ApplicationProperties.PROPERTY_FILE; String appPropPath = "/_Root/Ghidra/" + ApplicationProperties.PROPERTY_FILE;
URL appPropUrl = ApplicationLayout.class.getResource(appPropPath); URL appPropUrl = getClass().getResource(appPropPath);
if (appPropUrl == null) {
throw new IllegalStateException(
"The Ghidra Jar must have an application.properties file at " + appPropPath);
}
ResourceFile rootDir = fromUrl(appPropUrl).getParentFile(); ResourceFile rootDir = fromUrl(appPropUrl).getParentFile();
dirs.add(rootDir); dirs.add(rootDir);
return dirs; return dirs;
@ -79,7 +83,12 @@ public class GhidraJarApplicationLayout extends GhidraApplicationLayout {
@Override @Override
protected List<ResourceFile> findExtensionInstallationDirectories() { protected List<ResourceFile> findExtensionInstallationDirectories() {
URL extensionInstallUrl = ApplicationLayout.class.getResource("/_Root/Ghidra/Extensions"); String path = "/_Root/Ghidra/Extensions";
URL extensionInstallUrl = getClass().getResource(path);
if (extensionInstallUrl == null) {
Msg.debug(this, "No Extensions dir found at " + path);
return List.of();
}
ResourceFile extensionInstallDir = fromUrl(extensionInstallUrl); ResourceFile extensionInstallDir = fromUrl(extensionInstallUrl);
return Collections.singletonList(extensionInstallDir); return Collections.singletonList(extensionInstallDir);
} }