mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GT-3546_dragonmacher_PR-1508_astrelsky_DocFix'

resolves #1508
This commit is contained in:
ghidorahrex
2020-02-14 08:58:00 -05:00
parent 3c8f2bdeff a3d163fd81
commit 1c415bc053
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Framework/Docking/src/main/java/docking/action/builder/AbstractActionBuilder.java
View File

@@ -578,7 +578,7 @@ public abstract class AbstractActionBuilder<T extends DockingActionIf, C extends
* FooActionContext. If you don't call this method to set the ActionContext type, you would have
* to write your predicate something like this:
* <pre>
* builder.enabledWhen(context -> {
* {@literal builder.enabledWhen(context -> }{
* if (!(context instanceof FooContext)) {
* return false;
* }
@@ -589,7 +589,7 @@ public abstract class AbstractActionBuilder<T extends DockingActionIf, C extends
* simply write:
*
* <pre>
* builder.enabledWhen(context -> return context.isAwesome() }
* {@literal builder.enabledWhen(context -> return context.isAwesome() }}
* </pre>
*
* @param newActionContextClass the more specific ActionContext type.

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java
View File

@@ -727,7 +727,7 @@ public class HighFunctionDBUtil {
/**
* Get the Address referred to by a spacebase reference. Address-of references are encoded in
* the p-code syntax tree as: vn = PTRSUB(<spacebase>, #const). This decodes the reference and
* the p-code syntax tree as: {@code vn = PTRSUB(<spacebase>, #const)}. This decodes the reference and
* returns the Address
* @param program is the program containing the Address
* @param op is the PTRSUB op encoding the reference

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighVariable.java
View File

@@ -144,7 +144,7 @@ public abstract class HighVariable {
* Restore the data-type and the Varnode instances of this HighVariable.
* The "representative" Varnode is also populated.
* @param parser is the XML stream
* @param el is the root <high> tag
* @param el is the root {@code <high>} tag
* @throws PcodeXMLException if the XML is not valid
*/
protected void restoreInstances(XmlPullParser parser, XmlElement el)
@@ -193,7 +193,7 @@ public abstract class HighVariable {
}
/**
* Restore this HighVariable from a <high> XML tag
* Restore this HighVariable from a {@code <high>} XML tag
* @param parser is the XML stream
* @throws PcodeXMLException if the XML is not valid
*/