diff --git a/Ghidra/Features/Base/src/main/java/ghidra/GhidraRun.java b/Ghidra/Features/Base/src/main/java/ghidra/GhidraRun.java index 4c07a6b028..d242e3e776 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/GhidraRun.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/GhidraRun.java @@ -58,7 +58,7 @@ import ghidra.util.task.*; * indicates locations for where classes for plugins and data types should * be searched; the Plugin path can include jar files just like a classpath. * The Plugin path can be changed by using the Edit Plugin Path dialog, - * displayed from the Edit->Edit Plugin Path... menu option on the main + * displayed from the Edit->Edit Plugin Path... menu option on the main * Ghidra project window. * * @see ghidra.GhidraLauncher diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateDataBackgroundCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateDataBackgroundCmd.java index 505a9a7abc..d2110e35f6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateDataBackgroundCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateDataBackgroundCmd.java @@ -31,7 +31,7 @@ import ghidra.util.task.TaskMonitor; * in the area will be replaced with the new dataType, except when the existing data * or the given dataType is a pointer. If the existing dataType is a pointer, then * it will be changed into a pointer to the given dataType. If the given dataType - * is a pointer and the existing data is >= to the size of a pointer, it will become + * is a pointer and the existing data is >= to the size of a pointer, it will become * a pointer to the existing type. If the existing dataType is less than the size * of a pointer, then a pointer to dataType will only be created if there are * enough undefined bytes following to make a pointer. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateDataCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateDataCmd.java index 4fec00418b..89245ff379 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateDataCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/data/CreateDataCmd.java @@ -31,7 +31,7 @@ import ghidra.program.model.listing.Program; * the existing data will be changed into a pointer to the given dataType. If the given dataType * is a default-pointer, it will become a pointer to the existing type. * - * @see DataUtilities#createData(Program, Address, DataType, boolean, ghidra.program.model.data.DataUtilities.ClearDataMode) + * @see DataUtilities#createData(Program, Address, DataType, int, boolean, DataUtilities.ClearDataMode) */ public class CreateDataCmd implements Command { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/ArmDisassembleCommand.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/ArmDisassembleCommand.java index bd9d87f997..5969c4901a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/ArmDisassembleCommand.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/ArmDisassembleCommand.java @@ -48,9 +48,8 @@ public class ArmDisassembleCommand extends DisassembleCommand { } /** - * Constructor for DisassembleCommand. - * @param startSet set of addresses to be the start of a disassembly. The - * Command object will attempt to start a disassembly at each address in this set. + * Constructor for ArmDisassembleCommand. + * @param start address to be the start of a disassembly. * @param restrictedSet addresses that can be disassembled. * a null set implies no restrictions * @param thumbMode pass true if the disassembling in Thumb Mode @@ -70,10 +69,6 @@ public class ArmDisassembleCommand extends DisassembleCommand { throw new UnsupportedOperationException(); } - /** - * - * @see ghidra.framework.cmd.BackgroundCommand#applyTo(ghidra.framework.model.DomainObject, ghidra.util.task.TaskMonitor) - */ @Override synchronized public boolean applyTo(DomainObject obj, TaskMonitor monitor) { Program program = (Program) obj; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/DisassembleCommand.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/DisassembleCommand.java index ec01adebb2..1c7925d011 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/DisassembleCommand.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/DisassembleCommand.java @@ -110,7 +110,7 @@ public class DisassembleCommand extends BackgroundCommand { * {@link #setSeedContext(DisassemblerContextImpl)} method. * The defaultSeedContext should remain unchanged while disassembler command * is actively running. - * @param contextOverrideValue context override value or null + * @param initialContextValue the initial context value to set or null to clear it */ public void setInitialContext(RegisterValue initialContextValue) { if (initialContextValue != null) { @@ -129,9 +129,6 @@ public class DisassembleCommand extends BackgroundCommand { this.enableAnalysis = enable; } - /** - * @see ghidra.framework.cmd.Command#getStatusMsg() - */ @Override public String getStatusMsg() { if (disassemblyPerformed) { @@ -147,10 +144,6 @@ public class DisassembleCommand extends BackgroundCommand { return "Disassembler requires a start which is an undefined code unit"; } - /** - * - * @see ghidra.framework.cmd.BackgroundCommand#applyTo(ghidra.framework.model.DomainObject, ghidra.util.task.TaskMonitor) - */ @Override synchronized public boolean applyTo(DomainObject obj, TaskMonitor monitor) { Program program = (Program) obj; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/Hcs12DisassembleCommand.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/Hcs12DisassembleCommand.java index df3c1548aa..6dff9cd0c8 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/Hcs12DisassembleCommand.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/Hcs12DisassembleCommand.java @@ -48,9 +48,8 @@ public class Hcs12DisassembleCommand extends DisassembleCommand { } /** - * Constructor for DisassembleCommand. - * @param startSet set of addresses to be the start of a disassembly. The - * Command object will attempt to start a disassembly at each address in this set. + * Constructor for Hcs12DisassembleCommand. + * @param start address to be the start of a disassembly. * @param restrictedSet addresses that can be disassembled. * a null set implies no restrictions * @param xgMode pass true if the disassembling in XGATE Mode @@ -70,10 +69,6 @@ public class Hcs12DisassembleCommand extends DisassembleCommand { throw new UnsupportedOperationException(); } - /** - * - * @see ghidra.framework.cmd.BackgroundCommand#applyTo(ghidra.framework.model.DomainObject, ghidra.util.task.TaskMonitor) - */ @Override synchronized public boolean applyTo(DomainObject obj, TaskMonitor monitor) { Program program = (Program) obj; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/MipsDisassembleCommand.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/MipsDisassembleCommand.java index bb1b0a3085..1dd0740d70 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/MipsDisassembleCommand.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/MipsDisassembleCommand.java @@ -27,7 +27,7 @@ import ghidra.util.exception.CancelledException; import ghidra.util.task.TaskMonitor; /** - * Command object for performing Arm/Thumb disassembly + * Command object for performing Mips disassembly */ public class MipsDisassembleCommand extends DisassembleCommand { @@ -48,9 +48,8 @@ public class MipsDisassembleCommand extends DisassembleCommand { } /** - * Constructor for DisassembleCommand. - * @param startSet set of addresses to be the start of a disassembly. The - * Command object will attempt to start a disassembly at each address in this set. + * Constructor for MipsDisassembleCommand. + * @param start address to be the start of a disassembly. * @param restrictedSet addresses that can be disassembled. * a null set implies no restrictions * @param mips16Mode pass true if the disassembling in mips16e Mode @@ -60,9 +59,6 @@ public class MipsDisassembleCommand extends DisassembleCommand { this.mips16Mode = mips16Mode; } - /** - * @see ghidra.framework.cmd.Command#getName() - */ @Override public String getName() { return "Disassemble " + (mips16Mode ? "Mips16" : "Mips"); @@ -78,10 +74,6 @@ public class MipsDisassembleCommand extends DisassembleCommand { throw new UnsupportedOperationException(); } - /** - * - * @see ghidra.framework.cmd.BackgroundCommand#applyTo(ghidra.framework.model.DomainObject, ghidra.util.task.TaskMonitor) - */ @Override synchronized public boolean applyTo(DomainObject obj, TaskMonitor monitor) { Program program = (Program) obj; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/PowerPCDisassembleCommand.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/PowerPCDisassembleCommand.java index d44cc86ec2..f36aec3509 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/PowerPCDisassembleCommand.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/disassemble/PowerPCDisassembleCommand.java @@ -50,8 +50,7 @@ public class PowerPCDisassembleCommand extends DisassembleCommand { /** * Constructor for PowerPCDisassembleCommand. - * @param startSet set of addresses to be the start of a disassembly. The - * Command object will attempt to start a disassembly at each address in this set. + * @param start address to be the start of a disassembly. * @param restrictedSet addresses that can be disassembled. * a null set implies no restrictions * @param vleMode pass true if the disassembling in PowerISA VLE Mode, otherwise @@ -62,9 +61,6 @@ public class PowerPCDisassembleCommand extends DisassembleCommand { this.vleMode = vleMode; } - /** - * @see ghidra.framework.cmd.Command#getName() - */ @Override public String getName() { return "Disassemble " + (vleMode ? "PPC-VLE" : "PPC"); @@ -80,10 +76,6 @@ public class PowerPCDisassembleCommand extends DisassembleCommand { throw new UnsupportedOperationException(); } - /** - * - * @see ghidra.framework.cmd.BackgroundCommand#applyTo(ghidra.framework.model.DomainObject, ghidra.util.task.TaskMonitor) - */ @Override synchronized public boolean applyTo(DomainObject obj, TaskMonitor monitor) { Program program = (Program) obj; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/ApplyFunctionDataTypesCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/ApplyFunctionDataTypesCmd.java index a017e03481..883a5accdf 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/ApplyFunctionDataTypesCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/ApplyFunctionDataTypesCmd.java @@ -49,11 +49,15 @@ public class ApplyFunctionDataTypesCmd extends BackgroundCommand { * Constructs a new command to apply all function signature data types * in the given data type manager. * - * @param dtm data type manager containing the function signature data types + * @param managers list of data type managers containing the function signature data types * @param set set of addresses containing labels to match against function names. * The addresses must not already be included in the body of any existing function. * If null, all symbols will be processed - * @param source the source of this command + * @param source the source of this command. + * @param alwaysReplace true to always replace the existing function signature with the + * function signature data type. + * @param createBookmarksEnabled true to create a bookmark when a function signature + * has been applied. */ public ApplyFunctionDataTypesCmd(List managers, AddressSetView set, SourceType source, boolean alwaysReplace, boolean createBookmarksEnabled) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CallDepthChangeInfo.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CallDepthChangeInfo.java index 4e4436eea3..979d9142f6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CallDepthChangeInfo.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CallDepthChangeInfo.java @@ -112,7 +112,8 @@ public class CallDepthChangeInfo { /** * Construct a new CallDepthChangeInfo object. - * @param func function to examine + * @param function function to examine + * @param restrictSet set of addresses to restrict flow flowing to. * @param frameReg register that is to have it's depth(value) change tracked * @param monitor monitor used to cancel the operation * @@ -132,8 +133,8 @@ public class CallDepthChangeInfo { * Construct a new CallDepthChangeInfo object. * * @param program program containing the function to examime - * @param restrictedSet set of addresses to restrict flow flowing to. * @param addr address within the function to examine + * @param restrictSet set of addresses to restrict flow flowing to. * @param frameReg register that is to have it's depth(value) change tracked * @param monitor monitor used to cancel the operation * @throws CancelledException @@ -735,13 +736,13 @@ public class CallDepthChangeInfo { return; } - /** - * Checks the indicated function in the program to determine if it is a jump thunk - * through a function pointer. - * @param func the function to check - * @param monitor status monitor for indicating progress and allowing cancel. - * @returntrue if check if this is a jump thunk through a function pointer - */ +// /** +// * Checks the indicated function in the program to determine if it is a jump thunk +// * through a function pointer. +// * @param func the function to check +// * @param monitor status monitor for indicating progress and allowing cancel. +// * @return true if check if this is a jump thunk through a function pointer +// */ // private boolean checkThunk(Function func, TaskMonitor monitor) { // Instruction instr = program.getListing().getInstructionAt(func.getEntryPoint()); // if (instr == null) { @@ -832,16 +833,17 @@ public class CallDepthChangeInfo { } /** - * @param minAddress - * @return + * @param addr the address to get the stack pointer depth at. + * @return the stack pointer depth at the address. */ public int getSPDepth(Address addr) { return getRegDepth(addr, stackReg); } /** - * @param minAddress - * @return + * @param addr the address to get the register depth at. + * @param reg the register to get the depth of. + * @return the depth of the register at the address. */ public int getRegDepth(Address addr, Register reg) { // OK lets CHEAT... @@ -874,8 +876,9 @@ public class CallDepthChangeInfo { } /** - * @param minAddress - * @return + * @param addr the address of the register value to get the representation of. + * @param reg the register to get the representation of. + * @return the string representation of the register value. */ public String getRegValueRepresentation(Address addr, Register reg) { return symEval.getRegisterValueRepresentation(addr, reg); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateFunctionCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateFunctionCmd.java index 36137840e5..abfe214c04 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateFunctionCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateFunctionCmd.java @@ -665,10 +665,11 @@ public class CreateFunctionCmd extends BackgroundCommand { /** * Recompute function body. An open transaction must already exist. * @param program the program the function is in. - * @param function the function to be fixed up. A null function will return false. + * @param func the function to be fixed up. A null function will return false. * @param monitor task monitor - * @return true if successful, false if cancelled or unable to fixup function or + * @return true if successful, false if unable to fixup function or * no function found containing the start address of the indicated instruction + * @throws CancelledException if the function fixup is cancelled. */ public static boolean fixupFunctionBody(Program program, Function func, TaskMonitor monitor) throws CancelledException { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java index a5604ec4a1..4225e5629f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java @@ -64,12 +64,12 @@ public class CreateThunkFunctionCmd extends BackgroundCommand { * converted to a thunk, otherwise an error will result. * @param referencedFunctionAddr the function address to which this thunk refers. If no function * exists at that specified referencedFunctionAddr one will be created per the following scheme: - *
+ * */ public CreateThunkFunctionCmd(Address entry, AddressSetView body, Address referencedFunctionAddr, List
referringThunkAddresses) { @@ -88,12 +88,12 @@ public class CreateThunkFunctionCmd extends BackgroundCommand { * converted to a thunk, otherwise an error will result. * @param referencedFunctionAddr the function address to which this thunk refers. If no function * exists at that specified referencedFunctionAddr one will be created per the following scheme: - *
    - *
  • If referencedFunctionAddr is not contained within a memory block, an external function will + *
      + *
    • If referencedFunctionAddr is not contained within a memory block, an external function will
      * be created (a check will be done to look for an previously defined external location)
    • - *
    • If referencedFunctionAddr corresponds to an instruction, a new function will be + *
    • If referencedFunctionAddr corresponds to an instruction, a new function will be
      * created at that address.
    • - *
+ * */ public CreateThunkFunctionCmd(Address entry, AddressSetView body, Address referencedFunctionAddr) { @@ -113,14 +113,14 @@ public class CreateThunkFunctionCmd extends BackgroundCommand { * converted to a thunk, otherwise an error will result. * @param referencedSymbol the symbol which identifies the intended function to which this thunk refers. * If no function exists at that specified referencedSymbol location, one will be created per the following scheme: - *
    - *
  • If referencedFunctionAddr is not contained within a memory block, an external function will + *
      + *
    • If referencedFunctionAddr is not contained within a memory block, an external function will
      * be created (a check will be done to look for an previously defined external location)
    • - *
    • If referencedFunctionAddr corresponds to an instruction, a new function will be + *
    • If referencedFunctionAddr corresponds to an instruction, a new function will be
      * created at that address.
    • - *
    • If referencedSymbol corresponds to an external CODE symbol, it will be converted to an + *
    • If referencedSymbol corresponds to an external CODE symbol, it will be converted to an
      * external FUNCTION
    • - *
+ * */ public CreateThunkFunctionCmd(Address entry, AddressSetView body, Symbol referencedSymbol) { this(entry, body, (Address) null); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/label/CreateNamespacesCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/label/CreateNamespacesCmd.java index 1b432b6836..3503af1f85 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/label/CreateNamespacesCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/cmd/label/CreateNamespacesCmd.java @@ -31,7 +31,7 @@ import ghidra.util.exception.InvalidInputException; * * Example strings: * *

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/DataTypeArchiveMergeManagerPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/DataTypeArchiveMergeManagerPlugin.java index 3cea1c01ca..174fd613d1 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/DataTypeArchiveMergeManagerPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/DataTypeArchiveMergeManagerPlugin.java @@ -34,17 +34,17 @@ import javax.swing.JComponent; status = PluginStatus.HIDDEN, packageName = CorePluginPackage.NAME, category = PluginCategoryNames.UNMANAGED, - shortDescription = "Program Merge Manager", - description = "Manage merge of Programs" + shortDescription = "DataType Archive Merge Manager", + description = "Manage merge of DataType Archives" ) //@formatter:on public class DataTypeArchiveMergeManagerPlugin extends MergeManagerPlugin { /** - * Constructor for plugin that handles multi-user merge of programs. - * @param tool the tool with the active program to be merged + * Constructor for plugin that handles multi-user merge of data type archives. + * @param tool the tool * @param mergeManager the merge manager that will control the merge process - * @param program the current program + * @param dataTypeArchive the data type archive */ public DataTypeArchiveMergeManagerPlugin( PluginTool tool, DataTypeArchiveMergeManager mergeManager, @@ -68,9 +68,6 @@ public class DataTypeArchiveMergeManagerPlugin extends MergeManagerPlugin { // } } - /* (non-Javadoc) - * @see ghidra.framework.plugintool.Plugin#dispose() - */ @Override protected void dispose() { provider.dispose(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/MergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/MergeManager.java index 0243c02e0c..dc62150d79 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/MergeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/MergeManager.java @@ -606,9 +606,7 @@ public abstract class MergeManager implements DomainObjectMergeManager { /** * Updates the current phase progress area in the default merge panel. - * @param currentProgressPercentage the progress percentage completed for the current phase. - * This should be a value from 0 to 100. - * @param progressMessage a message indicating what is currently occurring in this phase. + * @param description a message describing what is currently occurring in this phase. * Null indicates to use the default message. */ @Override diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/MergeManagerPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/MergeManagerPlugin.java index 0a5ebf7c7c..8a566a347b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/MergeManagerPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/MergeManagerPlugin.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +39,7 @@ public abstract class MergeManagerPlugin extends Plugin implements ProgramaticUs * Constructor for plugin that handles multi-user merge of programs. * @param tool the tool with the active program to be merged * @param mergeManager the merge manager that will control the merge process - * @param program the current program + * @param domainObject the current domain object */ public MergeManagerPlugin(PluginTool tool, MergeManager mergeManager, UndoableDomainObject domainObject) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/ProgramMultiUserMergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/ProgramMultiUserMergeManager.java index 0b373622c7..6d3f657969 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/ProgramMultiUserMergeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/ProgramMultiUserMergeManager.java @@ -233,9 +233,7 @@ public class ProgramMultiUserMergeManager extends MergeManager { /** * Show the listing merge panel. - * @param show true indicates to show the Listing merge panel. - * false indicates show the default component. - * @param goToAddress + * @param goToAddress the address to goto. */ public void showListingMergePanel(final Address goToAddress) { SwingUtilities.invokeLater(() -> { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/datatypes/DataTypeMergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/datatypes/DataTypeMergeManager.java index 01caf5eff8..46d9c9de26 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/datatypes/DataTypeMergeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/datatypes/DataTypeMergeManager.java @@ -1345,7 +1345,7 @@ public class DataTypeMergeManager implements MergeResolver { * Get the resolved data type for either the return type or a variable. * @param id id of FunctionDefinition * @param paramID ID of either the return type or a variable - * @param index >=0 is the index of the variable; <0 means the paramID is + * @param index >=0 is the index of the variable; <0 means the paramID is * the return type * @param resolvedDataTypes hashtable to use for resolving * @return resolved data type or the default data type if the data type diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractFunctionMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractFunctionMerger.java index 64d60a88e9..ed1e53da58 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractFunctionMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractFunctionMerger.java @@ -2316,8 +2316,7 @@ abstract class AbstractFunctionMerger implements ListingMergeConstants { /** * Creates the panel for resolving a conflict due to a variable being removed. - * @param entryPt the function entry point for the function variables. - * @param vars variables from the different programs [0]=Original, [1]=Latest, [2]=My + * @param lvc the local variable conflict * @param monitor status monitor * @return the panel */ @@ -2390,7 +2389,7 @@ abstract class AbstractFunctionMerger implements ListingMergeConstants { /** * Updates the progress message details associated with this phase of the merge. - * @param progressMessage a message indicating what is currently occurring in this phase. + * @param message a message indicating what is currently occurring in this phase. * Null indicates to use the default message. */ protected void updateProgressMessage(String message) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractListingMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractListingMerger.java index 123629a4b1..cf4564a92e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractListingMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/AbstractListingMerger.java @@ -190,7 +190,7 @@ abstract class AbstractListingMerger implements ListingMerger, ListingMergeConst } /** Return an address set that contains all addresses that make up the code - * units containing the indicated address in the LATEST, MY, & ORIGINAL programs. + * units containing the indicated address in the LATEST, MY, and ORIGINAL programs. * @param addr the address * @return the code unit address set */ @@ -199,8 +199,8 @@ abstract class AbstractListingMerger implements ListingMerger, ListingMergeConst } /** Return an address set that contains all addresses that make up the code - * units containing the indicated addresses in the LATEST, MY, & ORIGINAL programs. - * @param addr the addresses + * units containing the indicated addresses in the LATEST, MY, and ORIGINAL programs. + * @param addrs the addresses * @return the code unit address set */ protected AddressSetView getCodeUnitAddressSet(AddressSet addrs) { @@ -332,7 +332,7 @@ abstract class AbstractListingMerger implements ListingMerger, ListingMergeConst /** * Updates the progress bar associated with this phase of the merge. - * Before beginning to auto-merge the totalChanges and changeNum<\code> must be set. + * Before beginning to auto-merge the totalChanges and changeNum must be set. * This method should then be called as changes are made to update the change bar. * This assumes that each change is equivalent in terms of shown progress. * @param increment the number of changes completed relative to the total @@ -353,7 +353,7 @@ abstract class AbstractListingMerger implements ListingMerger, ListingMergeConst /** * Updates the progress message details associated with this phase of the merge. - * @param progressMessage a message indicating what is currently occurring in this phase. + * @param message a message indicating what is currently occurring in this phase. * Null indicates to use the default message. */ protected void updateProgressMessage(String message) { @@ -376,7 +376,7 @@ abstract class AbstractListingMerger implements ListingMerger, ListingMergeConst * phase of the merge. * @param myPercentComplete the progress percentage completed for this merger. * This should be a value from 0 to 100. - * @param progressMessage a message indicating what is currently occurring in this phase. + * @param message a message indicating what is currently occurring in this phase. * Null indicates to use the default message. */ protected void updateProgress(int myPercentComplete, String message) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/CodeUnitMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/CodeUnitMerger.java index 2cdb5b43ef..1a857f9a90 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/CodeUnitMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/CodeUnitMerger.java @@ -45,9 +45,9 @@ import ghidra.util.task.TaskMonitor; * program and the modified program being checked into version control. *
Indirect conflicts include: *

*
Important: This class is intended to be used only for a single program * version merge. It should be constructed, followed by an autoMerge(), and lastly @@ -919,10 +919,10 @@ class CodeUnitMerger extends AbstractListingMerger { if (hasNewData) { Data newData = resultListing.getDataAt(minAddress); String[] settingNames = data.getNames(); - for (int i = 0; i < settingNames.length; i++) { - Object obj = data.getValue(settingNames[i]); + for (String settingName : settingNames) { + Object obj = data.getValue(settingName); if (obj != null) { - newData.setValue(settingNames[i], obj); + newData.setValue(settingName, obj); } } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ConflictPanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ConflictPanel.java index d2a6fbbbc5..ba3d742a07 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ConflictPanel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ConflictPanel.java @@ -53,7 +53,6 @@ public abstract class ConflictPanel extends ChoiceComponent { * row or 0 is returned. * Each button or check box has an associated value that can be bitwise 'OR'ed together * to get the entire choice for the row. - * @param row the row of the conflict resolution table. * @return the choice(s) currently selected. */ public abstract int getUseForAllChoice(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalFunctionMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalFunctionMerger.java index bdf8a1d69c..16b29573bc 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalFunctionMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalFunctionMerger.java @@ -191,14 +191,8 @@ public class ExternalFunctionMerger extends AbstractFunctionMerger implements Li /** * Manages changes and conflicts for externals between the latest versioned * program and the modified program being checked into version control. - * @param mergeManager the top level merge manager for merging a program version. - * @param resultPgm the program to be updated with the result of the merge. - * This is the program that will actually get checked in. - * @param originalPgm the program that was checked out. - * @param latestPgm the latest checked-in version of the program. - * @param myPgm the program requesting to be checked in. - * @param latestChanges the address set of changes between original and latest versioned program. - * @param myChanges the address set of changes between original and my modified program. + * @param listingMergeManager the top level merge manager for merging a program version. + * @param showListingPanel true to show the listing panel. */ public ExternalFunctionMerger(ListingMergeManager listingMergeManager, boolean showListingPanel) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionMerger.java index ecb122fa87..6a0cf86765 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/FunctionMerger.java @@ -1654,7 +1654,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { } /** Return an address set that contains all addresses that make up the code - * units containing the indicated address in the LATEST, MY, & ORIGINAL programs. + * units containing the indicated address in the LATEST, MY, and ORIGINAL programs. * @param addr the address * @return the code unit address set */ @@ -1663,8 +1663,8 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { } /** Return an address set that contains all addresses that make up the code - * units containing the indicated addresses in the LATEST, MY, & ORIGINAL programs. - * @param addr the addresses + * units containing the indicated addresses in the LATEST, MY, and ORIGINAL programs. + * @param addrs the addresses * @return the code unit address set */ protected AddressSetView getCodeUnitAddressSet(AddressSet addrs) { @@ -1762,7 +1762,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { /** * Updates the progress bar associated with this phase of the merge. - * Before beginning to auto-merge the totalChanges and changeNum<\code> must be set. + * Before beginning to auto-merge the totalChanges and changeNum must be set. * This method should then be called as changes are made to update the change bar. * This assumes that each change is equivalent in terms of shown progress. * @param increment the number of changes completed relative to the total @@ -1797,7 +1797,7 @@ class FunctionMerger extends AbstractFunctionMerger implements ListingMerger { * phase of the merge. * @param myPercentComplete the progress percentage completed for this merger. * This should be a value from 0 to 100. - * @param progressMessage a message indicating what is currently occurring in this phase. + * @param message a message indicating what is currently occurring in this phase. * Null indicates to use the default message. */ protected void updateProgress(int myPercentComplete, String message) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ListingMergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ListingMergeManager.java index ed3a329488..213722ba38 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ListingMergeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ListingMergeManager.java @@ -42,7 +42,7 @@ import ghidra.util.task.TaskMonitor; *
  • functions
  • *
  • symbols
  • *
  • references [memory, stack, and external]
  • - *
  • comments [plate, pre, end-of-line, repeatable, and post]/li> + *
  • comments [plate, pre, end-of-line, repeatable, and post]
  • *
  • properties
  • *
  • bookmarks
  • * diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ListingMerger.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ListingMerger.java index b4ac4b310d..fead6fdd36 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ListingMerger.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ListingMerger.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,10 +34,10 @@ interface ListingMerger { * Performs the automatic merge for all changes in my Checked Out program version. * It also determines the conflicts requiring manual resolution. * @param monitor task monitor for informing the user of progress. - * @param progressMin minimum progress value, between 0 & 100, for this auto merge. + * @param progressMin minimum progress value, between 0 and 100, for this auto merge. * The merge manager's progress should be updated from progressMin to progressMax * as the autoMerge occurs. - * @param progressMax maximum progress value, between 0 & 100, for this auto merge. + * @param progressMax maximum progress value, between 0 and 100, for this auto merge. * @throws ProgramConflictException if the programs for different versions are not compatible. * @throws MemoryAccessException if memory can't be accessed to get/set byte values. * @throws CancelledException if the user cancels the merge. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanel.java index 92ff43db38..7786c510cc 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanel.java @@ -364,7 +364,8 @@ public class ListingMergePanel extends JPanel } /** - * @param navigator + * Adds a button press listener. + * @param listener the listener to add. */ public void addButtonPressedListener(ButtonPressedListener listener) { for (ListingPanel listingPanel : listingPanels) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanelPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanelPlugin.java index 68e7e4c731..e17a7fd63b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanelPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanelPlugin.java @@ -42,7 +42,7 @@ public class ListingMergePanelPlugin extends Plugin implements ProgramaticUseOnl /** * Constructor * @param tool merge tool - * @param mergeManager merge manager + * @param mergePanel merge panel */ public ListingMergePanelPlugin(PluginTool tool, ListingMergePanel mergePanel) { super(tool); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tree/ProgramTreeMergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tree/ProgramTreeMergeManager.java index 134efb6151..fe0cc8a660 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tree/ProgramTreeMergeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tree/ProgramTreeMergeManager.java @@ -15,6 +15,11 @@ */ package ghidra.app.merge.tree; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; + +import javax.swing.SwingUtilities; + import ghidra.app.merge.MergeResolver; import ghidra.app.merge.ProgramMultiUserMergeManager; import ghidra.app.util.HelpTopics; @@ -26,11 +31,6 @@ import ghidra.util.SystemUtilities; import ghidra.util.exception.*; import ghidra.util.task.TaskMonitor; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; - -import javax.swing.SwingUtilities; - /** * Manages changes and conflicts between the latest versioned Program and the * Program that is being checked into version control. @@ -73,6 +73,7 @@ public class ProgramTreeMergeManager implements MergeResolver { /** * Construct a new manager for merging trees + * @param mergeManager the program merge manager * @param resultProgram latest version of the Program that is the * destination for changes applied from the source program * @param myProgram source of changes to apply to the destination @@ -82,7 +83,6 @@ public class ProgramTreeMergeManager implements MergeResolver { * resultProgram and latestProgram start out as being identical * @param latestChangeSet change set of the destination program * @param myChangeSet change set for the source program - * @param monitor */ public ProgramTreeMergeManager(ProgramMultiUserMergeManager mergeManager, Program resultProgram, Program myProgram, Program originalProgram, @@ -153,15 +153,15 @@ public class ProgramTreeMergeManager implements MergeResolver { mergeManager.updateProgress(0, "Program Tree Merge is processing IDs changed in Checked Out..."); ArrayList changeList = new ArrayList(); - for (int i = 0; i < myChangeIDs.length; i++) { - changeList.add(new Long(myChangeIDs[i])); + for (long myChangeID : myChangeIDs) { + changeList.add(new Long(myChangeID)); } mergeManager.updateProgress(10, "Program Tree Merge is processing IDs added in Checked Out..."); ArrayList myAddedList = new ArrayList(); - for (int i = 0; i < myIDsAdded.length; i++) { - myAddedList.add(new Long(myIDsAdded[i])); + for (long element : myIDsAdded) { + myAddedList.add(new Long(element)); } mergeManager.updateProgress(20, "Program Tree Merge is eliminating removed IDs..."); @@ -170,16 +170,16 @@ public class ProgramTreeMergeManager implements MergeResolver { mergeManager.updateProgress(30, "Program Tree Merge is processing IDs added in Latest..."); ArrayList latestAddedList = new ArrayList(); - for (int i = 0; i < latestIDsAdded.length; i++) { - latestAddedList.add(new Long(latestIDsAdded[i])); + for (long element : latestIDsAdded) { + latestAddedList.add(new Long(element)); } conflictsChangeList = new ArrayList(changeList); mergeManager.updateProgress(40, "Program Tree Merge is processing change IDs..."); ArrayList latestChangeList = new ArrayList(); - for (int i = 0; i < latestChangeIDs.length; i++) { - latestChangeList.add(new Long(latestChangeIDs[i])); + for (long latestChangeID : latestChangeIDs) { + latestChangeList.add(new Long(latestChangeID)); } mergeManager.updateProgress(50, @@ -229,12 +229,12 @@ public class ProgramTreeMergeManager implements MergeResolver { private void applyAdditions(ArrayList myList) throws CancelledException { // add new trees - for (int i = 0; i < myList.size(); i++) { + for (Long element : myList) { if (currentMonitor.isCancelled()) { throw new CancelledException(); } currentMonitor.setProgress(++progressIndex); - long treeID = myList.get(i).longValue(); + long treeID = element.longValue(); ProgramModule sourceRoot = myListing.getRootModule(treeID); if (sourceRoot != null) { createTree(resultListing, getUniqueTreeName(sourceRoot.getTreeName()), sourceRoot); @@ -272,13 +272,13 @@ public class ProgramTreeMergeManager implements MergeResolver { */ private void applyChanges(ArrayList changeList) throws CancelledException { - for (int i = 0; i < changeList.size(); i++) { + for (Long element : changeList) { if (currentMonitor.isCancelled()) { throw new CancelledException(); } currentMonitor.setProgress(++progressIndex); - long treeID = changeList.get(i).longValue(); + long treeID = element.longValue(); ProgramModule sourceRoot = myListing.getRootModule(treeID); ProgramModule destRoot = resultListing.getRootModule(treeID); @@ -375,8 +375,8 @@ public class ProgramTreeMergeManager implements MergeResolver { removeEmptyFragments(root, fragmentNameList); // remove the fragments that were created by default - for (int i = 0; i < names.length; i++) { - root.removeChild(names[i]); + for (String name : names) { + root.removeChild(name); } return root.getTreeID(); } @@ -390,9 +390,9 @@ public class ProgramTreeMergeManager implements MergeResolver { private void removeEmptyFragments(ProgramModule module, ArrayList fragmentNameList) { Group[] groups = module.getChildren(); - for (int i = 0; i < groups.length; i++) { - if (groups[i] instanceof ProgramFragment) { - String name = groups[i].getName(); + for (Group group : groups) { + if (group instanceof ProgramFragment) { + String name = group.getName(); if (!fragmentNameList.contains(name)) { try { module.removeChild(name); @@ -403,7 +403,7 @@ public class ProgramTreeMergeManager implements MergeResolver { } } else { - removeEmptyFragments((ProgramModule) groups[i], fragmentNameList); + removeEmptyFragments((ProgramModule) group, fragmentNameList); } } } @@ -413,16 +413,16 @@ public class ProgramTreeMergeManager implements MergeResolver { parent.setComment(sourceParent.getComment()); Group[] kids = sourceParent.getChildren(); - for (int i = 0; i < kids.length; i++) { + for (Group kid : kids) { if (currentMonitor.isCancelled()) { return; } - String name = kids[i].getName(); - if (kids[i] instanceof ProgramModule) { - createModule(parent, name, (ProgramModule) kids[i], fragmentNameList); + String name = kid.getName(); + if (kid instanceof ProgramModule) { + createModule(parent, name, (ProgramModule) kid, fragmentNameList); } else { - createFragment(parent, name, (ProgramFragment) kids[i], fragmentNameList); + createFragment(parent, name, (ProgramFragment) kid, fragmentNameList); } } } @@ -477,8 +477,7 @@ public class ProgramTreeMergeManager implements MergeResolver { while (iter.hasNext()) { list.add(iter.next()); } - for (int i = 0; i < list.size(); i++) { - AddressRange range = list.get(i); + for (AddressRange range : list) { try { newFrag.move(range.getMinAddress(), range.getMaxAddress()); } @@ -592,9 +591,9 @@ public class ProgramTreeMergeManager implements MergeResolver { /** * Covers case 6: dest content changed, source content changed; - * case 7: dest name change & content changed, source name changed & content changed - * case 8: dest name & content changed, source content changed - * case 9: dest content changed, source name & content changed + * case 7: dest name change and content changed, source name changed and content changed + * case 8: dest name and content changed, source content changed + * case 9: dest content changed, source name and content changed * @throws CancelledException */ private void keepOtherOrCreateTree(ProgramModule origRoot, ProgramModule sourceRoot, ProgramModule destRoot, @@ -738,7 +737,7 @@ public class ProgramTreeMergeManager implements MergeResolver { } /** - * Case 4: destination Name & content changed, source name changed + * Case 4: destination Name and content changed, source name changed * @param sourceRoot source root module * @param sourceTreeName source tree name * @param destTreeName destination tree name @@ -793,7 +792,7 @@ public class ProgramTreeMergeManager implements MergeResolver { } /** - * Case 5: destination Name changed, source name & content changed + * Case 5: destination Name changed, source name and content changed * @param sourceRoot source root module * @param sourceTreeName source tree name * @param destTreeName destination tree name diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/util/ConflictUtility.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/util/ConflictUtility.java index 048c7adc78..327285bad2 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/util/ConflictUtility.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/util/ConflictUtility.java @@ -164,7 +164,7 @@ public class ConflictUtility { * Creates a standard address set conflict count message. This indicates * which address or address range with conflicts you are resolving of some * total number of addresses or address ranges with conflicts. - * @param caddressNum the current conflicting address number. + * @param addressNum the current conflicting address number. * @param totalAddresses the total number of conflicting addresses. * @param isRange true if the current conflict is for an address range. * @return the message string containing HTML tags. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/ProgramPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/ProgramPlugin.java index 6ac696bde7..6bfd35f9d5 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/ProgramPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/ProgramPlugin.java @@ -34,20 +34,24 @@ import ghidra.program.util.ProgramSelection; *

    * Subclasses should override the following methods if they are interested * in the corresponding events: + *

      *
    • programOpened(Program) *
    • programClosed(Program) *
    • locationChanged(ProgramLocation) *
    • selectionChanged(ProgramSelection) *
    • highlightChanged(ProgramSelection) *
    • + *
    *
    * This class will handle the enablement and add to popup state for * plugin actions when subclasses call any of the following methods: + *
      *
    • enableOnHighlight(PluginAction) *
    • enableOnLocation(PluginAction) *
    • enableOnProgram(PluginAction) *
    • enableOnSelection(PluginAction) *
    • + *
    * */ public abstract class ProgramPlugin extends Plugin { @@ -63,7 +67,6 @@ public abstract class ProgramPlugin extends Plugin { /** * Constructs a new program plugin - * @param name plugin name the name of this plugin * @param plugintool tool the parent tool for this plugin * @param consumeLocationChange true if this plugin should consume ProgramLocation events * @param consumeSelectionChange true if this plugin should consume ProgramSelection events diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisBackgroundCommand.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisBackgroundCommand.java index 6aac512f80..120e48a727 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisBackgroundCommand.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisBackgroundCommand.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,10 +39,10 @@ public class AnalysisBackgroundCommand extends MergeableBackgroundCommand { private boolean markAsAnalyzed; /** - * When command is called, call this analyzer with the given address set + * Background Command to perform Auto Analysis on a program. * - * @param analyzer the analyzer to call - * @param set the set to pass to the analyzer + * @param mgr the program's AutoAnalysisManager. + * @param markAsAnalyzed true to set the analyzed flag after analysis. */ public AnalysisBackgroundCommand(AutoAnalysisManager mgr, boolean markAsAnalyzed) { super("Auto Analysis", true, true, false); @@ -51,9 +50,6 @@ public class AnalysisBackgroundCommand extends MergeableBackgroundCommand { this.markAsAnalyzed = markAsAnalyzed; } - /* (non-Javadoc) - * @see ghidra.framework.cmd.BackgroundCommand#applyTo(ghidra.framework.model.DomainObject, ghidra.util.task.TaskMonitor) - */ @Override public boolean applyTo(DomainObject obj, TaskMonitor monitor) { if (markAsAnalyzed) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/archive/ArchiveDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/archive/ArchiveDialog.java index 286e53ec77..266649b249 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/archive/ArchiveDialog.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/archive/ArchiveDialog.java @@ -70,7 +70,7 @@ public class ArchiveDialog extends DialogComponentProvider { /** * Define the Main panel for the dialog here. - * @return JPanel the completed Main Panel<\CODE> + * @return JPanel the completed Main Panel */ protected JPanel buildMainPanel() { GridBagLayout gbl = new GridBagLayout(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/assembler/AssembleDockingAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/assembler/AssembleDockingAction.java index 8b28af6e7c..ae4d8a1384 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/assembler/AssembleDockingAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/assembler/AssembleDockingAction.java @@ -217,7 +217,7 @@ public class AssembleDockingAction extends DockingAction { } /** - * Retrieve the location in the code viewer's {@link FieldPane} for the field at the given + * Retrieve the location in the code viewer's {@link FieldPanel} for the field at the given * address having the given header text * @param addr the address * @param fieldName the name of the field diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/assembler/AssemblyDualTextField.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/assembler/AssemblyDualTextField.java index 796976b179..9a636717d3 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/assembler/AssemblyDualTextField.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/assembler/AssemblyDualTextField.java @@ -208,7 +208,7 @@ public class AssemblyDualTextField { /** * Represents the description of an error encountered during parsing or assembling - * @note not used until error descriptions improve + * NOTE: not used until error descriptions improve */ static class AssemblyError extends AssemblyCompletion { private String text; @@ -488,7 +488,7 @@ public class AssemblyDualTextField { /** * Set the visibility of the text box(es) - * @param determines whether both are hidden, the dual variant is shown, or the single variant is shown. + * @param visibility the VisibilityMode to set. */ public void setVisible(VisibilityMode visibility) { switch (visibility) { @@ -510,7 +510,7 @@ public class AssemblyDualTextField { /** * Add a focus listener to the box(es) * - * @note The listener will not fire when focus passes among the linked boxes of the dual variant. + * NOTE: The listener will not fire when focus passes among the linked boxes of the dual variant. * @param listener the listener */ public void addFocusListener(FocusListener listener) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/blockmodel/BlockModelServicePlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/blockmodel/BlockModelServicePlugin.java index 196551dc82..8676814e11 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/blockmodel/BlockModelServicePlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/blockmodel/BlockModelServicePlugin.java @@ -81,10 +81,6 @@ public class BlockModelServicePlugin extends ProgramPlugin private StringWithChoicesEditor editor; - /** - * Constructor. - * @param plugintool tool - */ public BlockModelServicePlugin(PluginTool tool) { super(tool, false, false); @@ -128,9 +124,8 @@ public class BlockModelServicePlugin extends ProgramPlugin /** * Handle an option change - * @param options options object containing the property that changed - * @param group - * @param name name of option that changed + * @param newOptions options object containing the property that changed + * @param optionName name of option that changed * @param oldValue old value of the option * @param newValue new value of the option */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkDeleteCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkDeleteCmd.java index 4a05fdc7e2..2d439ad88b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkDeleteCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkDeleteCmd.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -162,9 +161,6 @@ public class BookmarkDeleteCmd implements Command { return presentationName; } - /** - * @see ghidra.framework.cmd.Command#applyTo(ghidra.framework.plugintool.PluginTool, ghidra.framework.model.DomainObject) - */ @Override public boolean applyTo(DomainObject obj) { @@ -244,17 +240,11 @@ public class BookmarkDeleteCmd implements Command { } } - /** - * @see ghidra.framework.cmd.Command#getStatusMsg() - */ @Override public String getStatusMsg() { return null; } - /** - * @see ghidra.framework.cmd.Command#getName() - */ @Override public String getName() { return presentationName; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkEditCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkEditCmd.java index 292b840677..7228df8b16 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkEditCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/bookmark/BookmarkEditCmd.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,10 +42,12 @@ public class BookmarkEditCmd implements Command { private String presentationName; /** - * Set a Bookmark. When setting a bookmark, all fields are used except the address + * Edit a Bookmark. When editing a bookmark, all fields are used except the address * which is determined by the first address within each range of the set. - * @param template bookmark template - * @param set list off bookmark addresses + * @param set list of bookmark addresses. + * @param type the bookmark type. + * @param category the bookmark category. + * @param comment the bookmark comment. */ public BookmarkEditCmd(AddressSetView set, String type, String category, String comment) { this.type = type; @@ -59,10 +60,12 @@ public class BookmarkEditCmd implements Command { } /** - * Set a Bookmark. When setting a bookmark, all fields are used except the address + * Edit a Bookmark. When editing a bookmark, all fields are used except the address * which is provided by the addrs parameter. - * @param template bookmark template - * @param set list off bookmark addresses + * @param addr the bookmark address. + * @param type the bookmark type. + * @param category the bookmark category. + * @param comment the bookmark comment. */ public BookmarkEditCmd(Address addr, String type, String category, String comment) { this.type = type; @@ -90,9 +93,7 @@ public class BookmarkEditCmd implements Command { return presentationName; } - /** - * @see ghidra.framework.cmd.Command#applyTo(ghidra.framework.plugintool.PluginTool, ghidra.framework.model.DomainObject) - */ + @Override public boolean applyTo(DomainObject obj) { BookmarkManager mgr = ((Program) obj).getBookmarkManager(); @@ -113,16 +114,12 @@ public class BookmarkEditCmd implements Command { return true; } - /** - * @see ghidra.framework.cmd.Command#getStatusMsg() - */ + @Override public String getStatusMsg() { return null; } - /** - * @see ghidra.framework.cmd.Command#getName() - */ + @Override public String getName() { return presentationName; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearCmd.java index 6c92e7f514..9f9f37f338 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearCmd.java @@ -63,7 +63,6 @@ public class ClearCmd extends BackgroundCommand { * use {@link #ClearCmd(AddressSetView,ClearOptions)}. * * @param view the addresses over which to clear - * @param options the options used while clearing */ public ClearCmd(AddressSetView view) { this(view, null, view.getNumAddresses() < EVENT_LIMIT); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearFlowAndRepairCmd.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearFlowAndRepairCmd.java index f38a40b6f0..2e717c0796 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearFlowAndRepairCmd.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearFlowAndRepairCmd.java @@ -71,9 +71,6 @@ public class ClearFlowAndRepairCmd extends BackgroundCommand { this.repairFunctions = repair; } - /** - * @see ghidra.framework.cmd.BackgroundCommand#applyTo(ghidra.framework.plugintool.PluginTool, ghidra.framework.model.DomainObject, ghidra.util.task.TaskMonitor) - */ @Override public boolean applyTo(DomainObject obj, TaskMonitor monitor) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/colorizer/ColorizingService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/colorizer/ColorizingService.java index ec050c99a7..d850e5886c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/colorizer/ColorizingService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/colorizer/ColorizingService.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -75,7 +74,7 @@ public interface ColorizingService { * @param set The address at which the given color will be applied * @param color The color to apply * - * @see #clearBackgroundColor(AddressSetView)) + * @see #clearBackgroundColor(AddressSetView) * @see #getBackgroundColor(Address) */ public void setBackgroundColor(AddressSetView set, Color color); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorPanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorPanel.java index 7bdafa4d5c..49d38b4bc3 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorPanel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorPanel.java @@ -839,11 +839,11 @@ public abstract class CompositeEditorPanel extends JPanel /** * Get the drag actions supported by this drag source: - *
      + *
        *
      • DnDConstants.ACTION_MOVE *
      • DnDConstants.ACTION_COPY *
      • DnDConstants.ACTION_COPY_OR_MOVE - *
      • + *
      * * @return the drag actions */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/archive/ArchiveManagerListener.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/archive/ArchiveManagerListener.java index 116fb42391..e5a913ec8c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/archive/ArchiveManagerListener.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/archive/ArchiveManagerListener.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +15,8 @@ */ package ghidra.app.plugin.core.datamgr.archive; +import ghidra.program.model.data.DataTypeManager; + public interface ArchiveManagerListener { /** * Called when a new Archive is opened. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/DisassembledViewPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/DisassembledViewPlugin.java index 22bdcd9bdb..a3efa81be4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/DisassembledViewPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/DisassembledViewPlugin.java @@ -53,13 +53,13 @@ import ghidra.util.exception.UsrException; * * * - * @todo Change the PseudoCodeUnit's getComment(int) method or change its + * TODO Change the PseudoCodeUnit's getComment(int) method or change its * getPreview(int) method not to call getComment(int) and then change * this class to not handle the UnsupportedOperationException. - * @todo are the category and names correct? - * @todo decide how to represent multiple selections in the display + * TODO are the category and names correct? + * TODO decide how to represent multiple selections in the display * - * @todo Potential user options: + * TODO Potential user options: * -look ahead count * -to or to not display multiple selections * -change the format of the preview displayed diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/processors/InstructionInfoProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/processors/InstructionInfoProvider.java index 71d15fc0e5..ebae3d0006 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/processors/InstructionInfoProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/processors/InstructionInfoProvider.java @@ -92,7 +92,7 @@ class InstructionInfoProvider extends ComponentProviderAdapter implements Domain /** * Define the Main panel. * - * @return JPanel the completed Main Panel<\CODE> + * @return JPanel the completed Main Panel */ protected JPanel buildMainPanel(boolean isDynamic) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/mask/MnemonicSearchPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/mask/MnemonicSearchPlugin.java index d0f80cf3ac..0450d887ba 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/mask/MnemonicSearchPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/mask/MnemonicSearchPlugin.java @@ -77,7 +77,7 @@ public class MnemonicSearchPlugin extends Plugin { /** * Retrieves the selection region from the program, builds the search string, and pops - * up the @{link MemSearchDialog}. + * up the {@link MemSearchDialog}. * * @param context * @param useOps diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/flow/SelectByFlowPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/flow/SelectByFlowPlugin.java index 24545e34db..637779c8fa 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/flow/SelectByFlowPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/flow/SelectByFlowPlugin.java @@ -49,14 +49,16 @@ import docking.action.MenuData; * tool. Selection is based on the initial selection or if there is no selection * then on where the cursor is located in the program.
      * This plugin provides the following types of selection:
      - *
        Select by following the flow from the specified address(es) onward. - * Properties indicate whether or not CALLS or JUMPS should be followed.
      - *
        Select the subroutine(s) for the specified address(es).
      - *
        Select the function(s) for the specified address(es).
      - *
        Select dead subroutine(s) for the specified address(es).
      - *
        Select the current program changes.
      - *
        Select by following the flow to the specified address(es). - * Properties indicate whether or not CALLS or JUMPS should be followed.
      + *
        + *
      • Select by following the flow from the specified address(es) onward. + * Properties indicate whether or not CALLS or JUMPS should be followed.
      • + *
      • Select the subroutine(s) for the specified address(es).
      • + *
      • Select the function(s) for the specified address(es).
      • + *
      • Select dead subroutine(s) for the specified address(es).
      • + *
      • Select the current program changes.
      • + *
      • Select by following the flow to the specified address(es). + * Properties indicate whether or not CALLS or JUMPS should be followed.
      • + *
      */ //@formatter:off @PluginInfo( diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringTableModel.java index 583f7aa42d..addd2a92ad 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringTableModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringTableModel.java @@ -32,7 +32,7 @@ import ghidra.util.table.field.*; import ghidra.util.task.TaskMonitor; /** - * Table model for the Search -> For Strings... result dialog. + * Table model for the Search -> For Strings... result dialog. *

      */ public class StringTableModel extends AddressBasedTableModel { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringTableProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringTableProvider.java index ba0b00e4e6..b5d570b15d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringTableProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringTableProvider.java @@ -52,7 +52,7 @@ import ghidra.util.task.TaskLauncher; import resources.ResourceManager; /** - * Component provider for the Search -> For Strings... result dialog. + * Component provider for the Search -> For Strings... result dialog. */ public class StringTableProvider extends ComponentProviderAdapter implements DomainObjectListener { private static final ImageIcon ICON = ResourceManager.loadImage("images/kmessedwords.png"); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/actions/EditExternalLocationAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/actions/EditExternalLocationAction.java index 8dd15feeed..f2d96ee40d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/actions/EditExternalLocationAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symboltree/actions/EditExternalLocationAction.java @@ -40,8 +40,6 @@ public class EditExternalLocationAction extends DockingAction { * Creates the action for editing an existing external location or external function in the * symbol tree. * @param plugin the symbol tree plugin, which owns this action. - * @param contextClass context class specific to plugin to be used to differentiate - * ProgramSymbolActionContext instances. */ public EditExternalLocationAction(Plugin plugin) { super("Edit External Location", plugin.getName()); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java index 1f486a8a40..d100c85bc6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java @@ -73,7 +73,7 @@ import ghidra.util.table.AddressSetTableModel; import ghidra.util.task.TaskMonitor; /** - *

      Ghidra Script Development.

      + *

      Ghidra Script Development.

      * In order to write a script: *
        *
      1. Ghidra script must be written in Java.
      2. @@ -96,11 +96,11 @@ import ghidra.util.task.TaskMonitor; * } * } * - *

        Ghidra Script State

        + *

        Ghidra Script State

        *
        *

        * All scripts, when run, will be handed the current state in the form of class - * instance variable. These variables are:

        + * instance variable. These variables are: *
          *
        1. currentProgram: the active program
        2. *
        3. currentAddress: the address of the current cursor location in the tool
        4. @@ -113,7 +113,7 @@ import ghidra.util.task.TaskMonitor; *
        *
        * - *

        Hello World Example

        + *

        Hello World Example

        * This example, when run, will simply print "Hello World" into the Ghidra console. *
          * 	public class HelloWorldScript extends GhidraScript {
        @@ -957,16 +957,15 @@ public abstract class GhidraScript extends FlatProgramAPI {
         	 * 

        * For examples, see the included FormatExampleScript. *

        - * Note: This method will not: + * Note: This method will not: *

          - *
        • print out the name of the script, as does {@link #println(String)}
        • - *
        • print a newline
        • + *
        • print out the name of the script, as does {@link #println(String)}
        • + *
        • print a newline
        • *
        - * * If you would like the name of the script to precede you message, then you must add that * yourself. The {@link #println(String)} does this via the following code: *
        -	 *     String messageWithSource = getScriptName() + "> " + message;
        +	 *     String messageWithSource = getScriptName() + "> " + message;
         	 * 
        * * @param message the message to format @@ -992,7 +991,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * If you would like the name of the script to precede you message, then you must add that * yourself. The {@link #println(String)} does this via the following code: *
        -	 *     String messageWithSource = getScriptName() + "> " + message;
        +	 *     String messageWithSource = getScriptName() + "> " + message;
         	 * 
        * * @param message the message to print @@ -2002,7 +2001,6 @@ public abstract class GhidraScript extends FlatProgramAPI { * invalid or missing .properties value. * *
      - *

      * * @param title the title of the dialog (in GUI mode) or the first part of the variable name * (in headless mode or when using using .properties file) @@ -2085,7 +2083,6 @@ public abstract class GhidraScript extends FlatProgramAPI { * the .properties value (if it exists), or throws an Exception if there is an invalid * or missing .properties value. * - *

      * * @param title the title of the dialog (in GUI mode) or the first part of the variable name * (in headless mode or when using .properties file) @@ -2193,7 +2190,6 @@ public abstract class GhidraScript extends FlatProgramAPI { * representing the .properties value (if it exists), or throws an Exception if there * is an invalid or missing .properties value. * - *

      * @param title the title of the dialog (in GUI mode) or the first part of the variable name * (in headless mode or when using .properties file) * @param approveButtonText the approve button text (in GUI mode - typically, this would be @@ -2280,7 +2276,6 @@ public abstract class GhidraScript extends FlatProgramAPI { * project, then that value is returned. Otherwise, an Exception is thrown if there is * an invalid or missing .properties value. * - *

      * * @param title the title of the dialog (GUI) or the variable name (headless or when * using .properties file) @@ -2359,7 +2354,6 @@ public abstract class GhidraScript extends FlatProgramAPI { * or missing .properties value. * * - *

      * * @param title the title of the dialog (in GUI mode) or the first part of the variable name * (in headless mode or when using .properties file) @@ -2439,7 +2433,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * .properties value (if it exists), or throws an Exception if there is an invalid or * missing .properties value. * - *

      + * * * @param title the title of the dialog (in GUI mode) or the first part of the variable name * (in headless mode or when using .properties file) @@ -2512,7 +2506,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * .properties value (if it exists), or throws an Exception if there is an invalid or * missing .properties value. * - *

      + * * * @param title the title of the dialog (in GUI mode) or the first part of the variable name * (in headless mode or when using .properties file) @@ -2586,7 +2580,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * .properties byte pattern value (if it exists), or throws an Exception if there is * an invalid or missing .properties value. * - *

      + * * * @param title the title of the dialog (in GUI mode) or the first part of the variable * name (in headless mode or when using .properties file) @@ -2645,7 +2639,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * then that value is returned. Otherwise, an Exception is thrown if there is an * invalid or missing .properties value. * - *

      + * * * @param title the title of the pop-up dialog (in GUI mode) or the variable name (in * headless mode) @@ -2740,7 +2734,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * then that value is returned. Otherwise, an Exception is thrown if there is an invalid * or missing .properties value. * - *

      + * * @param title the title of the pop-up dialog (in GUI mode) or the variable name (in headless * mode or when using .properties file) * @throws IllegalArgumentException if in headless mode, there was a missing or invalid domain @@ -2824,10 +2818,9 @@ public abstract class GhidraScript extends FlatProgramAPI { * .properties value (if it exists), or throws an Exception if there is an invalid or * missing .properties value. * - *

      *

      * Note that in both headless and GUI modes, you may specify "PI" or "E" and get the - * corresponding floating point value to 15 decimal places.

      + * corresponding floating point value to 15 decimal places. *

      * * @param title the title of the dialog (in GUI mode) or the first part of the variable name @@ -2887,7 +2880,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * .properties value (if it exists), or throws an Exception if there is an invalid or * missing .properties value. * - *

      + * * * @param title the title of the dialog (in GUI mode) or the first part of the variable name * (in headless mode or when using .properties file) @@ -2930,7 +2923,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * not null or an empty String, it is returned. In all other cases, an exception * is thrown. * - *

      + * * * @param title the title of the dialog (in GUI mode) or the first part of the variable name * (in headless mode or when using .properties file) @@ -3004,7 +2997,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * .properties value (if it exists and is a valid choice), or throws an Exception if * there is an invalid or missing .properties value. * - *

      + * * @param title the title of the dialog (in GUI mode) or the first part of the variable name * (in headless mode or when using .properties file) * @param message the message to display next to the input field (in GUI mode) or the second @@ -3130,7 +3123,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * by searching for a property name equal to a space-separated concatenation of the * String parameters (title + " " + message). If that property name exists and * represents a list (one or more) of valid choice(s) in the form - * "choice1;choice2;choice3;..." (<-- note the quotes surrounding the choices), then + * "choice1;choice2;choice3;..." (<-- note the quotes surrounding the choices), then * an Object array of those choices is returned. Otherwise, an Exception is thrown if * there is an invalid or missing .properties value. * @@ -3204,7 +3197,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * by searching for a property name equal to a space-separated concatenation of the * String parameters (title + " " + message). If that property name exists and * represents a list (one or more) of valid choice(s) in the form - * "choice1;choice2;choice3;..." (<-- note the quotes surrounding the choices), then + * "choice1;choice2;choice3;..." (<-- note the quotes surrounding the choices), then * an Object array of those choices is returned. Otherwise, an Exception is thrown if * there is an invalid or missing .properties value. NOTE: the choice names for * this method must match those in the stringRepresentationOfChoices array. @@ -3296,7 +3289,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * then that value is returned. Otherwise, an Exception is thrown if there is an * invalid or missing .properties value. * - *

      + * * * @param title the title of the dialog (in GUI mode) or the first part of the variable name * (in headless mode) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/script/ScriptInfo.java b/Ghidra/Features/Base/src/main/java/ghidra/app/script/ScriptInfo.java index 6447e1984d..b4fa44d1d1 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/script/ScriptInfo.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/script/ScriptInfo.java @@ -370,7 +370,7 @@ public class ScriptInfo { /** * Returns the script menu path as a string. - * For example, "Path1->Path2->Path3". + * For example,{@literal "Path1->Path2->Path3"}. * @return the script menu path as a string */ public String getMenuPathAsString() { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/services/BlockModelService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/services/BlockModelService.java index 331f21f086..7d83ffe6fd 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/services/BlockModelService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/services/BlockModelService.java @@ -93,16 +93,18 @@ public interface BlockModelService { /** * Get new instance of the active Basic Block model for the current program. * @return new Basic Block model instance or null if program is not open. - * @depricated use getActiveBlockModel(Program) instead + * @deprecated use getActiveBlockModel(Program) instead */ + @Deprecated public CodeBlockModel getActiveBlockModel(); /** * Get new instance of the active Basic Block model for the current program. * @param includeExternals externals are included if true * @return new Basic Block model instance or null if program is not open. - * @depricated use getActiveBlockModel(Program, boolean) instead + * @deprecated use getActiveBlockModel(Program, boolean) instead */ + @Deprecated public CodeBlockModel getActiveBlockModel(boolean includeExternals); /** @@ -129,16 +131,18 @@ public interface BlockModelService { /** * Get new instance of the active Subroutine Block model for the current program. * @return new Subroutine Block model instance or null if program is not open - * @depricated use getActiveSubroutineModel(Program) instead + * @deprecated use getActiveSubroutineModel(Program) instead */ + @Deprecated public CodeBlockModel getActiveSubroutineModel(); /** * Get new instance of the active Subroutine Block model for the current program. * @param includeExternals externals are included if true * @return new Subroutine Block model instance or null if program is not open - * @depricated use getActiveSubroutineModel(Program) instead + * @deprecated use getActiveSubroutineModel(Program) instead */ + @Deprecated public CodeBlockModel getActiveSubroutineModel(boolean includeExternals); /** @@ -167,8 +171,9 @@ public interface BlockModelService { * @param modelName name of registered block model * @return new model instance or null if program is not open. * @throws NotFoundException if specified model is not registered - * @depricated use getNewModelByName(String, Program) instead + * @deprecated use getNewModelByName(String, Program) instead */ + @Deprecated public CodeBlockModel getNewModelByName(String modelName) throws NotFoundException; @@ -178,8 +183,9 @@ public interface BlockModelService { * @param includeExternals externals are included if true * @return new model instance or null if program is not open. * @throws NotFoundException if specified model is not registered - * @depricated use getNewModelByName(String, Program, boolean) instead + * @deprecated use getNewModelByName(String, Program, boolean) instead */ + @Deprecated public CodeBlockModel getNewModelByName(String modelName, boolean includeExternals) throws NotFoundException; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/services/ClipboardContentProviderService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/services/ClipboardContentProviderService.java index 303f3bc6ec..1d407a6775 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/services/ClipboardContentProviderService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/services/ClipboardContentProviderService.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,14 +64,14 @@ public interface ClipboardContentProviderService { /** * Return whether the given context is valid for actions on popup menus. - * @param contextObject the context of where the popup menu will be - * positioned + * @param context the context of where the popup menu will be positioned. */ public boolean isValidContext(ActionContext context); + // TODO needs updating. Assumed copyAddToPopup became copy(TaskMonitor monitor) /** * Returns true if copy should be enabled; false if it should be disabled. This method can - * be used in conjunction with {@link #copyAddToPopup()} in order to add menu items to + * be used in conjunction with {@link #copy(TaskMonitor)} in order to add menu items to * popup menus but to have them enabled when appropriate. */ public boolean enableCopy(); @@ -83,9 +82,10 @@ public interface ClipboardContentProviderService { */ public boolean enableCopySpecial(); + // TODO needs updating. Assumed pasteAddToPopup became paste(Transferable pasteData) /** * Returns true if paste should be enabled; false if it should be disabled. This method can - * be used in conjunction with {@link #pasteAddToPopup()} in order to add menu items to + * be used in conjunction with {@link #paste(Transferable)} in order to add menu items to * popup menus but to have them enabled when appropriate. */ public boolean enablePaste(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/services/CodeViewerService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/services/CodeViewerService.java index 68f5ca0177..fff4602394 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/services/CodeViewerService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/services/CodeViewerService.java @@ -119,7 +119,6 @@ public interface CodeViewerService { /** * Set a listing panel on the code viewer. * @param listingPanel the panel to add. - * @param listener the listener to be notified if the new listingPanel is to be removed. */ public void setListingPanel(ListingPanel listingPanel); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/services/ConsoleService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/services/ConsoleService.java index 46c9b8255d..4f3cfad23d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/services/ConsoleService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/services/ConsoleService.java @@ -31,7 +31,7 @@ public interface ConsoleService { * Appends message to the console text area. * * For example: - * "originator> message" + * "originator> message" * * @param originator a descriptive name of the message creator * @param message the message to appear in the console @@ -108,7 +108,7 @@ public interface ConsoleService { * implementation. If this method cannot be supported, * please throw {@link UnsupportedOperationException}. * - * @return number of characters >= 0 + * @return number of characters >= 0 * * @throws UnsupportedOperationException */ @@ -124,10 +124,10 @@ public interface ConsoleService { * implementation. If this method cannot be supported, * please throw {@link UnsupportedOperationException}. * - * @param offset the offset into the console representing the desired start of the text >= 0 - * @param length the length of the desired string >= 0 + * @param offset the offset into the console representing the desired start of the text >= 0 + * @param length the length of the desired string >= 0 * - * @return the text, in a String of length >= 0 + * @return the text, in a String of length >= 0 * * @throws UnsupportedOperationException */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/services/DataService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/services/DataService.java index c0ecc33517..7acbcf7bf2 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/services/DataService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/services/DataService.java @@ -34,7 +34,7 @@ public interface DataService { * location is contained within the current program selection, the entire * selection is examined. * - * @param programActionContext contains program, location, and selection information + * @param context the context containing program, location, and selection information * @return true if create data is allowed, else false. */ public boolean isCreateDataAllowed(ListingActionContext context); @@ -44,8 +44,8 @@ public interface DataService { * * @param dt * dataType to create at the location - * @param location - * program location to create the data type + * @param context + * the context containing program, location, and selection information * @param enableConflictHandling * if true, the service may prompt the user to resolve data conflicts * @return true if the data could be created at the current location diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/services/HoverService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/services/HoverService.java index 97d545fb39..434a2cbb1c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/services/HoverService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/services/HoverService.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +52,6 @@ public interface HoverService { * @param programLocation the program location where the mouse is hovering. * @param fieldLocation the precise mouse location within the field viewer * @param field the field over which the mouse is hovering - * @param event the last mouse motion event over the field viewer component (i.e., FieldPanel). * @return The component to be shown for the given location information. */ public JComponent getHoverComponent(Program program, ProgramLocation programLocation, diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/services/MarkerService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/services/MarkerService.java index 875a60c8ea..c57d12f54e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/services/MarkerService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/services/MarkerService.java @@ -104,8 +104,8 @@ public interface MarkerService { /** * A group name for highlights. This is intended to be used with - * {@link #setMarkerForGroup(String, MarkerSet)} and - * {@link #removeMarkerForGroup(String, MarkerSet)} + * {@link #setMarkerForGroup(String, MarkerSet, Program)} and + * {@link #removeMarkerForGroup(String, MarkerSet, Program)} */ public final static String HIGHLIGHT_GROUP = "HIGHLIGHT_GROUP"; @@ -233,7 +233,6 @@ public interface MarkerService { * * @deprecated use {@link #removeMarker(MarkerSet,Program)} * @param markerManager marker manager to be removed from navigation bars. - * @param program The program with which the markers are associated. */ @Deprecated public void removeMarker(MarkerSet markerManager); @@ -241,7 +240,7 @@ public interface MarkerService { /** * Return the markerset with the given name; * - * @param The name of the marker set for which to search + * @param name The name of the marker set for which to search * @param program The program with which the created markers will be associated. * @return the markerset with the given name; */ @@ -252,8 +251,7 @@ public interface MarkerService { * see the recommended usage for more information. * * @deprecated use {@link #getMarkerSet(String, Program)} - * @param The name of the marker set for which to search - * @param program The program with which the created markers will be associated. + * @param name The name of the marker set for which to search * @return the markerset with the given name; */ @Deprecated @@ -266,7 +264,7 @@ public interface MarkerService { * @param groupName The name to associate the marker set with. * @param markerSet The marker set to add to this service * @param program The program with which the markers are associated. - * @see #removeMarkerForGroup(String, MarkerSet) + * @see #removeMarkerForGroup(String, MarkerSet, Program) */ public void setMarkerForGroup(String groupName, MarkerSet markerSet, Program program); @@ -277,7 +275,7 @@ public interface MarkerService { * @param markerSet The marker set to add to this service * @param program The program with which the markers are associated. May be null if the * marker is - * @see #setMarkerForGroup(String, MarkerSet) + * @see #setMarkerForGroup(String, MarkerSet, Program) */ public void removeMarkerForGroup(String groupName, MarkerSet markerSet, Program program); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/EditFieldNameDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/EditFieldNameDialog.java index 3f8d87ca45..5bf661eb28 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/EditFieldNameDialog.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/EditFieldNameDialog.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,9 +43,8 @@ public class EditFieldNameDialog extends DialogComponentProvider { /** * Construct a new dialog. * - * @param Frame parent for the dialog, null value is acceptable if no parent - * @param model object that controls the enablement and settings for - * labels and does the work of adding or editing labels + * @param title title for the dialog, null value is acceptable if no title + * @param tool the plugin tool */ public EditFieldNameDialog(String title, PluginTool tool) { super(title, true, true, true, false); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/MemoryBlockUtils.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/MemoryBlockUtils.java index de68519eb7..0e4af5c40e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/MemoryBlockUtils.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/MemoryBlockUtils.java @@ -77,7 +77,6 @@ public class MemoryBlockUtils { * @param isOverlay if true, the block will be created in a new overlay space for that block * @param name the name of the new block. * @param start the starting address of the new block. - * @param is source of the data used to fill the block or null for zero initialization. * @param length the length of the new block * @param comment the comment text to associate with the new block. * @param source the source of the block (This field is not well defined - currently another comment) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/ToolTipUtils.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/ToolTipUtils.java index f9f330949c..7872af733c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/ToolTipUtils.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/ToolTipUtils.java @@ -66,10 +66,7 @@ public class ToolTipUtils { /** * Return dataType details as HTML. - * @param dataType - * @param htmlFragmentOnly if true only a fragment of HTML, suitable for combining - * with other fragments will be Returned. If false, the fragment will be enclosed - * within an HTML tag element. + * @param dataType the dataType to be represented * @return dataType details formatted as HTML */ public static HTMLDataTypeRepresentation getHTMLRepresentation(DataType dataType) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bean/SelectLanguagePanelListener.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bean/SelectLanguagePanelListener.java index 8c325bff10..bfce076b7c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bean/SelectLanguagePanelListener.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bean/SelectLanguagePanelListener.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +28,8 @@ public interface SelectLanguagePanelListener { /** * This method is invoked every time a languauge is selected. * NOTE: the language could be null. - * @param language the selected language. + * @param langID the selected language id. + * @param compilerSpecID the selected compiler spec id. */ public void selectIDValidation(LanguageID langID, CompilerSpecID compilerSpecID); } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bean/SetEquateDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bean/SetEquateDialog.java index 320e5aeb92..bed41560f7 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bean/SetEquateDialog.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bean/SetEquateDialog.java @@ -92,10 +92,9 @@ public class SetEquateDialog extends DialogComponentProvider { /** * Constructor * - * @param parent the parent frame to host the dialog. - * @param plugin the EquatePlugin that launched this dialog(used to validate input) - * @param labelText a text string indicating the numeric value being equated. - * @param equates a list of equates that already exist for this numeric value. + * @param tool the EquatePlugin that launched this dialog(used to validate input) + * @param program the program the equate is located in. + * @param value the equate value to set. */ public SetEquateDialog(PluginTool tool, Program program, Scalar value) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/ByteProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/ByteProvider.java index cf88fab688..e662f6eeab 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/ByteProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/ByteProvider.java @@ -69,7 +69,6 @@ public interface ByteProvider extends Closeable { * Returns true if the specified index is valid. * @param index the index in the byte provider * @return returns true if the specified index is valid - * @exception IOException if an I/O error occurs */ public boolean isValidIndex(long index); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/GhidraRandomAccessFile.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/GhidraRandomAccessFile.java index b2a209c65c..2d0f7e63d9 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/GhidraRandomAccessFile.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/GhidraRandomAccessFile.java @@ -57,7 +57,7 @@ public class GhidraRandomAccessFile { * but adds buffering to limit the amount. *

      * - *

      The mode argument specifies the access mode + *

      The mode argument specifies the access mode * in which the file is to be opened. The permitted values and their * meanings are: * @@ -198,13 +198,13 @@ public class GhidraRandomAccessFile { } /** - * Reads up to len bytes of data from this file into an + * Reads up to length bytes of data from this file into an * array of bytes. This method blocks until at least one byte of input * is available. * * @param b the buffer into which the data is read. - * @param off the start offset of the data. - * @param len the maximum number of bytes read. + * @param offset the start offset of the data. + * @param length the maximum number of bytes read. * @return the total number of bytes read into the buffer, or * -1 if there is no more data because the end of * the file has been reached. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/RandomAccessByteProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/RandomAccessByteProvider.java index b7b392750e..2618252cb2 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/RandomAccessByteProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/RandomAccessByteProvider.java @@ -60,7 +60,7 @@ public class RandomAccessByteProvider implements ByteProvider { /** * Constructs a byte provider using the specified file and permissions string * @param file the file to open for random access - * @param string indicating permissions used for open + * @param permissions indicating permissions used for open * @throws FileNotFoundException if the file does not exist */ public RandomAccessByteProvider(File file, String permissions) throws IOException { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/RandomAccessMutableByteProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/RandomAccessMutableByteProvider.java index 72638cc773..dbda8fc4ca 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/RandomAccessMutableByteProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/RandomAccessMutableByteProvider.java @@ -35,25 +35,19 @@ public class RandomAccessMutableByteProvider extends RandomAccessByteProvider im /** * Constructs a byte provider using the specified file and permissions string * @param file the file to open for random access - * @param string indicating permissions used for open + * @param permissions indicating permissions used for open * @throws FileNotFoundException if the file does not exist */ public RandomAccessMutableByteProvider(File file, String permissions) throws IOException { super(file, permissions); } - /** - * @see ghidra.app.util.bin.ByteProvider#writeByte(long, byte) - */ @Override public void writeByte(long index, byte value) throws IOException { randomAccessFile.seek(index); randomAccessFile.write(value); } - /** - * @see ghidra.app.util.bin.ByteProvider#writeBytes(long, byte[]) - */ @Override public void writeBytes(long index, byte[] values) throws IOException { randomAccessFile.seek(index); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSectionHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSectionHeader.java index 81852c194b..a25161c32a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSectionHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/CoffSectionHeader.java @@ -145,7 +145,7 @@ public class CoffSectionHeader implements StructConverter { /** * Returns true if this section is byte oriented and aligned and should assume * an addressable unit size of 1. - * @returns true if byte aligned, false if word aligned + * @return true if byte aligned, false if word aligned */ public boolean isExplicitlyByteAligned() { return (s_reserved & CoffSectionHeaderReserved.EXPLICITLY_BYTE_ALIGNED) != 0; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DIEAggregate.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DIEAggregate.java index e1f5e5dd1c..c464510702 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DIEAggregate.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DIEAggregate.java @@ -113,7 +113,7 @@ public class DIEAggregate { * which is skipped. *

      * Used when a DIEA is composed of a head DIE with a different TAG type than the rest of - * the DIEs. (ie. a dw_tag_call_site -> dw_tag_sub DIEA) + * the DIEs. (ie. a dw_tag_call_site -> dw_tag_sub DIEA) * * @param source * @return @@ -794,11 +794,7 @@ public class DIEAggregate { * Parses a range list from the debug_ranges section. * See DWARF4 Section 2.17.3 (Non-Contiguous Address Ranges). *

      - * This method is similar to {@link DWARFLocation#parseLocationList(long, DebugInfoEntry)} - * and may have the same gotchas that need to be ported over. - *

      * @param attribute attribute ie. {@link DWARFAttribute#DW_AT_ranges} - * @param debug_ranges debug_ranges section byte provider * @return list of ranges * @throws IOException if an I/O error occurs */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFCompilationUnit.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFCompilationUnit.java index 0f15dba673..e8f1baafc0 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFCompilationUnit.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFCompilationUnit.java @@ -111,15 +111,15 @@ public class DWARFCompilationUnit { * leaves the input stream at the next compilation unit to read), otherwise throws * an IOException if there was an unrecoverable error. * - * @param debugInfoBR - * @param debugAbbrBR - * @param cuNumber - * @param helper - * @param monitor - * @return - * @throws DWARFException - * @throws IOException - * @throws CancelledException + * @param dwarfProgram the dwarf program. + * @param debugInfoBR the debug info binary reader. + * @param debugAbbrBR the debug abbreviation binary reader + * @param cuNumber the compilation unit number + * @param monitor the current task monitor + * @return the read compilation unit. + * @throws DWARFException if an invalid or unsupported DWARF version is read. + * @throws IOException if the length of the compilation unit is invalid. + * @throws CancelledException if the task has been canceled. */ public static DWARFCompilationUnit readCompilationUnit(DWARFProgram dwarfProgram, BinaryReader debugInfoBR, BinaryReader debugAbbrBR, int cuNumber, TaskMonitor monitor) @@ -198,18 +198,6 @@ public class DWARFCompilationUnit { /** * This ctor is public only for junit tests. Do not use directly. - * - * @param dwarfProgram - * @param startOffset - * @param endOffset - * @param length - * @param format - * @param version - * @param abbreviationOffset - * @param pointerSize - * @param compUnitNumber - * @param firstDIEOffset - * @param codeToAbbreviationMap */ public DWARFCompilationUnit(DWARFProgram dwarfProgram, long startOffset, long endOffset, long length, int format, short version, long abbreviationOffset, byte pointerSize, diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFUtil.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFUtil.java index e20f476767..e6d877ed51 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFUtil.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/DWARFUtil.java @@ -171,7 +171,7 @@ public class DWARFUtil { * A lightweight attempt to get nesting (ie. namespaces and such) information * from gnu mangled name strings. *

      - * For example, "_ZN19class1_inline_funcs3fooEv" -> + * For example, "_ZN19class1_inline_funcs3fooEv" -> * [19 chars]'class1_inline_funcs', [3 chars]'foo' *

      * @param s @@ -257,8 +257,8 @@ public class DWARFUtil { /** * Creates a name for anon types based on their position in their parent's childList. *

      - * @param die - * @return + * @param diea the die aggregate. + * @return the anonymous name of the die aggregate. */ public static String getAnonNameForMeFromParentContext(DIEAggregate diea) { DebugInfoEntry parent = diea.getHeadFragment().getParent(); @@ -286,9 +286,9 @@ public class DWARFUtil { *

      * Example: "anon_struct_for_field1_field2" *

      - * Falls back to {@link #getAnonNameForMeFromParentContext(DebugInfoEntry)} if no siblings found. - * @param die - * @return + * Falls back to {@link #getAnonNameForMeFromParentContext(DIEAggregate)} if no siblings found. + * @param diea the die aggregate. + * @return the anonymous name of the die aggregate. */ public static String getAnonNameForMeFromParentContext2(DIEAggregate diea) { DebugInfoEntry parent = diea.getHeadFragment().getParent(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeImporter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeImporter.java index a9eca906dd..014d2b101e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeImporter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeImporter.java @@ -70,7 +70,7 @@ public class DWARFDataTypeImporter { * This identity mapping doesn't always work because datatype instances are often clone()'d * which will break this mapping. *

      - * Places where we know clone()ing happens the mapping is + * Places where we know cloning happens the mapping is * {@link #updateMapping(DataType, DataType) updated}. */ private IdentityHashMap dataTypeInstanceToDDTMap = @@ -371,7 +371,7 @@ public class DWARFDataTypeImporter { * If an existing Enum with the same name is found in the DTM, and it doesn't have * any conflicting enum values, merge this enum into the existing enum. *

      - * This method takes liberties with the normal DWARF->Ghidra Impl DataType->Ghidra DB DataType + * This method takes liberties with the normal{@literal DWARF->Ghidra Impl DataType->Ghidra DB DataType} * workflow to be able to merge values into previous db enum datatypes. *

      * @@ -1101,14 +1101,13 @@ public class DWARFDataTypeImporter { *

      * There is some hacky logic here to handle situations where a pointer refers back to * itself via a struct: - *

      -	 * PTRa
      +	 * 
      {@literal
       	 *   +-> STRUCT1 (creates empty struct)
       	 *         +-> Field1: PTRa
       	 *               +-> STRUCT1 (empty struct returned from cache)
       	 *               ( ptr instance created pointing to empty struct)
       	 *         ( struct fields populated )
      -	 * 
      + * }
      * The struct creation code will stop the recursive loop after the second time * makeDataTypeForPointer() is hit because there will be an empty struct in the cache. * diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeManager.java index e6e1d6bfb2..05634f4fcc 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFDataTypeManager.java @@ -127,7 +127,7 @@ public class DWARFDataTypeManager { *

      * A {@link DataTypeGraphComparator} is used to walk the 'impl' DataType object graph * in lock-step with the resultant 'db' DataType object graph, and the mapping between - * the 'impl' object and its creator DIEA (held in {@link #currentImplDataTypeToDIE}) + * the 'impl' object and its creator DIEA (held in {@link DWARFDataType}) * is used to create a mapping to the resultant 'db' DataType's path. * * @param diea DWARF {@link DIEAggregate} with datatype information that needs to be converted @@ -225,14 +225,12 @@ public class DWARFDataTypeManager { /** * Returns a Ghidra {@link DataType} corresponding to the specified {@link DIEAggregate}, * or the specified defaultValue if the DIEA param is null or does not map to an already - * defined datatype (registered with {@link #addType(long, DataType, DWARFImportSummary)}). + * defined datatype (registered with {@link #addDataType(long, DataType, DWARFSourceInfo)}). *

      * @param diea {@link DIEAggregate} that defines a data type * @param defaultValue Ghidra {@link DataType} to return if the specified DIEA is null * or not already defined. * @return Ghidra {@link DataType} - * @throws DWARFExpressionException - * @throws IOException */ public DataType getDataType(DIEAggregate diea, DataType defaultValue) { if (diea == null) { @@ -259,7 +257,7 @@ public class DWARFDataTypeManager { /** * Returns a Ghidra {@link DataType} corresponding to the specified DIE (based on its * offset), or the specified defaultValue if the DIE does not map to a defined - * datatype (registered with {@link #addType(long, DataType, DWARFImportSummary)}). + * datatype (registered with {@link #addDataType(long, DataType, DWARFSourceInfo)}). *

      * * @param dieOffset offset of a DIE record that defines a data type @@ -599,7 +597,7 @@ public class DWARFDataTypeManager { * Does the actual import work. Updates the {@link #importSummary summary} object * with information about the types imported and errors encountered. * - * @param TaskMonitor monitor to watch for cancel + * @param monitor to watch for cancel * @throws IOException if errors are encountered reading data * @throws DWARFException if errors are encountered processing * @throws CancelledException if the {@link TaskMonitor} is canceled by the user. @@ -756,7 +754,7 @@ public class DWARFDataTypeManager { * but the impls can't be shared without excessive over-engineering. *

      * This impl uses DataType's that have already been resolved and committed to the DTM, and - * a cache mapping entry of the DWARF die -> DataType has been registered via {@link #addDataType(long, DataType, DWARFSourceInfo)}. + * a cache mapping entry of the DWARF die -> DataType has been registered via {@link #addDataType(long, DataType, DWARFSourceInfo)}. *

      * This approach is necessary because of speed issues that arise if the referred datatypes * are created from scratch from the DWARF information and then have to go through a diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFParser.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFParser.java index 30a329f030..2bd421cfbe 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFParser.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFParser.java @@ -175,7 +175,7 @@ public class DWARFParser { /** * Imports DWARF information according to the {@link DWARFImportOptions} set. *

      - * {@link #checkPreconditions()} must be called before this. + * {@link DWARFProgram#checkPreconditions(TaskMonitor)} must be called before this. *

      * @return * @throws IOException diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFProgram.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFProgram.java index bd43b25aed..9884e5c4f4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFProgram.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf4/next/DWARFProgram.java @@ -657,7 +657,8 @@ public class DWARFProgram implements Closeable { /** * Returns the count of the DIE records in this compilation unit. *

      - * Only valid if called after {@link #readDIEs()} and before {@link #clearEntries()}. + * Only valid if called after {@link #checkPreconditions(TaskMonitor)} + * and before {@link #clearDIEIndexes()}. * @return number of DIE records in the compunit. * @throws IOException * @throws CancelledException @@ -667,7 +668,8 @@ public class DWARFProgram implements Closeable { } /** - * Releases the memory used by the DIE entries read by {@link #readDIEs()}. + * Releases the memory used by the DIE entries read when invoking + * {@link #checkPreconditions(TaskMonitor)}. */ public void clearDIEIndexes() { offsetMap.clear(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfConstants.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfConstants.java index 4fa74a455f..a320304996 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfConstants.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfConstants.java @@ -62,9 +62,9 @@ public interface ElfConstants { /**Invalid class*/ public static final byte ELF_CLASS_NONE = 0; - /**32-bit objects*/ + /**{@code 32-bit objects}*/ public static final byte ELF_CLASS_32 = 1; - /**64-bit objects*/ + /**{@code 64-bit objects}*/ public static final byte ELF_CLASS_64 = 2; /**?*/ public static final byte ELF_CLASS_NUM = 3; @@ -107,7 +107,7 @@ public interface ElfConstants { public static final byte ELFOSABI_IRIX = 8; /**free bsd*/ public static final byte ELFOSABI_FREEBSD = 9; - /**compaq tru64 unix*/ + /**{@code compaq tru64 unix}*/ public static final byte ELFOSABI_TRUE64 = 10; /**novell modesto*/ public static final byte ELFOSABI_MODESTO = 11; @@ -121,9 +121,9 @@ public interface ElfConstants { public static final byte ELFOSABI_AROS = 15; /** FenixOS */ public static final byte ELFOSABI_FENIXOS = 16; - /** Bare-metal TMS320C6000 */ + /**{@code Bare-metal TMS320C6000}*/ public static final byte ELFOSABI_C6000_ELFABI = 64; - /** Linux TMS320C6000 */ + /**{@code Linux TMS320C6000}*/ public static final byte ELFOSABI_C6000_LINUX = 65; /** ARM */ public static final byte ELFOSABI_ARM = 97; @@ -157,47 +157,47 @@ public interface ElfConstants { /**No machine*/ public static final short EM_NONE = 0; - /**AT&T WE 32100*/ + /**{@code AT&T WE 32100}*/ public static final short EM_M32 = 1; /**SUN SPARC */ public static final short EM_SPARC = 2; - /**Intel 80386 */ + /**{@code Intel 80386}*/ public static final short EM_386 = 3; - /**Motorola m68k family */ + /**{@code Motorola m68k family}*/ public static final short EM_68K = 4; - /**Motorola m88k family */ + /**{@code Motorola m88k family}*/ public static final short EM_88K = 5; - /**Intel 486 (deprecated)*/ + /**{@code Intel 486 (deprecated)}*/ public static final short EM_486 = 6; - /**Intel 80860 */ + /**{@code Intel 80860}*/ public static final short EM_860 = 7; - /**MIPS R3000 big-endian */ + /**{@code MIPS R3000 big-endian}*/ public static final short EM_MIPS = 8; - /**IBM System/370 */ + /**{@code IBM System/370}*/ public static final short EM_S370 = 9; - /**MIPS R3000 little-endian */ + /**{@code MIPS R3000 little-endian}*/ public static final short EM_MIPS_RS3_LE = 10; // 11 - 14 reserved /**HPPA */ public static final short EM_PARISC = 15; - /**Fujitsu VPP500 */ + /**{@code Fujitsu VPP500}*/ public static final short EM_VPP500 = 17; - /**Sun's "v8plus" */ + /**{@code Sun's "v8plus"}*/ public static final short EM_SPARC32PLUS = 18; - /**Intel 80960 */ + /**{@code Intel 80960}*/ public static final short EM_960 = 19; /**PowerPC */ public static final short EM_PPC = 20; - /**PowerPC 64-bit */ + /**{@code PowerPC 64-bit}*/ public static final short EM_PPC64 = 21; - /**IBM S390 */ + /**{@code IBM S390}*/ public static final short EM_S390 = 22; //23 - 35 reserved - /**NEC V800 series */ + /**{@code NEC V800 series}*/ public static final short EM_V800 = 36; - /**Fujitsu FR20 */ + /**{@code Fujitsu FR20}*/ public static final short EM_FR20 = 37; - /**TRW RH-32 */ + /**{@code TRW RH-32}*/ public static final short EM_RH32 = 38; /**Motorola RCE */ public static final short EM_RCE = 39; @@ -207,19 +207,19 @@ public interface ElfConstants { public static final short EM_FAKE_ALPHA = 41; /**Hitachi SH */ public static final short EM_SH = 42; - /**SPARC v9 64-bit */ + /**{@code SPARC v9 64-bit}*/ public static final short EM_SPARCV9 = 43; /**Siemens Tricore */ public static final short EM_TRICORE = 44; /**Argonaut RISC Core */ public static final short EM_ARC = 45; - /**Hitachi H8/300 */ + /**{@code Hitachi H8/300}*/ public static final short EM_H8_300 = 46; - /**Hitachi H8/300H */ + /**{@code Hitachi H8/300H}*/ public static final short EM_H8_300H = 47; - /**Hitachi H8S */ + /**{@code Hitachi H8S}*/ public static final short EM_H8S = 48; - /**Hitachi H8/500 */ + /**{@code Hitachi H8/500}*/ public static final short EM_H8_500 = 49; /** Intel Merced */ public static final short EM_IA_64 = 50; @@ -227,7 +227,7 @@ public interface ElfConstants { public static final short EM_MIPS_X = 51; /** Motorola Coldfire */ public static final short EM_COLDFIRE = 52; - /** Motorola M68HC12 */ + /**{@code Motorola M68HC12}*/ public static final short EM_68HC12 = 53; /** Fujitsu MMA Multimedia Accelerator*/ public static final short EM_MMA = 54; @@ -235,77 +235,77 @@ public interface ElfConstants { public static final short EM_PCP = 55; /** Sony nCPU embedded RISC */ public static final short EM_NCPU = 56; - /** Denso NDR1 microprocessor */ + /**{@code Denso NDR1 microprocessor}*/ public static final short EM_NDR1 = 57; /** Motorola Start*Core processor */ public static final short EM_STARCORE = 58; - /** Toyota ME16 processor */ + /**{@code Toyota ME16 processor}*/ public static final short EM_ME16 = 59; - /** STMicroelectronic ST100 processor */ + /**{@code STMicroelectronic ST100 processor}*/ public static final short EM_ST100 = 60; /** Advanced Logic Corp. Tinyj emb.fam*/ public static final short EM_TINYJ = 61; - /** AMD x86-64 architecture */ + /**{@code AMD x86-64 architecture}*/ public static final short EM_X86_64 = 62; /** Sony DSP Processor */ public static final short EM_PDSP = 63; // 64 reserved // 65 reserved - /** Siemens FX66 microcontroller */ + /**{@code Siemens FX66 microcontroller}*/ public static final short EM_FX66 = 66; - /** STMicroelectronics ST9+ 8/16 mc */ + /**{@code STMicroelectronics ST9+ 8/16 mc}*/ public static final short EM_ST9PLUS = 67; - /** STmicroelectronics ST7 8 bit mc */ + /**{@code STmicroelectronics ST7 8 bit mc}*/ public static final short EM_ST7 = 68; - /** Motorola MC68HC16 microcontroller */ + /**{@code Motorola MC68HC16 microcontroller}*/ public static final short EM_68HC16 = 69; - /** Motorola MC68HC11 microcontroller */ + /**{@code Motorola MC68HC11 microcontroller}*/ public static final short EM_68HC11 = 70; - /** Motorola MC68HC08 microcontroller */ + /**{@code Motorola MC68HC08 microcontroller}*/ public static final short EM_68HC08 = 71; - /** Motorola MC68HC05 microcontroller */ + /**{@code Motorola MC68HC05 microcontroller}*/ public static final short EM_68HC05 = 72; /** Silicon Graphics SVx */ public static final short EM_SVX = 73; - /** STMicroelectronics ST19 8 bit mc */ + /**{@code STMicroelectronics ST19 8 bit mc}*/ public static final short EM_ST19 = 74; /** Digital VAX */ public static final short EM_VAX = 75; - /** Axis Communications 32-bit embedded processor */ + /**{@code Axis Communications 32-bit embedded processor}*/ public static final short EM_CRIS = 76; - /** Infineon Technologies 32-bit embedded processor */ + /**{@code Infineon Technologies 32-bit embedded processor}*/ public static final short EM_JAVELIN = 77; - /** Element 14 64-bit DSP Processor */ + /**{@code Element 14 64-bit DSP Processor}*/ public static final short EM_FIREPATH = 78; - /** LSI Logic 16-bit DSP Processor */ + /**{@code LSI Logic 16-bit DSP Processor}*/ public static final short EM_ZSP = 79; - /** Donald Knuth's educational 64-bit processor */ + /**{@code Donald Knuth's educational 64-bit processor}*/ public static final short EM_MMIX = 80; /** Harvard University machine-independent object files */ public static final short EM_HUANY = 81; /** SiTera Prism */ public static final short EM_PRISM = 82; - /** Atmel AVR 8-bit microcontroller */ + /**{@code Atmel AVR 8-bit microcontroller}*/ public static final short EM_AVR = 83; - /** Fujitsu FR30 */ + /**{@code Fujitsu FR30}*/ public static final short EM_FR30 = 84; - /** Mitsubishi D10V */ + /**{@code Mitsubishi D10V}*/ public static final short EM_D10V = 85; - /** Mitsubishi D30V */ + /**{@code Mitsubishi D30V}*/ public static final short EM_D30V = 86; - /** NEC v850 */ + /**{@code NEC v850}*/ public static final short EM_V850 = 87; - /** Mitsubishi M32R */ + /**{@code Mitsubishi M32R}*/ public static final short EM_M32R = 88; - /** Matsushita MN10300 */ + /**{@code Matsushita MN10300}*/ public static final short EM_MN10300 = 89; - /** Matsushita MN10200 */ + /**{@code Matsushita MN10200}*/ public static final short EM_MN10200 = 90; /** picoJava */ public static final short EM_PJ = 91; - /** OpenRISC 32-bit embedded processor */ + /**{@code OpenRISC 32-bit embedded processor}*/ public static final short EM_OPENRISC = 92; - /** ARC Cores Tangent-A5 */ + /**{@code ARC Cores Tangent-A5}*/ public static final short EM_ARC_A5 = 93; /** Tensilica Xtensa Architecture */ public static final short EM_XTENSA = 94; @@ -313,27 +313,27 @@ public interface ElfConstants { public static final short EM_VIDEOCORE = 95; /** Thompson Multimedia General Purpose Processor*/ public static final short EM_TMM_GPP = 96; - /** National Semiconductor 32000 series */ + /**{@code National Semiconductor 32000 series}*/ public static final short EM_NS32K = 97; /** Tenor Network TPC processor */ public static final short EM_TPC = 98; - /** Trebia SNP 1000 processor */ + /**{@code Trebia SNP 1000 processor}*/ public static final short EM_SNP1K = 99; - /** STMicroelectronics (www.st.com) ST200 */ + /**{@code STMicroelectronics (www.st.com) ST200}*/ public static final short EM_ST200 = 100; - /** Ubicom IP2xxx microcontroller family */ + /**{@code Ubicom IP2xxx microcontroller family}*/ public static final short EM_IP2K = 101; /** MAX Processor */ public static final short EM_MAX = 102; /** National Semiconductor CompactRISC microprocessor */ public static final short EM_CR = 103; - /** Fujitsu F2MC16 */ + /**{@code Fujitsu F2MC16}*/ public static final short EM_F2MC16 = 104; - /** Texas Instruments embedded microcontroller msp430 */ + /**{@code Texas Instruments embedded microcontroller msp430}*/ public static final short EM_MSP430 = 105; /** Analog Devices Blackfin (DSP) processor */ public static final short EM_BLACKFIN = 106; - /** S1C33 Family of Seiko Epson processors */ + /**{@code S1C33 Family of Seiko Epson processors}*/ public static final short EM_SE_C33 = 107; /** Sharp embedded microprocessor */ public static final short EM_SEP = 108; @@ -341,7 +341,7 @@ public interface ElfConstants { public static final short EM_ARCA = 109; /** Microprocessor series from PKU-Unity Ltd. and MPRC of Peking University */ public static final short EM_UNICORE = 110; - /** eXcess: 16/32/64-bit configurable embedded CPU */ + /**{@code eXcess: 16/32/64-bit configurable embedded CPU}*/ public static final short EM_EXCESS = 111; /** Icera Semiconductor Inc. Deep Execution Processor */ public static final short EM_DXP = 112; @@ -351,67 +351,67 @@ public interface ElfConstants { public static final short EM_CRX = 114; /** Motorola XGATE embedded processor */ public static final short EM_XGATE = 115; - /** Infineon C16x/XC16x processor */ + /**{@code Infineon C16x/XC16x processor}*/ public static final short EM_C166 = 116; - /** Renesas M16C series microprocessors */ + /**{@code Renesas M16C series microprocessors}*/ public static final short EM_M16C = 117; - /** Microchip Technology dsPIC30F Digital Signal Controller **/ + /**{@code Microchip Technology dsPIC30F Digital Signal Controller}*/ public static final short EM_DSPIC30F = 118; /** Freescale Communication Engine RISC core */ public static final short EM_CE = 119; - /** Renesas M32C series microprocessors*/ + /**{@code Renesas M32C series microprocessors*}*/ public static final short EM_M32C = 120; - /** Altium TSK3000 core */ + /**{@code Altium TSK3000 core}*/ public static final short EM_TSK3000 = 131; - /** Freescale RS08 embedded processor */ + /**{@code Freescale RS08 embedded processor}*/ public static final short EM_RS08 = 132; - /** Analog Devices SHARC family of 32-bit DSP processors */ + /**{@code Analog Devices SHARC family of 32-bit DSP processors}*/ public static final short EM_SHARC = 133; - /** Cyan Technology eCOG2 microprocessor */ + /**{@code Cyan Technology eCOG2 microprocessor}*/ public static final short EM_ECOG2 = 134; - /** Sunplus S+core7 RISC processor */ + /**{@code Sunplus S+core7 RISC processor}*/ public static final short EM_SCORE7 = 135; - /** New Japan Radio (NJR) 24-bit DSP Processor */ + /**{@code New Japan Radio (NJR) 24-bit DSP Processor}*/ public static final short EM_DSP24 = 136; /** Broadcom VideoCore III processor */ public static final short EM_VIDEOCORE3 = 137; /** RISC processor for Lattice FPGA architecture */ public static final short EM_LATTICEMICO32 = 138; - /** Seiko Epson C17 family */ + /**{@code Seiko Epson C17 family}*/ public static final short EM_SE_C17 = 139; - /** The Texas Instruments TMS320C6000 DSP family */ + /**{@code The Texas Instruments TMS320C6000 DSP family}*/ public static final short EM_TI_C6000 = 140; - /** The Texas Instruments TMS320C2000 DSP family */ + /**{@code The Texas Instruments TMS320C2000 DSP family}*/ public static final short EM_TI_C2000 = 141; - /** The Texas Instruments TMS320C55x DSP family */ + /**{@code The Texas Instruments TMS320C55x DSP family}*/ public static final short EM_TI_C5500 = 142; - /** STMicroelectronics 64bit VLIW Data Signal Processor */ + /**{@code STMicroelectronics 64bit VLIW Data Signal Processor}*/ public static final short EM_MMDSP_PLUS = 160; - /** Cypress M8C microprocessor */ + /**{@code Cypress M8C microprocessor}*/ public static final short EM_CYPRESS_M8C = 161; - /** Renesas R32C series microprocessors */ + /**{@code Renesas R32C series microprocessors}*/ public static final short EM_R32C = 162; /** NXP Semiconductors TriMedia architecture family */ public static final short EM_TRIMEDIA = 163; /** Qualcomm Hexagon processor */ public static final short EM_HEXAGON = 164; - /** Intel 8051 and variants */ + /**{@code Intel 8051 and variants}*/ public static final short EM_8051 = 165; - /** STMicroelectronics STxP7x family of RISC processors */ + /**{@code STMicroelectronics STxP7x family of RISC processors}*/ public static final short EM_STXP7X = 166; /** Andes Technology compact code size embedded RISC processor family */ public static final short EM_NDS32 = 167; - /** Cyan Technology eCOG1X family */ + /**{@code Cyan Technology eCOG1X family}*/ public static final short EM_ECOG1 = 168; - /** Cyan Technology eCOG1X family */ + /**{@code Cyan Technology eCOG1X family}*/ public static final short EM_ECOG1X = 168; - /** Dallas Semiconductor MAXQ30 Core Micro-controllers */ + /**{@code Dallas Semiconductor MAXQ30 Core Micro-controllers}*/ public static final short EM_MAXQ30 = 169; - /** New Japan Radio (NJR) 16-bit DSP Processor */ + /**{@code New Japan Radio (NJR) 16-bit DSP Processor}*/ public static final short EM_XIMO16 = 170; - /** M2000 Reconfigurable RISC Microprocessor */ + /**{@code M2000 Reconfigurable RISC Microprocessor}*/ public static final short EM_MANIK = 171; - /** Cray Inc. NV2 vector architecture */ + /**{@code Cray Inc. NV2 vector architecture}*/ public static final short EM_CRAYNV2 = 172; /** Renesas RX family */ public static final short EM_RX = 173; @@ -419,26 +419,26 @@ public interface ElfConstants { public static final short EM_METAG = 174; /** MCST Elbrus general purpose hardware architecture */ public static final short EM_MCST_ELBRUS = 175; - /** Cyan Technology eCOG16 family */ + /**{@code Cyan Technology eCOG16 family}*/ public static final short EM_ECOG16 = 176; - /** National Semiconductor CompactRISC CR16 16-bitmicroprocessor */ + /**{@code National Semiconductor CompactRISC CR16 16-bitmicroprocessor}*/ public static final short EM_CR16 = 177; /** Freescale Extended Time Processing Unit */ public static final short EM_ETPU = 178; - /** Infineon Technologies SLE9X core */ + /**{@code Infineon Technologies SLE9X core}*/ public static final short EM_SLE9X = 179; - /** Intel L10M */ + /**{@code Intel L10M}*/ public static final short EM_L10M = 180; - /** Intel K10M */ + /**{@code Intel K10M}*/ public static final short EM_K10M = 181; // 182 reserved - /** AARCH64 Architecture **/ + /**{@code AARCH64 Architecture}*/ public static final short EM_AARCH64 = 183; - /** Atmel Corporation 32-bit microprocessor family */ + /**{@code Atmel Corporation 32-bit microprocessor family}*/ public static final short EM_AVR32 = 185; - /** STMicroeletronics STM8 8-bit microcontroller */ + /**{@code STMicroeletronics STM8 8-bit microcontroller}*/ public static final short EM_STM8 = 186; - /** Tilera TILE64 multicore architecture family */ + /**{@code Tilera TILE64 multicore architecture family}*/ public static final short EM_TILE64 = 187; /** Tilera TILEPro multicore architecture family */ public static final short EM_TILEPRO = 188; @@ -448,37 +448,37 @@ public interface ElfConstants { public static final short EM_TILEGX = 191; /** CloudShield architecture family */ public static final short EM_CLOUDSHIELD = 192; - /** KIPO-KAIST Core-A 1st generation processor family */ + /**{@code KIPO-KAIST Core-A 1st generation processor family}*/ public static final short EM_COREA_1ST = 193; - /** KIPO-KAIST Core-A 2nd generation processor family */ + /**{@code KIPO-KAIST Core-A 2nd generation processor family}*/ public static final short EM_COREA_2ND = 194; - /** Synopsys ARCompact V2 */ + /**{@code Synopsys ARCompact V2}*/ public static final short EM_ARC_COMPACT2 = 195; - /** Open8 8-bit RISC soft processor core */ + /**{@code Open8 8-bit RISC soft processor core}*/ public static final short EM_OPEN8 = 196; - /** Renesas RL78 family */ + /**{@code Renesas RL78 family}*/ public static final short EM_RL78 = 197; /** Broadcom VideoCore V processor */ public static final short EM_VIDEOCORE5 = 198; - /** Renesas 78KOR family */ + /**{@code Renesas 78KOR family}*/ public static final short EM_78KOR = 199; - /** Freescale 56800EX Digital Signal Controller (DSC) */ + /**{@code Freescale 56800EX Digital Signal Controller (DSC)}*/ public static final short EM_56800EX = 200; - /** Beyond BA1 CPU */ + /**{@code Beyond BA1 CPU}*/ public static final short EM_BA1 = 201; - /** Beyond BA2 CPU */ + /**{@code Beyond BA2 CPU}*/ public static final short EM_BA2 = 202; /** XMOS xCORE processor family */ public static final short EM_XCORE = 203; - /** KM211 KM32 32-bit processor */ + /**{@code KM211 KM32 32-bit processor}*/ public static final short EM_KM32 = 210; - /** KM211 KMX32 32-bit processor */ + /**{@code KM211 KMX32 32-bit processor}*/ public static final short EM_KMX32 = 211; - /** KM211 KMX16 16-bit processor */ + /**{@code KM211 KMX16 16-bit processor}*/ public static final short EM_KMX16 = 212; - /** KM211 KMX8 8-bit processor */ + /**{@code KM211 KMX8 8-bit processor}*/ public static final short EM_KMX8 = 213; - /** KM211 KVARC processor */ + /**{@code KM211 KVARC processor}*/ public static final short EM_KVARC = 214; /** Paneve CDP architecture family */ public static final short EM_CDP = 215; @@ -494,12 +494,12 @@ public interface ElfConstants { public static final short EM_AMDGPU = 224; /** RISC-V */ public static final short EM_RISCV = 243; - /** Lanai 32-bit processor */ + /**{@code Lanai 32-bit processor}*/ public static final short EM_LANAI = 244; /** Linux kernel bpf virtual machine */ public static final short EM_BPF = 247; - /** used by NetBSD/avr32 - AVR 32-bit */ + /**{@code used by NetBSD/avr32 - AVR 32-bit}*/ public static final short EM_AVR32_unofficial = 0x18ad; /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfDynamic.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfDynamic.java index 2a576ad3bd..26e9fff4e1 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfDynamic.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfDynamic.java @@ -22,9 +22,9 @@ import ghidra.app.util.bin.format.FactoryBundledWithBinaryReader; import ghidra.util.*; /** - * A class to represent the Elf32_Dyn data structure. + * A class to represent the Elf32_Dyn data structure. * - *

      + * 
      
        * typedef  int32_t  Elf32_Sword;
        * typedef uint32_t  Elf32_Word;
        * typedef uint32_t  Elf32_Addr;
      @@ -49,7 +49,7 @@ import ghidra.util.*;
        *     } d_un;
        * } Elf64_Dyn;
        * 
      - * 
      + *
      */ public class ElfDynamic implements ByteArrayConverter { @@ -89,7 +89,7 @@ FactoryBundledWithBinaryReader reader, ElfHeader elf) * Constructs a new ELF dynamic with the specified tag and value. * @param tag the tag (or type) of this dynamic * @param value the value (or pointer) of this dynamic - * @param is32bit true if this object is a 32-bit dynamic, false if 64-bit dynamic + * @param elf the elf header */ public ElfDynamic(int tag, long value, ElfHeader elf) { this.d_tag = tag; @@ -101,7 +101,7 @@ FactoryBundledWithBinaryReader reader, ElfHeader elf) * Constructs a new ELF dynamic with the specified (enum) tag and value. * @param tag the (enum) tag (or type) of this dynamic * @param value the value (or pointer) of this dynamic - * @param is32bit true if this object is a 32-bit dynamic, false if 64-bit dynamic + * @param elf the elf header */ public ElfDynamic(ElfDynamicType tag, long value, ElfHeader elf) { this(tag.value, value, elf); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfLoadHelper.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfLoadHelper.java index 3a5751e856..de0f3af5e1 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfLoadHelper.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfLoadHelper.java @@ -74,15 +74,14 @@ public interface ElfLoadHelper { * @param name name of function or null for default (or label already applied) * @param address address of function * @param isEntry mark function as entry point if true - * @param log * @return new or existing function. */ Function createOneByteFunction(String name, Address address, boolean isEntry); /** * Create an external function within the UNKNOWN space and a corresponding thunk at - * the internalFunctionAddr. If the functionAddr and/or indirectPointerAddr has a symbol with - * it will be removed so as not to replicate the external function name. + * the internalFunctionAddr. If the functionAddr and/or indirectPointerAddr has a symbol with + * {@code } it will be removed so as not to replicate the external function name. * @param name external function name * @param functionAddr location of thunk function (memory address only) * @param indirectPointerAddr if not null a pointer to functionAddr will be written (size of pointer @@ -146,7 +145,7 @@ public interface ElfLoadHelper { /** * Get the program address for an addressableWordOffset within the default address space. * This method is responsible for applying any program image base change imposed during - * the import (see {@link #getImageBaseWordOffset(Program, ElfHeader)}. + * the import (see {@link #getImageBaseWordAdjustmentOffset()}. * @param addressableWordOffset absolute word offset. The offset should already include * default image base and pre-link adjustment (see {@link ElfHeader#adjustAddressForPrelink(long)}). * @return memory address in default code space @@ -183,7 +182,7 @@ public interface ElfLoadHelper { * small 16-bit default memory space, or when shared memory regions exist. *

      * @param alignment required byte alignment of allocated range - * @param size size of requested allocation (size <= 0 reserved for EXTERNAL block) + * @param size size of requested allocation (size <= 0 reserved for EXTERNAL block) * @param purpose brief descriptive purpose of range. * @return address range or null if no unallocated range found */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfSectionHeaderConstants.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfSectionHeaderConstants.java index ebeed06aa9..dc9507b934 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfSectionHeaderConstants.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfSectionHeaderConstants.java @@ -182,7 +182,7 @@ public class ElfSectionHeaderConstants { public static final short SHN_ABS = (short) 0xfff1; /**common symbols, such as Fortran COMMON or unallocated C external vars*/ public static final short SHN_COMMON = (short) 0xfff2; - /** Mark that the index is >= SHN_LORESERVE */ + /** Mark that the index is >= SHN_LORESERVE */ public static final short SHN_XINDEX = (short) 0xffff; /**upper bound on range of reserved indexes*/ public static final short SHN_HIRESERVE = (short) 0xffff; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfStringTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfStringTable.java index 90732fd576..858eecfd2e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfStringTable.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/ElfStringTable.java @@ -27,15 +27,12 @@ public class ElfStringTable implements ElfFileSection { /** * Create and parse an Elf string table - * @param reader + * @param reader the binary reader containing the elf string table * @param header elf header * @param stringTableSection string table section header or null if associated with a dynamic table entry * @param fileOffset symbol table file offset * @param addrOffset memory address of symbol table (should already be adjusted for prelink) * @param length length of symbol table in bytes of -1 if unknown - * @param entrySize size of each symbol entry in bytes - * @param sectionType symbol table section type (SHT_DYNSYM, SHT_SYMTAB, or -1 if not section-based) - * @param stringTable string table to be associated with symbol table * @return Elf string table object * @throws IOException */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/extend/ElfLoadAdapter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/extend/ElfLoadAdapter.java index ae3eed99aa..515b200e73 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/extend/ElfLoadAdapter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/extend/ElfLoadAdapter.java @@ -166,7 +166,7 @@ public class ElfLoadAdapter { /** * Get the default alignment within the default address space. - * @param load helper object + * @param elfLoadHelper helper object * @return default alignment within the default address space. */ public int getDefaultAlignment(ElfLoadHelper elfLoadHelper) { @@ -234,7 +234,7 @@ public class ElfLoadAdapter { * a more accurate check based upon the actual language utilized. While the ELF header * may have stipulated a specific processor via the machine-id, a completely different * and incompatible language may have been used. - * @param elf elf header + * @param elfLoadHelper elf header * @return true if this extension can properly support the ELF header and the * current program/language. */ @@ -425,7 +425,7 @@ public class ElfLoadAdapter { /** * Return the memory section size in bytes for the specified section header. * The returned value will be consistent with any byte filtering which may be required. - * @param ElfSectionHeader + * @param section the section header * @return preferred memory block size in bytes which corresponds to the specified section header */ public long getAdjustedSize(ElfSectionHeader section) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/relocation/ElfRelocationContext.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/relocation/ElfRelocationContext.java index 96e2e296f6..020c76ffd8 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/relocation/ElfRelocationContext.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/relocation/ElfRelocationContext.java @@ -43,12 +43,9 @@ public class ElfRelocationContext { /** * Relocation context for a specific Elf image and relocation table * @param handler relocation handler or null if not available - * @param elf Elf header + * @param loadHelper the elf load helper * @param relocationTable Elf relocation table * @param symbolMap Elf symbol placement map - * @param nextFreeAddress next available address to be used by relocations if needed (e.g., - * synthetic GOT, EXTERNAL block, etc.) - * @param program Target program */ protected ElfRelocationContext(ElfRelocationHandler handler, ElfLoadHelper loadHelper, ElfRelocationTable relocationTable, Map symbolMap) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/SegmentCommand.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/SegmentCommand.java index 584192f68c..a8d41a0317 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/SegmentCommand.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/commands/SegmentCommand.java @@ -140,9 +140,9 @@ public class SegmentCommand extends LoadCommand { /** * Returns a octal model value reflecting the * segment's maximum protection value allowed. - * For example: + * For example:{@code * 7 -> 0x111 -> rwx - * 5 -> 0x101 -> rx + * 5 -> 0x101 -> rx} * @return the maximum protections of a segment */ public int getMaxProtection() { @@ -152,9 +152,9 @@ public class SegmentCommand extends LoadCommand { /** * Returns a octal model value reflecting the * segment's initial protection value. - * For example: + * For example:{@code * 7 -> 0x111 -> rwx - * 5 -> 0x101 -> rx + * 5 -> 0x101 -> rx} * @return the initial protections of a segment */ public int getInitProtection() { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/ne/InformationBlock.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/ne/InformationBlock.java index a38dec8293..dc819b2339 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/ne/InformationBlock.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/ne/InformationBlock.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -411,7 +410,7 @@ public class InformationBlock { /** * Returns the index to the start of the resource table, * relative to the beginning of the NE windows header. - * @returns the index to the start of the resource table + * @return the index to the start of the resource table */ short getResourceTableOffset() { return ne_rsrctab; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/FileHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/FileHeader.java index 8f5bdddf62..93eb3e7ea0 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/FileHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/FileHeader.java @@ -78,7 +78,7 @@ public class FileHeader implements StructConverter { */ public final static int IMAGE_FILE_AGGRESIVE_WS_TRIM = 0x0010; /** - * App can handle >2gb addresses + * App can handle >2gb addresses */ public final static int IMAGE_FILE_LARGE_ADDRESS_AWARE = 0x0020; /** @@ -442,7 +442,7 @@ public class FileHeader implements StructConverter { * file. * @param block the memory block template * @param optionalHeader the related optional header - * @throws MemoryAccessException if the memory block is uninitialized + * @throws RuntimeException if the memory block is uninitialized */ public void addSection(MemoryBlock block, OptionalHeader optionalHeader) { DataDirectory [] directories = optionalHeader.getDataDirectories(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/MachineConstants.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/MachineConstants.java index f246fb3cd1..cc39b7d7d2 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/MachineConstants.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/MachineConstants.java @@ -18,7 +18,7 @@ package ghidra.app.util.bin.format.pe; /** * PE machine ID constants defined by standard header file 'ntimage.h' * - * @see https://msdn.microsoft.com/en-us/library/windows/desktop/mt804345%28v=vs.85%29.aspx + * @see Image File Machine Constants */ public class MachineConstants { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/PortableExecutable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/PortableExecutable.java index cb34160594..f3bff5634c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/PortableExecutable.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/PortableExecutable.java @@ -62,7 +62,7 @@ public class PortableExecutable { * @param bp the byte provider * @param layout specifies the layout of the underlying provider and governs RVA resolution * @throws IOException if an I/O error occurs. - * @see {@link #createPortableExecutable(GenericFactory, ByteProvider, Alignment, boolean, boolean)} + * @see #createPortableExecutable(GenericFactory, ByteProvider, SectionLayout, boolean, boolean) **/ public static PortableExecutable createPortableExecutable(GenericFactory factory, ByteProvider bp, SectionLayout layout) throws IOException { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/CliMetadataRoot.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/CliMetadataRoot.java index 8e10a9f00e..46942c9e1b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/CliMetadataRoot.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/CliMetadataRoot.java @@ -70,7 +70,7 @@ public class CliMetadataRoot implements StructConverter, PeMarkupable { * * @param reader A binary reader set to start reading at the start of this header. * @param rva The RVA of this header. - * @throws if there is a problem reading the header. + * @throws IOException if there is a problem reading the header. */ public CliMetadataRoot(BinaryReader reader, int rva) throws IOException { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/CliStreamHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/CliStreamHeader.java index 25a3c48210..b4db0d95d6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/CliStreamHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/CliStreamHeader.java @@ -52,10 +52,9 @@ public class CliStreamHeader implements StructConverter, PeMarkupable { /** * Constructs a new CLI Stream Header datatype. * + * @param metadataRoot the metadata root. * @param reader A binary reader set to start reading at the start of this header. - * @param virtualAddress The RVA of this header. - * @param ntHeader The NT header. - * @throws if there is a problem reading the header. + * @throws IOException if there is a problem reading the header. */ public CliStreamHeader(CliMetadataRoot metadataRoot, BinaryReader reader) throws IOException { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliBlob.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliBlob.java index 3ab316d9f8..70fdf198c0 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliBlob.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliBlob.java @@ -27,8 +27,8 @@ import ghidra.util.exception.AssertException; *

      * Paraphrasing from ISO 23271:2012 11.24.2.4 (p272): * - If the first one byte of the 'blob' is 0bbbbbbb_2: size is bbbbbbb_2 bytes. - * - If the first two bytes are 10bbbbbb_2 and x: size is (bbbbbb_2 << 8 + x) bytes. - * - If the first four bytes are 110bbbbb_2, x, y, and z: size is (bbbbb_2<<24 + x<<16 + y<<8 + z) bytes. + * - {@literal If the first two bytes are 10bbbbbb_2 and x: size is (bbbbbb_2 << 8 + x) bytes.} + * - {@literal If the first four bytes are 110bbbbb_2, x, y, and z: size is (bbbbb_2<<24 + x<<16 + y<<8 + z) bytes.} * The first entry in the heap is the empty 'blob' consisting of a single zero byte. */ public class CliBlob implements StructConverter { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliSigField.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliSigField.java index 95f49e5e7b..1835754607 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliSigField.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliSigField.java @@ -46,7 +46,7 @@ public class CliSigField extends CliAbstractSig { /** * Checks whether this could *possibly* be a FieldSig. Only looks at the identifier byte. Useful for signature index * that could be to different kinds of signatures. - * @param reader + * @param blob * @return * @throws IOException */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliSigLocalVar.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliSigLocalVar.java index cf145c321a..308cef42ee 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliSigLocalVar.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/blobs/CliSigLocalVar.java @@ -55,7 +55,7 @@ public class CliSigLocalVar extends CliAbstractSig { /** * Checks whether this could *possibly* be a LocalVarSig. Only looks at the identifier byte. Useful for signature index * that could be to different kinds of signatures. - * @param reader + * @param blob * @return * @throws IOException */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/streams/CliStreamBlob.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/streams/CliStreamBlob.java index 01cd026201..1aa101521d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/streams/CliStreamBlob.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/streams/CliStreamBlob.java @@ -97,7 +97,7 @@ public class CliStreamBlob extends CliAbstractStream { * Updates the blob at the given address with the new blob. * * @param updatedBlob The updated blob. - * @param address The address of the blob to update. + * @param addr The address of the blob to update. * @param program The program that will get the update. */ public boolean updateBlob(CliBlob updatedBlob, Address addr, Program program) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/streams/CliStreamMetadata.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/streams/CliStreamMetadata.java index 582f9a6184..93b77a72b3 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/streams/CliStreamMetadata.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/streams/CliStreamMetadata.java @@ -67,8 +67,8 @@ public class CliStreamMetadata extends CliAbstractStream { * * @param header The stream header associated with this stream. * @param guidStream The GUID stream. - * @param userStringStream The user strings stream. - * @param stringsStrings The strings stream. + * @param userStringsStream The user strings stream. + * @param stringsStream The strings stream. * @param blobStream The blob stream. * @param fileOffset The file offset where this stream starts. * @param rva The relative virtual address where this stream starts. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/streams/CliStreamStrings.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/streams/CliStreamStrings.java index a22a53c0f7..a98c02e4fe 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/streams/CliStreamStrings.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/streams/CliStreamStrings.java @@ -81,7 +81,6 @@ public class CliStreamStrings extends CliAbstractStream { /** * Gets the string at the given index. * - * @param The {@link CliMetadataRoot} that may point to the {@link CliStreamStrings}. * @param index The index of the string to get. * @return The string at the given index. Could be null if the index was invalid or there was * a problem reading the string. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/tables/CliAbstractTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/tables/CliAbstractTable.java index a88a290317..14da303b28 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/tables/CliAbstractTable.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/cli/tables/CliAbstractTable.java @@ -217,7 +217,7 @@ public abstract class CliAbstractTable implements StructConverter, PeMarkupable /** * Convenience method for getting a safe row representation of a table. * - * @param table The table that has the row. + * @param otherTable The table that has the row. * @param index The index of the row. * @return The safe row representation of a table. */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugCOFFSymbol.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugCOFFSymbol.java index 841751070f..24949f884c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugCOFFSymbol.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugCOFFSymbol.java @@ -42,6 +42,7 @@ import java.io.*; * BYTE StorageClass; * BYTE NumberOfAuxSymbols; * } IMAGE_SYMBOL; + * */ public class DebugCOFFSymbol implements StructConverter { private static final int NAME_LENGTH = 8; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugCOFFSymbolAux.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugCOFFSymbolAux.java index 44b6b94117..6dd0682dc7 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugCOFFSymbolAux.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugCOFFSymbolAux.java @@ -59,6 +59,7 @@ import ghidra.util.exception.DuplicateNameException; * BYTE Selection; // communal selection type * } Section; * } IMAGE_AUX_SYMBOL; + * */ public class DebugCOFFSymbolAux implements StructConverter { public final static byte IMAGE_SIZEOF_AUX_SYMBOL = 18; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugDirectoryParser.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugDirectoryParser.java index 56d679f8fc..f0adf5fcc4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugDirectoryParser.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugDirectoryParser.java @@ -87,7 +87,7 @@ public class DebugDirectoryParser { * @param reader the binary reader * @param ptr the pointer into the binary reader * @param size the size of the directory - * @param ntHeader + * @param validator the validator for the directory * @throws IOException if an I/O error occurs */ public static DebugDirectoryParser createDebugDirectoryParser( diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/VS_VERSION_CHILD.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/VS_VERSION_CHILD.java index 6fff44c9e2..25f5ba0266 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/VS_VERSION_CHILD.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/resource/VS_VERSION_CHILD.java @@ -185,8 +185,8 @@ public class VS_VERSION_CHILD implements StructConverter { /** * @return true if value is 4-byte integer value in memory - * while string value return by {@link #getValue()} is a - * numeric hex string. + * while string value return by {@link DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.docking.settings.Settings, int) + * DataType.getValue(MemBuffer, Settings, int)} is a numeric hex string. */ public boolean valueIsDWord() { return childValue != null && "Var".equals(childDataType); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ImportStateCache.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ImportStateCache.java index 1b3bfca39e..edd26ff5af 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ImportStateCache.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/ImportStateCache.java @@ -90,11 +90,10 @@ public class ImportStateCache { } /** - * Returns the symbol object with the given name in the specified namespace. - * @param program the program - * @param id the desired symbol's name - * @param namespace the desired symbols' namespace - * @return the symbol object with the given name in the specified namespace + * Returns the symbol object with the given name in the specified library. + * @param symbolName the desired symbol's name + * @param library the desired library + * @return the symbol object with the given name in the specified library */ public Symbol getSymbol(String symbolName, ImportedLibrary library) { Map map = librarySymbolsMap.get(library); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/LoaderInfoHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/LoaderInfoHeader.java index 43a8f1c921..f2553cd343 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/LoaderInfoHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/LoaderInfoHeader.java @@ -25,7 +25,7 @@ import java.util.List; /** * See Apple's -- PEFBinaryFormat.h - *

      + * 
      {@literal
        * struct PEFLoaderInfoHeader {
        *     SInt32  mainSection;              // Section containing the main symbol, -1 => none.
        *     UInt32  mainOffset;               // Offset of main symbol.
      @@ -42,7 +42,7 @@ import java.util.List;
        *     UInt32  exportHashTablePower;     // Export hash table size as log 2.  (Log2('h'))
        *     UInt32  exportedSymbolCount;      // Number of exported symbols.  ('e')
        * };
      - * 
      + * }
      */ public class LoaderInfoHeader implements StructConverter { public final static int SIZEOF = 56; @@ -258,7 +258,6 @@ public class LoaderInfoHeader implements StructConverter { /** * Finds the PEF library that contains the specified imported symbol index. - * @param loader the PEF loader info header * @param symbolIndex the imported symbol index * @return PEF library that contains the specified imported symbol index */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/RelocationState.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/RelocationState.java index c30920a0c1..769bf4a03c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/RelocationState.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/RelocationState.java @@ -66,7 +66,7 @@ public class RelocationState { * @param header the PEF container header * @param relocationHeader the specific relocation header for this state * @param program the program being relocated - * @param sectionMap the map of section headers to memory blocks + * @param importState the current import state */ public RelocationState(ContainerHeader header, LoaderRelocationHeader relocationHeader, Program program, ImportStateCache importState) { @@ -191,7 +191,6 @@ public class RelocationState { /** * Increments the integer in memory at the specified address - * @param program the program * @param address the address to increment * @param addend the value to add * @param log a message log diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/SectionHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/SectionHeader.java index c3865e96ac..18df9d529d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/SectionHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/SectionHeader.java @@ -28,7 +28,7 @@ import java.io.InputStream; * See Apple's -- PEFBinaryFormat *
        * struct PEFSectionHeader {
      - *     SInt32   nameOffset;             // Offset of name within the section name table, -1 => none.
      + *     SInt32   nameOffset;             // Offset of name within the section name table, -1 => none.
        *     UInt32   defaultAddress;         // Default address, affects relocations.
        *     UInt32   totalLength;            // Fully expanded size in bytes of the section contents.
        *     UInt32   unpackedLength;         // Size in bytes of the "initialized" part of the contents.
      diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/SectionKind.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/SectionKind.java
      index 9da61a2816..3b65f30018 100644
      --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/SectionKind.java
      +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pef/SectionKind.java
      @@ -1,6 +1,5 @@
       /* ###
        * IP: GHIDRA
      - * REVIEWED: YES
        *
        * Licensed under the Apache License, Version 2.0 (the "License");
        * you may not use this file except in compliance with the License.
      @@ -21,7 +20,7 @@ package ghidra.app.util.bin.format.pef;
        * Section kind values for instantiated sections.
        */
       public enum SectionKind {
      -	/** Code, presumed pure & position independent.*/
      +	/** Code, presumed pure and position independent.*/
       	Code(0, true),
       	/** Unpacked writeable data.*/
       	UnpackedData(1, true),
      diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffFileHeaderFlags.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffFileHeaderFlags.java
      index 07ef584b0b..c878d1dd45 100644
      --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffFileHeaderFlags.java
      +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/xcoff/XCoffFileHeaderFlags.java
      @@ -1,6 +1,5 @@
       /* ###
        * IP: GHIDRA
      - * REVIEWED: YES
        *
        * Licensed under the Apache License, Version 2.0 (the "License");
        * you may not use this file except in compliance with the License.
      @@ -38,7 +37,7 @@ public final class XCoffFileHeaderFlags {
       	public final static int F_AR32WR       = 0x0100;
       	/** file is 32-bit big-endian */
       	public final static int F_AR32W        = 0x0200;
      -	/** rs/6000 aix: dynamically loadable w/imports & exports */
      +	/** rs/6000 aix: dynamically loadable w/imports and exports */
       	public final static int F_DYNLOAD      = 0x1000;
       	/** rs/6000 aix: file is a shared object */
       	public final static int F_SHROBJ       = 0x2000;
      diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.java
      index d84fa9bdff..70ab14a32f 100644
      --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.java
      +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/cparser/CPP/DefineTable.java
      @@ -63,9 +63,9 @@ public class DefineTable {
       	}
       
       	/**
      -	 * @param image
      -	 * @param pos
      -	 * @return
      +	 * @param buf the buffer containing the define
      +	 * @param pos the position of the define
      +	 * @return the define
       	 */
       	public String getDefineAt(StringBuffer buf, int pos) {
       		Hashtable findTable = lookupTable;
      @@ -540,9 +540,10 @@ public class DefineTable {
       	}
       
       	/**
      -	 * @param image
      -	 * @param i
      -	 * @return
      +	 * @param buf the buffer containing the parameters
      +	 * @param start the starting index of the parameters in the buffer
      +	 * @param endChar the delimiter for the parameters
      +	 * @return the parameters
       	 */
       	public String getParams(StringBuffer buf, int start, char endChar) {
       		int len = buf.length();
      diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/DataTypeSelectionDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/DataTypeSelectionDialog.java
      index fe9cda837e..add87eb097 100644
      --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/DataTypeSelectionDialog.java
      +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/DataTypeSelectionDialog.java
      @@ -171,8 +171,6 @@ public class DataTypeSelectionDialog extends DialogComponentProvider {
       	 * This method is useful for widgets that have embedded editors that launch this dialog.  For
       	 * these editors, like tables, it is nice to be able to tab through various editors.  This
       	 * method allows these editors to keep this functionality, even though a new dialog was shown.
      -	 * 
      -	 * @see #wasClosedByTab
       	 */
       	public void setTabCommitsEdit(boolean doesCommit) {
       		editor.setTabCommitsEdit(doesCommit);
      diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/DataTypeUrl.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/DataTypeUrl.java
      index 0c46d1af1c..f5adc25086 100644
      --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/DataTypeUrl.java
      +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/DataTypeUrl.java
      @@ -25,9 +25,9 @@ import ghidra.util.UniversalID;
       
       /**
        * A class to produce and parse URLs of the form:
      - * 
      + * 
      {@literal
        * 	datatype:/12345678?uid=12345678&name=Bob
      - * 
      + * }
      * where the first number is the ID of the {@link DataTypeManager} and the second number is * the {@link DataType} ID. */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/DataApplyOptions.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/DataApplyOptions.java index ae873737f1..f4a0ac2328 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/DataApplyOptions.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/DataApplyOptions.java @@ -136,7 +136,7 @@ public class DataApplyOptions { /** * Sets whether or not to disassemble and create a function that is referred to * by the current new structure. - * @param createLabel true indicates a function should be created. + * @param createFunction true indicates a function should be created. */ public void setCreateFunction(boolean createFunction) { this.createFunction = createFunction; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/GuidDataType.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/GuidDataType.java index 1d1f49fc77..b76cf818f4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/GuidDataType.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/GuidDataType.java @@ -66,65 +66,41 @@ public class GuidDataType extends BuiltIn { super(null, NAME, dtm); } - /** - * - * @see ghidra.program.model.data.DataType#getMnemonic(Settings) - */ + @Override public String getMnemonic(Settings settings) { return NAME; } - /** - * - * @see ghidra.program.model.data.DataType#getLength() - */ + @Override public int getLength() { return SIZE; } - /** - * @see ghidra.program.model.data.DataType#isDynamicallySized() - */ + @Override public boolean isDynamicallySized() { return false; } - /** - * - * @see ghidra.program.model.data.DataType#getDescription() - */ + @Override public String getDescription() { return NAME; } - /** - * - * @see ghidra.program.model.data.DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.docking.settings.Settings, int) - */ + @Override public Object getValue(MemBuffer buf, Settings settings, int length) { return getString(buf, settings); } - /** - * - * @see ghidra.program.model.data.DataType#getRepresentation(MemBuffer, Settings, int) - */ + @Override public String getRepresentation(MemBuffer buf, Settings settings, int length) { return getString(buf, settings); } - /** - * @see ghidra.program.model.data.BuiltIn#getBuiltInSettingsDefinitions() - */ @Override protected SettingsDefinition[] getBuiltInSettingsDefinitions() { return SETTINGS_DEFS; } - /** - * - * @see ghidra.program.model.data.ByteDataType#getString(ProcessorContext, Settings) - */ protected String getString(MemBuffer buf, Settings settings) { Object guidName = settings.getValue(KEY); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/RTTI0DataType.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/RTTI0DataType.java index 3e2d7ebbd6..23b498a8e0 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/RTTI0DataType.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/RTTI0DataType.java @@ -346,7 +346,7 @@ public class RTTI0DataType extends RTTIDataType { * Gets the total length of the data created when this data type is placed at the indicated * address in memory. * @param memory the program memory for this data. - * @param address the start address of the data. + * @param startAddress the start address of the data. * @return the length of the data. zero is returned if valid data can't be created at the * indicated address using this data type. */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/RTTIDataType.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/RTTIDataType.java index 903c4024c6..dbeb697bed 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/RTTIDataType.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/RTTIDataType.java @@ -37,7 +37,7 @@ public abstract class RTTIDataType extends DynamicDataType { /** * Determines if the data type is valid for placing at the indicated address in the program. * @param program the program - * @param address the address + * @param startAddress the start address * @param overwriteInstructions true indicates that existing instructions can be overwritten * by this data type. * @param overwriteDefinedData true indicates that existing defined data can be overwritten diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/CharacterIterator.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/CharacterIterator.java index 6c3bddaccb..362363c098 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/CharacterIterator.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/CharacterIterator.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,8 +73,6 @@ public class CharacterIterator { /** * Sets the position to the specified position in the text. * @param index the position within the text. - * @return the character at the specified position - * @throws IllegalArgumentException if index is not in range from 0 to string.length()-1 */ public void setIndex(int index) { if (index < 0 || index > string.length() - 1) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledFunctionIndirect.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledFunctionIndirect.java index ef0eef5849..140a79da35 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledFunctionIndirect.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledFunctionIndirect.java @@ -23,7 +23,7 @@ import ghidra.program.model.data.*; /** * A class to represent a demangled function indirect. A function indirect is * similar to a function pointer or a function reference except that it does - * not have the start (*) for a pointer or ampersand (&) for a reference, but + * not have the start (*) for a pointer or ampersand (&) for a reference, but * is still an indirect definition (not a regular function definition). The * function indirect is prevalent in the Microsoft model, if not other models. */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledObject.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledObject.java index c353a8b070..aae834ea12 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledObject.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledObject.java @@ -298,11 +298,11 @@ public abstract class DemangledObject { /** * Returns a complete signature for the demangled symbol. - * For example: + *
      For example: * "unsigned long foo" * "unsigned char * ClassA::getFoo(float, short *)" - * "void * getBar(int **, MyStruct &)" - * Note: based on the underlying mangling scheme, the + * "void * getBar(int **, MyStruct &)" + *
      Note: based on the underlying mangling scheme, the * return type may or may not be specified in the signature. * @param format true if signature should be pretty printed * @return a complete signature for the demangled symbol @@ -463,11 +463,12 @@ public abstract class DemangledObject { return list; } + // TODO needs updating. Couldn't determine what getResigualNamespacePath was changed to. /** * Get or create the specified typeNamespace. The returned namespace may only be a partial * namespace if errors occurred. The caller should check the returned namespace and adjust * any symbol creation accordingly. Caller should use - * {@link #getResidualNamespacePath(DemangledType, Namespace)} to handle the case where + * getResidualNamespacePath(DemangledType, Namespace) to handle the case where * only a partial namespace has been returned. * @param program * @param typeNamespace demangled namespace diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledType.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledType.java index 4a8c14ce40..389eb05262 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledType.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledType.java @@ -36,7 +36,7 @@ public class DemangledType { * (such as Foo::Bar) and breaks it into a hierarchy of types where each type * represents one item in the list of namespace elements. * - * @param demangledType the type to split + * @param otherNamespace the type to convert * @return the original type if the name does not represent a namespace; a new type * that contains a child, that contains a child and so on, representing the * split-up of the original namespace string. @@ -129,8 +129,8 @@ public class DemangledType { } /** - * Sets the original mangled name - * @param mangled the original mangled name + * Gets the original mangled name + * @return the original mangled name */ public String getOriginalMangled() { return originalMangled; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemanglerOptions.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemanglerOptions.java index 3e98821655..42d607e6d9 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemanglerOptions.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemanglerOptions.java @@ -35,62 +35,58 @@ public class DemanglerOptions { } /** - * True signals to apply function signatures that are demangled. + * Checks if the apply signature option is currently set. * - * @param doSignature True signals to apply function signatures that are demangled. + * @return true if set to apply function signatures that are demangled. */ public boolean applySignature() { return applySignature; } /** - * True signals to apply function signatures that are demangled. + * Set the option to apply function signatures that are demangled. * - * @param doSignature True signals to apply function signatures that are demangled. + * @param applySignature true to apply function signatures that are demangled. */ public void setApplySignature(boolean applySignature) { this.applySignature = applySignature; } /** - * True signals to perform disassembly for known data structures (like functions) when - * demangling. + * Checks if the option to perform disassembly for known data structures (like functions) when + * demangling is set. * - * @param doSignature True signals to perform disassembly + * @return true if the option is set. */ public boolean doDisassembly() { return doDisassembly; } /** - * True signals to perform disassembly for known data structures (like functions) when + * Sets the option to perform disassembly for known data structures (like functions) when * demangling. * - * @param doSignature True signals to perform disassembly + * @param doDisassembly true to perform disassembly when demangling. */ public void setDoDisassembly(boolean doDisassembly) { this.doDisassembly = doDisassembly; } /** - * True signals to only demangle symbol names that follow known mangled patterns. False triggers - * all symbols to be demangled, which results in some symbols getting demangled that were not - * actually mangled symbols. + * Checks if the option to only demangle known mangled patterns is set. * - * @param demangleOnlyKnownPatterns True signals to only demangle symbol names that follow - * known mangled patterns. + * @return true if only known mangled patterns will be demangled. */ public boolean demangleOnlyKnownPatterns() { return demangleOnlyKnownPatterns; } /** - * True signals to only demangle symbol names that follow known mangled patterns. False triggers - * all symbols to be demangled, which results in some symbols getting demangled that were not + * Sets the option to only demangle known mangled patterns. Setting this to false causes + * all symbols to be demangled, which may result in some symbols getting demangled that were not * actually mangled symbols. * - * @param demangleOnlyKnownPatterns True signals to only demangle symbol names that follow - * known mangled patterns. + * @param demangleOnlyKnownPatterns true to only demangle known mangled patterns. */ public void setDemangleOnlyKnownPatterns(boolean demangleOnlyKnownPatterns) { this.demangleOnlyKnownPatterns = demangleOnlyKnownPatterns; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemanglerUtil.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemanglerUtil.java index 3eb1ff0dce..3b85f0e534 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemanglerUtil.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemanglerUtil.java @@ -98,7 +98,7 @@ public class DemanglerUtil { /** * Converts the list of names into a namespace linked list. * Given names = { "A", "B", "C" }, which represents "A::B::C". - * The following will be created "Namespace{A}->Namespace{B}->Namespace{C}" + * The following will be created {@literal "Namespace{A}->Namespace{B}->Namespace{C}"} * and Namespace{C} will be returned. * * NOTE: the list will be empty after the call. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/dialog/CheckoutDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/dialog/CheckoutDialog.java index 5004960bc3..655e1fad1b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/dialog/CheckoutDialog.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/dialog/CheckoutDialog.java @@ -43,10 +43,6 @@ public class CheckoutDialog extends DialogComponentProvider { private boolean exclusiveCheckout; private int actionID = DO_NOT_CHECKOUT; - /** - * Constructor - * @param fileList list of DomainFile objects that are checked out - */ public CheckoutDialog(DomainFile df, User user) { super("Versioned File not Checked Out", true); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/Exporter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/Exporter.java index 1588138f50..47e9ede3a2 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/Exporter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/exporter/Exporter.java @@ -104,7 +104,7 @@ abstract public class Exporter implements ExtensionPoint { * Returns true if this exporter knows how to export the given domain object. For example, * some exporters know how to export programs, other exporters can export project data type * archives. - * @param domainObject the domain object to test for exporting. + * @param domainObjectClass the class of the domain object to test for exporting. * @return true if this exporter knows how to export the given domain object. */ public boolean canExportDomainObject(Class domainObjectClass) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/HeadlessAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/HeadlessAnalyzer.java index 2f123b9a54..e47e7fcb6a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/HeadlessAnalyzer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/headless/HeadlessAnalyzer.java @@ -956,7 +956,7 @@ public class HeadlessAnalyzer { } /** - * Run prescripts -> analysis -> postscripts (any of these steps is optional). + *{@literal Run prescripts -> analysis -> postscripts (any of these steps is optional).} * @param fileAbsolutePath Path of the file to analyze. * @param program The program to analyze. * @return true if the program file should be kept. If analysis or scripts have marked diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/LibrarySearchPathManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/LibrarySearchPathManager.java index 1423dc13f9..df6c0cae8c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/LibrarySearchPathManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/LibrarySearchPathManager.java @@ -89,7 +89,7 @@ public class LibrarySearchPathManager { * Call this to restore paths that were previously persisted. If you really need to change * the paths for the entire JVM, then call {@link #setLibraryPaths(String[])}. * - * @param the paths to restore + * @param paths the paths to restore */ public static void restoreLibraryPaths(String[] paths) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractProgramLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractProgramLoader.java index 7d22e19791..4e9b49c389 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractProgramLoader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/AbstractProgramLoader.java @@ -204,7 +204,7 @@ public abstract class AbstractProgramLoader implements Loader { } /** - * This gets called after the given list of {@Program}s is finished loading. It provides + * This gets called after the given list of {@link Program}s is finished loading. It provides * subclasses an opportunity to do follow-on actions to the load. * * @param loadedPrograms The {@link Program}s that got loaded. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/BoundedBufferedReader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/BoundedBufferedReader.java index 9af4bceee3..eda277e84b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/BoundedBufferedReader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/BoundedBufferedReader.java @@ -49,7 +49,7 @@ public class BoundedBufferedReader extends Reader { * Input-buffer size * * @exception IllegalArgumentException - * If sz is <= 0 + * If sz is <= 0 */ public BoundedBufferedReader(Reader in, int sz) { super(in); @@ -458,7 +458,7 @@ public class BoundedBufferedReader extends Reader { * than limit. Therefore large values should be used with care. * * @exception IllegalArgumentException - * If readAheadLimit is < 0 + * If readAheadLimit is < 0 * @exception IOException * If an I/O error occurs */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MemorySectionResolver.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MemorySectionResolver.java index a991160e09..b030036e87 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MemorySectionResolver.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MemorySectionResolver.java @@ -53,7 +53,7 @@ public abstract class MemorySectionResolver { * @param key the loadable section key which corresponds to this memory "section" * @param fileOffset data source file offset. It is assumed that all initialized * "sections" draw from a single data source. - * @param length number of bytes within "section" + * @param numberOfBytes number of bytes within "section" * @param startAddress desired physical start address of "section" * @param sectionName name of "section" * @param isReadable true if "section" has read privilege @@ -90,7 +90,7 @@ public abstract class MemorySectionResolver { * Add uninitialized memory "section". * The last "section" defined will take precedence when resolving conflicts. * @param key the loadable section key which corresponds to this memory "section" - * @param length number of bytes within "section" + * @param numberOfBytes number of bytes within "section" * @param startAddress desired physical start address of "section" * @param sectionName name of "section" * @param isReadable true if "section" has read privilege diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/parser/FunctionSignatureParser.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/parser/FunctionSignatureParser.java index 28839c9972..4b6d26c670 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/parser/FunctionSignatureParser.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/parser/FunctionSignatureParser.java @@ -44,7 +44,7 @@ import ghidra.util.exception.CancelledException; *

      * Some examples of valid c++ that would fail due to the current limitations: *

      - * void foo(myclass x) - fails due to comma in x's data type name + * {@literal void foo(myclass x) - fails due to comma in x's data type name} * int operator()(int x) - fails due to parens in function name unsigned int * bar(float y) - fails due to space in return type name *

      @@ -345,8 +345,8 @@ public class FunctionSignatureParser { } /** - * provides a simple caching datatype manager service - * wrapper. Implementation intended for use with {@link FunctionSignatureParser} + * Provides a simple caching datatype manager service wrapper.
      + * Implementation intended for use with {@link FunctionSignatureParser} * and underlying {@link DataTypeParser} and {@link DataTypeUtilities} classes. */ private static class ParserDataTypeManagerService implements DataTypeQueryService { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/recognizer/Recognizer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/recognizer/Recognizer.java index 8484da014d..6bdd6d03d2 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/recognizer/Recognizer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/recognizer/Recognizer.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,8 +39,7 @@ public interface Recognizer extends ExtensionPoint { * efficiency's sake the array of bytes is just passed to each recognizer in * turn. Abuse this and we will need to create copies, and everyone loses. * - * @param byteProvider - * the byte provider + * @param bytes the bytes to recognize * @return a String description of the recognition, or null if it is not * recognized */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/AddressAnnotatedStringHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/AddressAnnotatedStringHandler.java index ae7b6f544d..94bb1e3110 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/AddressAnnotatedStringHandler.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/AddressAnnotatedStringHandler.java @@ -36,9 +36,6 @@ public class AddressAnnotatedStringHandler implements AnnotatedStringHandler { + "string"; private static final String[] SUPPORTED_ANNOTATIONS = { "address", "addr" }; - /** - * @see AnnotatedStringHandler#createAnnotatedString(AttributedString, String[], ServiceProvider) - */ @Override public AttributedString createAnnotatedString(AttributedString prototypeString, String[] text, Program program) throws AnnotationException { @@ -81,18 +78,12 @@ public class AddressAnnotatedStringHandler implements AnnotatedStringHandler { return new AttributedString(buffer.toString(), Color.LIGHT_GRAY, prototypeString.getFontMetrics(0)); } - - /** - * @see ghidra.app.util.viewer.field.AnnotatedStringHandler#getSupportedAnnotations() - */ @Override public String[] getSupportedAnnotations() { return SUPPORTED_ANNOTATIONS; } - /** - * @see AnnotatedStringHandler#handleMouseClick(String[], Navigatable, ServiceProvider) - */ + @Override public boolean handleMouseClick(String[] annotationParts, Navigatable sourceNavigatable, ServiceProvider serviceProvider) { GoToService goToService = serviceProvider.getService(GoToService.class); @@ -109,17 +100,11 @@ public class AddressAnnotatedStringHandler implements AnnotatedStringHandler { return false; } - /** - * @see ghidra.app.util.viewer.field.AnnotatedStringHandler#getDisplayString() - */ @Override public String getDisplayString() { return "Address"; } - /** - * @see ghidra.app.util.viewer.field.AnnotatedStringHandler#getPrototypeString() - */ @Override public String getPrototypeString() { return "{@address 0x00}"; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/AnnotatedStringFieldMouseHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/AnnotatedStringFieldMouseHandler.java index 52aedbaec5..678bf10f89 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/AnnotatedStringFieldMouseHandler.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/AnnotatedStringFieldMouseHandler.java @@ -29,9 +29,6 @@ public class AnnotatedStringFieldMouseHandler implements FieldMouseHandlerExtens private static final Class[] SUPPORTED_CLASSES = new Class[] { AnnotatedTextFieldElement.class }; - /** - * @see FieldMouseHandlerExtension#fieldElementClicked(Object, Navigatable, MouseEvent, ServiceProvider) - */ @Override public boolean fieldElementClicked(Object clickedObject, Navigatable sourceNavigatable, ProgramLocation location, MouseEvent mouseEvent, ServiceProvider serviceProvider) { @@ -42,9 +39,6 @@ public class AnnotatedStringFieldMouseHandler implements FieldMouseHandlerExtens serviceProvider); } - /** - * @see FieldMouseHandlerExtension#getSupportedProgramLocations() - */ @Override public Class[] getSupportedProgramLocations() { return SUPPORTED_CLASSES; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/Annotation.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/Annotation.java index ac79b39426..97efc7fdd0 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/Annotation.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/Annotation.java @@ -67,9 +67,7 @@ public class Annotation { /** * Constructor - * Note: This constructor assumes that the provided annotation text matches the - * regular expression defined in {@link docking.widgets.fieldpanel.support.FieldUtils#ENCLOSING_ANNOTATION_PATTERN}, which - * assures that the string starts with "{

      @
      " and ends with '}' + * Note: This constructor assumes that the string starts with "{
      @
      " and ends with '}' * * @param annotationText The complete annotation text. * @param prototypeString An AttributedString that provides the attributes for the display diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/AssignedVariableFieldFactory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/AssignedVariableFieldFactory.java index 8feadf9975..8463984fd7 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/AssignedVariableFieldFactory.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/AssignedVariableFieldFactory.java @@ -56,9 +56,6 @@ public class AssignedVariableFieldFactory extends FieldFactory { super(FIELD_NAME, model, hsProvider, displayOptions, fieldOptions); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#fieldOptionsChanged(ghidra.framework.options.ToolOptions, java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void fieldOptionsChanged(Options options, String optionName, Object oldValue, Object newValue) { @@ -119,9 +116,6 @@ public class AssignedVariableFieldFactory extends FieldFactory { width, elements.length + 1, hlProvider); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getProgramLocation(int, int, ghidra.app.util.viewer.field.ListingField) - */ @Override public ProgramLocation getProgramLocation(int row, int col, ListingField bf) { Object obj = bf.getProxy().getObject(); @@ -132,9 +126,6 @@ public class AssignedVariableFieldFactory extends FieldFactory { return new AssignedVariableLocation(cu.getProgram(), cu.getMinAddress(), row, col); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getFieldLocation(ghidra.app.util.viewer.field.ListingField, BigInteger, int, ghidra.program.util.ProgramLocation) - */ @Override public FieldLocation getFieldLocation(ListingField bf, BigInteger index, int fieldNum, ProgramLocation programLoc) { @@ -146,9 +137,6 @@ public class AssignedVariableFieldFactory extends FieldFactory { return null; } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#acceptsType(int, java.lang.Class) - */ @Override public boolean acceptsType(int category, Class proxyObjectClass) { if (!CodeUnit.class.isAssignableFrom(proxyObjectClass)) { @@ -164,9 +152,6 @@ public class AssignedVariableFieldFactory extends FieldFactory { fieldOptions); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getDefaultColor() - */ @Override public Color getDefaultColor() { return DEFAULT_COLOR; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/CommentFieldMouseHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/CommentFieldMouseHandler.java index a836a0bee8..5e8d660f22 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/CommentFieldMouseHandler.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/CommentFieldMouseHandler.java @@ -33,17 +33,11 @@ public class CommentFieldMouseHandler implements FieldMouseHandlerExtension { new Class[] { CommentFieldLocation.class, EolCommentFieldLocation.class, PlateFieldLocation.class, AutomaticCommentFieldLocation.class }; - /** - * @see ghidra.app.util.viewer.field.FieldMouseHandlerExtension#getSupportedProgramLocations() - */ @Override public Class[] getSupportedProgramLocations() { return SUPPORTED_CLASSES; } - /** - * @see FieldMouseHandlerExtension#fieldElementClicked(Object, Navigatable, MouseEvent, ServiceProvider) - */ @Override public boolean fieldElementClicked(Object clickedObject, Navigatable sourceNavigatable, ProgramLocation location, MouseEvent mouseEvent, ServiceProvider serviceProvider) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/CommentUtils.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/CommentUtils.java index 96c546c819..4d5326675a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/CommentUtils.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/CommentUtils.java @@ -101,7 +101,7 @@ public class CommentUtils { /** * Returns the display string for the given raw annotation text. Annotations are - * encoded strings that fit this pattern: {@name text}. This method + * encoded strings that fit this pattern: {@literal {@name text}}. This method * will parse the given text, converting any annotations into their display version. * * @param rawCommentText text that may include annotations diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ErrorFieldMouseHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ErrorFieldMouseHandler.java index 790615f93c..6712cfb74d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ErrorFieldMouseHandler.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ErrorFieldMouseHandler.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,9 +30,6 @@ public class ErrorFieldMouseHandler implements FieldMouseHandlerExtension { private final static Class[] SUPPORTED_CLASSES = new Class[] { ErrorListingField.class }; - /** - * @see ghidra.app.util.viewer.field.FieldMouseHandlerExtension#fieldElementClicked(java.lang.Object, Navigatable, java.awt.event.MouseEvent, ghidra.framework.plugintool.ServiceProvider) - */ @Override public boolean fieldElementClicked(Object clickedObject, Navigatable sourceNavigatable, ProgramLocation location, MouseEvent mouseEvent, ServiceProvider serviceProvider) { @@ -48,9 +44,6 @@ public class ErrorFieldMouseHandler implements FieldMouseHandlerExtension { return true; } - /** - * @see FieldMouseHandlerExtension#getSupportedProgramLocations() - */ @Override public Class[] getSupportedProgramLocations() { return SUPPORTED_CLASSES; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionCallFixupFieldFactory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionCallFixupFieldFactory.java index 9b8c0b49ec..c79fb0b1a6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionCallFixupFieldFactory.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionCallFixupFieldFactory.java @@ -75,9 +75,6 @@ public class FunctionCallFixupFieldFactory extends FieldFactory { OptionsGui.FUN_CALL_FIXUP.getDefaultColor()); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getField(ProxyObj, int) - */ @Override public ListingField getField(ProxyObj proxy, int varWidth) { Object obj = proxy.getObject(); @@ -104,9 +101,6 @@ public class FunctionCallFixupFieldFactory extends FieldFactory { new CompositeFieldElement(textElements), startX + varWidth, width, hlProvider); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getProgramLocation(int, int, ghidra.app.util.viewer.field.ListingField) - */ @Override public ProgramLocation getProgramLocation(int row, int col, ListingField bf) { ProxyObj proxy = bf.getProxy(); @@ -121,9 +115,6 @@ public class FunctionCallFixupFieldFactory extends FieldFactory { return null; } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getFieldLocation(ghidra.app.util.viewer.field.ListingField, BigInteger, int, ghidra.program.util.ProgramLocation) - */ @Override public FieldLocation getFieldLocation(ListingField bf, BigInteger index, int fieldNum, ProgramLocation loc) { @@ -135,9 +126,6 @@ public class FunctionCallFixupFieldFactory extends FieldFactory { return null; } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#acceptsType(int, java.lang.Class) - */ @Override public boolean acceptsType(int category, Class proxyObjectClass) { if (!Function.class.isAssignableFrom(proxyObjectClass)) { @@ -153,17 +141,11 @@ public class FunctionCallFixupFieldFactory extends FieldFactory { fieldOptions); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getDefaultColor() - */ @Override public Color getDefaultColor() { return OptionsGui.FUN_CALL_FIXUP.getDefaultColor(); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#fieldOptionsChanged(ghidra.framework.options.ToolOptions, java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void fieldOptionsChanged(Options options, String optionName, Object oldValue, Object newValue) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionSignatureFieldFactory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionSignatureFieldFactory.java index 3964806c5c..22ba668786 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionSignatureFieldFactory.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionSignatureFieldFactory.java @@ -113,9 +113,6 @@ public class FunctionSignatureFieldFactory extends FieldFactory { literalColor = options.getColor(OptionsGui.SEPARATOR.getColorOptionName(), Color.BLACK); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getField(ProxyObj, int) - */ @Override public ListingField getField(ProxyObj proxy, int varWidth) { Object obj = proxy.getObject(); @@ -282,9 +279,6 @@ public class FunctionSignatureFieldFactory extends FieldFactory { return funNameColor; } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getProgramLocation(int, int, ghidra.app.util.viewer.field.ListingField) - */ @Override public ProgramLocation getProgramLocation(int fieldRow, int fieldColumn, ListingField listingField) { @@ -315,9 +309,6 @@ public class FunctionSignatureFieldFactory extends FieldFactory { return null; } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getFieldLocation(ghidra.app.util.viewer.field.ListingField, BigInteger, int, ghidra.program.util.ProgramLocation) - */ @Override public FieldLocation getFieldLocation(ListingField bf, BigInteger index, int fieldNum, ProgramLocation loc) { @@ -412,9 +403,6 @@ public class FunctionSignatureFieldFactory extends FieldFactory { return elements; } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#acceptsType(int, java.lang.Class) - */ @Override public boolean acceptsType(int category, Class proxyObjectClass) { if (!Function.class.isAssignableFrom(proxyObjectClass)) { @@ -430,17 +418,11 @@ public class FunctionSignatureFieldFactory extends FieldFactory { fieldOptions); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getDefaultColor() - */ @Override public Color getDefaultColor() { return OptionsGui.FUN_NAME.getDefaultColor(); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#fieldOptionsChanged(ghidra.framework.options.ToolOptions, java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void fieldOptionsChanged(Options options, String optionName, Object oldValue, Object newValue) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionSignatureSourceFieldFactory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionSignatureSourceFieldFactory.java index c9761b3c81..218755d3b4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionSignatureSourceFieldFactory.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/FunctionSignatureSourceFieldFactory.java @@ -73,9 +73,6 @@ public class FunctionSignatureSourceFieldFactory extends FieldFactory { literalColor = options.getColor(OptionsGui.SEPARATOR.getColorOptionName(), Color.BLACK); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getField(ProxyObj, int) - */ @Override public ListingField getField(ProxyObj proxy, int varWidth) { if (!enabled) { @@ -93,9 +90,6 @@ public class FunctionSignatureSourceFieldFactory extends FieldFactory { return null; } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getProgramLocation(int, int, ghidra.app.util.viewer.field.ListingField) - */ @Override public ProgramLocation getProgramLocation(int row, int col, ListingField bf) { ProxyObj proxy = bf.getProxy(); @@ -110,9 +104,6 @@ public class FunctionSignatureSourceFieldFactory extends FieldFactory { return null; } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getFieldLocation(ghidra.app.util.viewer.field.ListingField, BigInteger, int, ghidra.program.util.ProgramLocation) - */ @Override public FieldLocation getFieldLocation(ListingField bf, BigInteger index, int fieldNum, ProgramLocation loc) { @@ -124,9 +115,6 @@ public class FunctionSignatureSourceFieldFactory extends FieldFactory { return null; } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#acceptsType(int, java.lang.Class) - */ @Override public boolean acceptsType(int category, Class proxyObjectClass) { if (!Function.class.isAssignableFrom(proxyObjectClass)) { @@ -142,17 +130,11 @@ public class FunctionSignatureSourceFieldFactory extends FieldFactory { fieldOptions); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getDefaultColor() - */ @Override public Color getDefaultColor() { return OptionsGui.SEPARATOR.getDefaultColor(); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#fieldOptionsChanged(ghidra.framework.options.ToolOptions, java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void fieldOptionsChanged(Options options, String optionName, Object oldValue, Object newValue) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/IndentField.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/IndentField.java index 5849dd4a6f..1f321b48c5 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/IndentField.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/IndentField.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -176,9 +175,6 @@ public class IndentField implements ListingField { this.startY = startY; } - /** - * @see docking.widgets.fieldpanel.field.Field#paint(java.awt.Graphics, docking.widgets.fieldpanel.internal.PaintContext, boolean, docking.widgets.fieldpanel.support.RowColLocation) - */ @Override public void paint(JComponent c, Graphics g, PaintContext context, FieldBackgroundColorManager map, RowColLocation cursorLoc, int rowHeight) { @@ -224,9 +220,6 @@ public class IndentField implements ListingField { } } - /** - * @see docking.widgets.fieldpanel.field.Field#contains(int, int) - */ @Override public boolean contains(int x, int y) { if ((x < startX) || (x >= startX + fieldWidth) || (y < startY) || (y >= startY + height)) { @@ -235,65 +228,41 @@ public class IndentField implements ListingField { return true; } - /** - * @see docking.widgets.fieldpanel.field.Field#getNumRows() - */ @Override public int getNumRows() { return 1; } - /** - * @see docking.widgets.fieldpanel.field.Field#getNumCols(int) - */ @Override public int getNumCols(int row) { return 0; } - /** - * @see docking.widgets.fieldpanel.field.Field#getX(int, int) - */ @Override public int getX(int row, int col) { return startX; } - /** - * @see docking.widgets.fieldpanel.field.Field#getY(int) - */ @Override public int getY(int row) { return startY; } - /** - * @see docking.widgets.fieldpanel.field.Field#getRow(int) - */ @Override public int getRow(int y) { return 0; } - /** - * @see docking.widgets.fieldpanel.field.Field#getCol(int, int) - */ @Override public int getCol(int row, int x) { return 0; } - /** - * @see docking.widgets.fieldpanel.field.Field#isValid(int, int) - */ @Override public boolean isValid(int row, int col) { return ((row == 0) && (col == 0)); } - /** - * @see docking.widgets.fieldpanel.field.Field#getCursorBounds(int, int) - */ @Override public Rectangle getCursorBounds(int row, int col) { if (!isValid(row, col)) { @@ -303,9 +272,6 @@ public class IndentField implements ListingField { return new Rectangle(startX, -heightAbove, 2, height); } - /** - * @see docking.widgets.fieldpanel.field.Field#getScrollableUnitIncrement(int, int, int) - */ @Override public int getScrollableUnitIncrement(int topOfScreen, int direction, int max) { if ((topOfScreen < startY) || (topOfScreen > startY + height)) { @@ -318,26 +284,17 @@ public class IndentField implements ListingField { return startY - topOfScreen; } - /** - * @see docking.widgets.fieldpanel.field.Field#isPrimary() - */ @Override public boolean isPrimary() { return false; } - /** - * @see docking.widgets.fieldpanel.field.Field#rowHeightChanged(int, int) - */ @Override public void rowHeightChanged(int newHeightAbove, int newHeightBelow) { this.heightAbove = newHeightAbove; this.height = newHeightAbove + newHeightBelow; } - /** - * @see docking.widgets.fieldpanel.field.Field#getText() - */ @Override public String getText() { return ""; @@ -348,25 +305,16 @@ public class IndentField implements ListingField { return ""; } - /** - * @see docking.widgets.fieldpanel.field.Field#textOffsetToScreenLocation(int) - */ @Override public RowColLocation textOffsetToScreenLocation(int textOffset) { return new RowColLocation(0, 0); } - /** - * @see docking.widgets.fieldpanel.field.Field#screenLocationToTextOffset(int, int) - */ @Override public int screenLocationToTextOffset(int row, int col) { return 0; } - /** - * @see ListingField#getClickedObject(FieldLocation) - */ @Override public Object getClickedObject(FieldLocation fieldLocation) { return this; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/InvalidAnnotatedStringHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/InvalidAnnotatedStringHandler.java index 7c55af0efd..68bf9ebe7e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/InvalidAnnotatedStringHandler.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/InvalidAnnotatedStringHandler.java @@ -39,18 +39,12 @@ public class InvalidAnnotatedStringHandler implements AnnotatedStringHandler { this.errorText = errorText; } - /** - * @see AnnotatedStringHandler#createAnnotatedString(AttributedString, String[], ServiceProvider) - */ @Override public AttributedString createAnnotatedString(AttributedString prototypeString, String[] text, Program program) throws AnnotationException { return new AttributedString(errorText, Color.RED, prototypeString.getFontMetrics(0)); } - /** - * @see ghidra.app.util.viewer.field.AnnotatedStringHandler#getSupportedAnnotations() - */ @Override public String[] getSupportedAnnotations() { return new String[0]; @@ -62,17 +56,11 @@ public class InvalidAnnotatedStringHandler implements AnnotatedStringHandler { return false; // we don't handle clicks!!! } - /** - * @see ghidra.app.util.viewer.field.AnnotatedStringHandler#getDisplayString() - */ @Override public String getDisplayString() { return "Invalid"; } - /** - * @see ghidra.app.util.viewer.field.AnnotatedStringHandler#getPrototypeString() - */ @Override public String getPrototypeString() { return ""; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ListingTextField.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ListingTextField.java index 374744a71a..a7820bb562 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ListingTextField.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ListingTextField.java @@ -140,33 +140,21 @@ public class ListingTextField implements ListingField, TextField { this.field = field; } - /** - * @see docking.widgets.fieldpanel.field.TextField#setPrimary(boolean) - */ @Override public void setPrimary(boolean b) { field.setPrimary(b); } - /** - * @see docking.widgets.fieldpanel.field.TextField#dataToScreenLocation(int, int) - */ @Override public RowColLocation dataToScreenLocation(int dataRow, int dataColumn) { return field.dataToScreenLocation(dataRow, dataColumn); } - /** - * @see docking.widgets.fieldpanel.field.TextField#screenToDataLocation(int, int) - */ @Override public RowColLocation screenToDataLocation(int screenRow, int screenColumn) { return field.screenToDataLocation(screenRow, screenColumn); } - /** - * @see docking.widgets.fieldpanel.field.Field#getWidth() - */ @Override public int getWidth() { return field.getWidth(); @@ -177,146 +165,92 @@ public class ListingTextField implements ListingField, TextField { return field.getPreferredWidth(); } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeight() - */ @Override public int getHeight() { return field.getHeight(); } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeightAbove() - */ @Override public int getHeightAbove() { return field.getHeightAbove(); } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeightBelow() - */ @Override public int getHeightBelow() { return field.getHeightBelow(); } - /** - * @see docking.widgets.fieldpanel.field.Field#getStartX() - */ @Override public int getStartX() { return field.getStartX(); } - /** - * @see docking.widgets.fieldpanel.field.Field#paint(java.awt.Graphics, docking.widgets.fieldpanel.internal.PaintContext, boolean, docking.widgets.fieldpanel.support.RowColLocation) - */ @Override public void paint(JComponent c, Graphics g, PaintContext context, FieldBackgroundColorManager map, RowColLocation cursorLoc, int rowHeight) { field.paint(c, g, context, map, cursorLoc, rowHeight); } - /** - * @see docking.widgets.fieldpanel.field.Field#contains(int, int) - */ @Override public boolean contains(int x, int y) { return field.contains(x, y); } - /** - * @see docking.widgets.fieldpanel.field.Field#getNumRows() - */ @Override public int getNumRows() { return field.getNumRows(); } - /** - * @see docking.widgets.fieldpanel.field.Field#getNumCols(int) - */ @Override public int getNumCols(int row) { return field.getNumCols(row); } - /** - * @see docking.widgets.fieldpanel.field.Field#getX(int, int) - */ @Override public int getX(int row, int col) { return field.getX(row, col); } - /** - * @see docking.widgets.fieldpanel.field.Field#getY(int) - */ @Override public int getY(int row) { return field.getY(row); } - /** - * @see docking.widgets.fieldpanel.field.Field#getRow(int) - */ @Override public int getRow(int y) { return field.getRow(y); } - /** - * @see docking.widgets.fieldpanel.field.Field#getCol(int, int) - */ @Override public int getCol(int row, int x) { return field.getCol(row, x); } - /** - * @see docking.widgets.fieldpanel.field.Field#isValid(int, int) - */ @Override public boolean isValid(int row, int col) { return field.isValid(row, col); } - /** - * @see docking.widgets.fieldpanel.field.Field#getCursorBounds(int, int) - */ @Override public Rectangle getCursorBounds(int row, int col) { return field.getCursorBounds(row, col); } - /** - * @see docking.widgets.fieldpanel.field.Field#getScrollableUnitIncrement(int, int, int) - */ @Override public int getScrollableUnitIncrement(int topOfScreen, int direction, int max) { return field.getScrollableUnitIncrement(topOfScreen, direction, max); } - /** - * @see docking.widgets.fieldpanel.field.Field#isPrimary() - */ @Override public boolean isPrimary() { return field.isPrimary(); } - /** - * @see docking.widgets.fieldpanel.field.Field#rowHeightChanged(int, int) - */ @Override public void rowHeightChanged(int heightAbove, int heightBelow) { field.rowHeightChanged(heightAbove, heightBelow); } - /** - * @see docking.widgets.fieldpanel.field.Field#getText() - */ @Override public String getText() { return field.getText(); @@ -327,41 +261,26 @@ public class ListingTextField implements ListingField, TextField { return field.getTextWithLineSeparators(); } - /** - * @see docking.widgets.fieldpanel.field.Field#textOffsetToScreenLocation(int) - */ @Override public RowColLocation textOffsetToScreenLocation(int textOffset) { return field.textOffsetToScreenLocation(textOffset); } - /** - * @see docking.widgets.fieldpanel.field.Field#screenLocationToTextOffset(int, int) - */ @Override public int screenLocationToTextOffset(int row, int col) { return field.screenLocationToTextOffset(row, col); } - /** - * @see ghidra.app.util.viewer.field.ListingField#getFieldFactory() - */ @Override public FieldFactory getFieldFactory() { return factory; } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { return getText(); } - /** - * @see ghidra.app.util.viewer.field.ListingField#getProxy() - */ @Override public ProxyObj getProxy() { if (proxy == null) { @@ -370,25 +289,16 @@ public class ListingTextField implements ListingField, TextField { return proxy; } - /** - * @see ghidra.app.util.viewer.field.ListingField#getFieldModel() - */ @Override public FieldFormatModel getFieldModel() { return factory.getFieldModel(); } - /** - * @see docking.widgets.fieldpanel.field.TextField#isClipped() - */ @Override public boolean isClipped() { return field.isClipped(); } - /** - * @see ghidra.app.util.viewer.field.ListingField#getClickedObject(docking.widgets.fieldpanel.support.FieldLocation) - */ @Override public Object getClickedObject(FieldLocation fieldLocation) { return getFieldElement(fieldLocation.row, fieldLocation.col); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/MnemonicFieldFactory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/MnemonicFieldFactory.java index 4836c76a9a..b09be00c41 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/MnemonicFieldFactory.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/MnemonicFieldFactory.java @@ -97,9 +97,6 @@ public class MnemonicFieldFactory extends FieldFactory { super.displayOptionsChanged(options, optionName, oldValue, newValue); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#fieldOptionsChanged(ghidra.framework.options.ToolOptions, java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void fieldOptionsChanged(Options options, String optionName, Object oldValue, Object newValue) { @@ -153,9 +150,6 @@ public class MnemonicFieldFactory extends FieldFactory { width, hlProvider); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getProgramLocation(int, int, ghidra.app.util.viewer.field.ListingField) - */ @Override public ProgramLocation getProgramLocation(int row, int col, ListingField bf) { Object obj = bf.getProxy().getObject(); @@ -197,9 +191,6 @@ public class MnemonicFieldFactory extends FieldFactory { return null; } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getFieldLocation(ghidra.app.util.viewer.field.ListingField, BigInteger, int, ghidra.program.util.ProgramLocation) - */ @Override public FieldLocation getFieldLocation(ListingField bf, BigInteger index, int fieldNum, ProgramLocation programLoc) { @@ -214,9 +205,6 @@ public class MnemonicFieldFactory extends FieldFactory { return new FieldLocation(index, fieldNum, 0, loc.getCharOffset()); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#acceptsType(int, java.lang.Class) - */ @Override public boolean acceptsType(int category, Class proxyObjectClass) { if (!CodeUnit.class.isAssignableFrom(proxyObjectClass)) { @@ -232,9 +220,6 @@ public class MnemonicFieldFactory extends FieldFactory { return new MnemonicFieldFactory(formatModel, hsProvider, displayOptions, fieldOptions); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getDefaultColor() - */ @Override public Color getDefaultColor() { return OptionsGui.MNEMONIC.getDefaultColor(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/OpenCloseField.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/OpenCloseField.java index b021054c35..8de5278227 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/OpenCloseField.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/OpenCloseField.java @@ -76,25 +76,16 @@ public class OpenCloseField implements ListingField { this.toggleHandleSize = OpenCloseField.getOpenCloseHandleSize(); } - /** - * @see ghidra.app.util.viewer.field.ListingField#getFieldFactory() - */ @Override public FieldFactory getFieldFactory() { return factory; } - /** - * @see ghidra.app.util.viewer.field.ListingField#getFieldModel() - */ @Override public FieldFormatModel getFieldModel() { return factory.getFieldModel(); } - /** - * @see ghidra.app.util.viewer.field.ListingField#getProxy() - */ @Override public ProxyObj getProxy() { if (proxy == null) { @@ -103,17 +94,11 @@ public class OpenCloseField implements ListingField { return proxy; } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeightAbove() - */ @Override public int getHeightAbove() { return heightAbove; } - /** - * Returns the heightBelow the imaginary alignment line. - */ @Override public int getHeightBelow() { return heightBelow; @@ -131,9 +116,6 @@ public class OpenCloseField implements ListingField { this.heightBelow = heightBelow; } - /** - * @see docking.widgets.fieldpanel.field.Field#getWidth() - */ @Override public int getWidth() { return (indentLevel + 1) * fieldWidth; @@ -144,17 +126,11 @@ public class OpenCloseField implements ListingField { return getWidth(); // does the width of this field vary? } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeight() - */ @Override public int getHeight() { return heightAbove + heightBelow; } - /** - * @see docking.widgets.fieldpanel.field.Field#getStartX() - */ @Override public int getStartX() { return startX; @@ -175,9 +151,6 @@ public class OpenCloseField implements ListingField { this.startY = startY; } - /** - * @see docking.widgets.fieldpanel.field.Field#paint(java.awt.Graphics, docking.widgets.fieldpanel.internal.PaintContext, boolean, docking.widgets.fieldpanel.support.RowColLocation) - */ @Override public void paint(JComponent c, Graphics g, PaintContext context, FieldBackgroundColorManager map, RowColLocation cursorLoc, int rowHeight) { @@ -249,9 +222,6 @@ public class OpenCloseField implements ListingField { } } - /** - * @see docking.widgets.fieldpanel.field.Field#contains(int, int) - */ @Override public boolean contains(int x, int y) { if ((x < startX) || (x >= startX + fieldWidth) || (y < startY) || @@ -261,65 +231,41 @@ public class OpenCloseField implements ListingField { return true; } - /** - * @see docking.widgets.fieldpanel.field.Field#getNumRows() - */ @Override public int getNumRows() { return 1; } - /** - * @see docking.widgets.fieldpanel.field.Field#getNumCols(int) - */ @Override public int getNumCols(int row) { return 0; } - /** - * @see docking.widgets.fieldpanel.field.Field#getX(int, int) - */ @Override public int getX(int row, int col) { return startX; } - /** - * @see docking.widgets.fieldpanel.field.Field#getY(int) - */ @Override public int getY(int row) { return startY; } - /** - * @see docking.widgets.fieldpanel.field.Field#getRow(int) - */ @Override public int getRow(int y) { return 0; } - /** - * @see docking.widgets.fieldpanel.field.Field#getCol(int, int) - */ @Override public int getCol(int row, int x) { return 0; } - /** - * @see docking.widgets.fieldpanel.field.Field#isValid(int, int) - */ @Override public boolean isValid(int row, int col) { return ((row == 0) && (col == 0)); } - /** - * @see docking.widgets.fieldpanel.field.Field#getCursorBounds(int, int) - */ @Override public Rectangle getCursorBounds(int row, int col) { if (!isValid(row, col)) { @@ -329,9 +275,6 @@ public class OpenCloseField implements ListingField { return new Rectangle(startX, -heightAbove, 2, heightAbove + heightBelow); } - /** - * @see docking.widgets.fieldpanel.field.Field#getScrollableUnitIncrement(int, int, int) - */ @Override public int getScrollableUnitIncrement(int topOfScreen, int direction, int max) { if ((topOfScreen < startY) || (topOfScreen > startY + heightAbove + heightBelow)) { @@ -344,26 +287,17 @@ public class OpenCloseField implements ListingField { return startY - topOfScreen; } - /** - * @see docking.widgets.fieldpanel.field.Field#isPrimary() - */ @Override public boolean isPrimary() { return false; } - /** - * @see docking.widgets.fieldpanel.field.Field#rowHeightChanged(int, int) - */ @Override public void rowHeightChanged(int newHeightAbove, int newHeightBelow) { this.heightAbove = newHeightAbove; this.heightBelow = newHeightBelow; } - /** - * @see docking.widgets.fieldpanel.field.Field#getText() - */ @Override public String getText() { return ""; @@ -374,25 +308,16 @@ public class OpenCloseField implements ListingField { return ""; } - /** - * @see docking.widgets.fieldpanel.field.Field#textOffsetToScreenLocation(int) - */ @Override public RowColLocation textOffsetToScreenLocation(int textOffset) { return new RowColLocation(0, 0); } - /** - * @see docking.widgets.fieldpanel.field.Field#screenLocationToTextOffset(int, int) - */ @Override public int screenLocationToTextOffset(int row, int col) { return 0; } - /** - * @see ghidra.app.util.viewer.field.ListingField#getClickedObject(docking.widgets.fieldpanel.support.FieldLocation) - */ @Override public Object getClickedObject(FieldLocation fieldLocation) { return this; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/RegisterTransitionFieldFactory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/RegisterTransitionFieldFactory.java index edbbea990d..dcbbd95a44 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/RegisterTransitionFieldFactory.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/RegisterTransitionFieldFactory.java @@ -74,9 +74,6 @@ public class RegisterTransitionFieldFactory extends FieldFactory { showContextRegisters = fieldOptions.getBoolean(DISPLAY_HIDDEN_REGISTERS_OPTION_NAME, false); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#fieldOptionsChanged(ghidra.framework.options.ToolOptions, java.lang.String, java.lang.Object, java.lang.Object) - */ @Override public void fieldOptionsChanged(Options options, String optionName, Object oldValue, Object newValue) { @@ -89,9 +86,6 @@ public class RegisterTransitionFieldFactory extends FieldFactory { } @Override - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getField(int, ghidra.app.util.viewer.proxy.ProxyObj, int) - */ public void displayOptionsChanged(Options options, String optionName, Object oldValue, Object newValue) { super.displayOptionsChanged(options, optionName, oldValue, newValue); @@ -172,9 +166,6 @@ public class RegisterTransitionFieldFactory extends FieldFactory { return valueStr; } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getProgramLocation(int, int, ghidra.app.util.viewer.field.ListingField) - */ @Override public ProgramLocation getProgramLocation(int row, int col, ListingField bf) { Object obj = bf.getProxy().getObject(); @@ -248,9 +239,6 @@ public class RegisterTransitionFieldFactory extends FieldFactory { return value1.equals(value2); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getFieldLocation(ghidra.app.util.viewer.field.ListingField, BigInteger, int, ghidra.program.util.ProgramLocation) - */ @Override public FieldLocation getFieldLocation(ListingField bf, BigInteger index, int fieldNum, ProgramLocation programLoc) { @@ -262,9 +250,6 @@ public class RegisterTransitionFieldFactory extends FieldFactory { return new FieldLocation(index, fieldNum, loc.getRow(), loc.getCharOffset()); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#acceptsType(int, java.lang.Class) - */ @Override public boolean acceptsType(int category, Class proxyObjectClass) { if (!CodeUnit.class.isAssignableFrom(proxyObjectClass)) { @@ -280,9 +265,6 @@ public class RegisterTransitionFieldFactory extends FieldFactory { fieldOptions); } - /** - * @see ghidra.app.util.viewer.field.FieldFactory#getDefaultColor() - */ @Override public Color getDefaultColor() { return OptionsGui.MNEMONIC.getDefaultColor(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ThunkedFunctionFieldMouseHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ThunkedFunctionFieldMouseHandler.java index 68e90424c0..babbde2a93 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ThunkedFunctionFieldMouseHandler.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/ThunkedFunctionFieldMouseHandler.java @@ -34,9 +34,6 @@ public class ThunkedFunctionFieldMouseHandler implements FieldMouseHandlerExtens private final static Class[] SUPPORTED_CLASSES = new Class[] { ThunkedFunctionFieldLocation.class, FunctionNameFieldLocation.class }; - /** - * @see FieldMouseHandlerExtension#fieldElementClicked(Object, Navigatable, MouseEvent, ServiceProvider) - */ @Override public boolean fieldElementClicked(Object clickedObject, Navigatable navigatable, ProgramLocation location, MouseEvent mouseEvent, ServiceProvider serviceProvider) { @@ -85,9 +82,6 @@ public class ThunkedFunctionFieldMouseHandler implements FieldMouseHandlerExtens return goToService.goTo(navigatable, gotoAddr); } - /** - * @see FieldMouseHandlerExtension#getSupportedProgramLocations() - */ @Override public Class[] getSupportedProgramLocations() { return SUPPORTED_CLASSES; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/URLAnnotatedStringHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/URLAnnotatedStringHandler.java index a01c9502be..fc08f64810 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/URLAnnotatedStringHandler.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/URLAnnotatedStringHandler.java @@ -41,9 +41,6 @@ public class URLAnnotatedStringHandler implements AnnotatedStringHandler { + "optionally followed by a display string"; private static final String[] SUPPORTED_ANNOTATIONS = { "url", "hyperlink", "href", "link" }; - /** - * @see AnnotatedStringHandler#createAnnotatedString(AttributedString, String[], ServiceProvider) - */ @Override public AttributedString createAnnotatedString(AttributedString prototypeString, String[] text, Program program) throws AnnotationException { @@ -74,9 +71,6 @@ public class URLAnnotatedStringHandler implements AnnotatedStringHandler { prototypeString.getFontMetrics(0), true, prototypeString.getColor(0)); } - /** - * @see AnnotatedStringHandler#getSupportedAnnotations() - */ @Override public String[] getSupportedAnnotations() { return SUPPORTED_ANNOTATIONS; @@ -113,17 +107,11 @@ public class URLAnnotatedStringHandler implements AnnotatedStringHandler { return false; } - /** - * @see ghidra.app.util.viewer.field.AnnotatedStringHandler#getDisplayString() - */ @Override public String getDisplayString() { return "URL"; } - /** - * @see ghidra.app.util.viewer.field.AnnotatedStringHandler#getPrototypeString() - */ @Override public String getPrototypeString() { return "{@url http://www.example.com}"; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/XRefFieldMouseHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/XRefFieldMouseHandler.java index 8daa40bf46..d3885188fd 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/XRefFieldMouseHandler.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/XRefFieldMouseHandler.java @@ -40,9 +40,6 @@ public class XRefFieldMouseHandler implements FieldMouseHandlerExtension { private final static Class[] SUPPORTED_CLASSES = new Class[] { XRefFieldLocation.class, XRefHeaderFieldLocation.class }; - /** - * @see FieldMouseHandlerExtension#fieldElementClicked(Object, Navigatable, MouseEvent, ServiceProvider) - */ @Override public boolean fieldElementClicked(Object clickedObject, Navigatable sourceNavigatable, ProgramLocation location, MouseEvent mouseEvent, ServiceProvider serviceProvider) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FieldHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FieldHeader.java index 36ee041408..41dc4f7d1f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FieldHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FieldHeader.java @@ -66,7 +66,8 @@ public class FieldHeader extends JTabbedPane implements ChangeListener { /** * Constructs a new FieldHeaderPanel * @param formatMgr the format manager to display tabbed panels for. - * @param rangeModel the scroll model to coordinate the view for. + * @param scroller the scroll model to coordinate the view for. + * @param panel the field panel to use. */ public FieldHeader(FormatManager formatMgr, IndexedScrollPane scroller, FieldPanel panel) { this.formatManager = formatMgr; @@ -81,9 +82,6 @@ public class FieldHeader extends JTabbedPane implements ChangeListener { addChangeListener(this); } - /** - * @see javax.swing.event.ChangeListener#stateChanged(javax.swing.event.ChangeEvent) - */ @Override public void stateChanged(ChangeEvent ev) { int index = this.getSelectedIndex(); @@ -220,10 +218,10 @@ public class FieldHeader extends JTabbedPane implements ChangeListener { stateChanged(null); } - /** - * Main test. - * @param args command line arguments. - */ +// /** +// * Main test. +// * @param args command line arguments. +// */ // public static void main(String[] args) { // DockingApplication.initialize(new HeadedDockingApplicationConfiguration()); // try { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FieldHeaderComp.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FieldHeaderComp.java index 2a063a232e..e4ae6b1826 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FieldHeaderComp.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FieldHeaderComp.java @@ -63,8 +63,8 @@ public class FieldHeaderComp extends JPanel { /** * Constructs a new FieldHeader for the given model. - * @param formatMgr the format manager * @param headerPanel the headerPanel containing this component. + * @param modelNumber the model number for this component. */ public FieldHeaderComp(FieldHeader headerPanel, int modelNumber) { FormatManager formatMgr = headerPanel.getFormatManager(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FormatManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FormatManager.java index f965d22cd3..b68562289d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FormatManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/FormatManager.java @@ -180,7 +180,7 @@ public class FormatManager implements OptionsChangeListener { /** * Returns the format model for the given index. * - * @param inde the index of the format model to return. + * @param index the index of the format model to return. */ public FieldFormatModel getModel(int index) { return models[index]; @@ -216,14 +216,6 @@ public class FormatManager implements OptionsChangeListener { /** * Returns the format model for a code unit. - * - * @param cu - * the code unit for which to get a model. The cu is used in case - * there is a custom format for it. - * @param useCustomFormats - * if true seaches for a custom format for the code unit, - * otherwise always returns the basic instruction/data format - * model. */ public FieldFormatModel getCodeUnitFormat() { return models[FieldFormatModel.INSTRUCTION_OR_DATA]; @@ -234,9 +226,6 @@ public class FormatManager implements OptionsChangeListener { * * @param data * the data code unit to get the format model for. - * @param useCustomFormats - * if true, tries to find a custom format model, otherwise always - * uses the default open data model. */ public FieldFormatModel getOpenDataFormat(Data data) { @@ -288,7 +277,7 @@ public class FormatManager implements OptionsChangeListener { /** * Notifies listeners that the given model has changed. * - * @param mode the format model that changed. + * @param model the format model that changed. */ public void modelChanged(FieldFormatModel model) { if (!initialized) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/AddAllFieldAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/AddAllFieldAction.java index 396f93ea00..b6cc5b3428 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/AddAllFieldAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/AddAllFieldAction.java @@ -33,7 +33,6 @@ public class AddAllFieldAction extends DockingAction { * Constructor takes the CodeBrowserPlugin that created it and the header * component so that it can be repainted when fields are added. * @param owner the action owner - * @param model the model this action affects * @param panel the listing panel. */ public AddAllFieldAction(String owner, FieldHeader panel) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/DisableFieldAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/DisableFieldAction.java index 6f269a2c76..383e895806 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/DisableFieldAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/DisableFieldAction.java @@ -46,9 +46,6 @@ public class DisableFieldAction extends DockingAction { setHelpLocation(new HelpLocation(HelpTopics.CODE_BROWSER, "Disable Field")); } - /** - * @see docking.DockingAction#isEnabledForContext(java.lang.Object) - */ @Override public boolean isEnabledForContext(ActionContext context) { Object contextObject = context.getContextObject(); @@ -60,9 +57,6 @@ public class DisableFieldAction extends DockingAction { return false; } - /** - * Method called when the action is invoked. - */ @Override public void actionPerformed(ActionContext context) { FieldFactory factory = loc.getFieldFactory(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/EnableFieldAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/EnableFieldAction.java index 7e38d63b53..9bb8f8d0ce 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/EnableFieldAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/EnableFieldAction.java @@ -44,9 +44,6 @@ public class EnableFieldAction extends DockingAction { setHelpLocation(new HelpLocation(HelpTopics.CODE_BROWSER, "Enable Field")); } - /** - * @see docking.DockingAction#isEnabledForContext(java.lang.Object) - */ @Override public boolean isEnabledForContext(ActionContext context) { Object contextObject = context.getContextObject(); @@ -58,9 +55,6 @@ public class EnableFieldAction extends DockingAction { return false; } - /** - * Method called when the action is invoked. - */ @Override public void actionPerformed(ActionContext context) { FieldFactory factory = loc.getFieldFactory(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/InsertRowAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/InsertRowAction.java index 6f79dfe285..c9516edfc5 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/InsertRowAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/InsertRowAction.java @@ -40,9 +40,6 @@ public class InsertRowAction extends DockingAction { setHelpLocation(new HelpLocation(HelpTopics.CODE_BROWSER, "Insert Row")); } - /** - * @see docking.DockingAction#isEnabledForContext(java.lang.Object) - */ @Override public boolean isEnabledForContext(ActionContext context) { Object contextObject = context.getContextObject(); @@ -55,9 +52,6 @@ public class InsertRowAction extends DockingAction { return false; } - /** - * Method called when the action is invoked. - */ @Override public void actionPerformed(ActionContext context) { panel.setTabLock( true ); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/RemoveAllFieldsAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/RemoveAllFieldsAction.java index 0846337a8f..fc454ded58 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/RemoveAllFieldsAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/RemoveAllFieldsAction.java @@ -32,8 +32,8 @@ public class RemoveAllFieldsAction extends DockingAction { /** * Constructor takes the CodeBrowserPlugin that created it and the header * component so that it can be repainted when fields are added. - * @param owner the action owner - * @param model the mode from which to remove all fields + * @param owner the action owner. + * @param panel the listing panel. */ public RemoveAllFieldsAction(String owner, FieldHeader panel) { super("Remove All Fields", owner, false); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/RemoveFieldAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/RemoveFieldAction.java index 60889af60a..348f81bf01 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/RemoveFieldAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/RemoveFieldAction.java @@ -39,9 +39,6 @@ public class RemoveFieldAction extends DockingAction { setHelpLocation(new HelpLocation(HelpTopics.CODE_BROWSER, "Remove Field")); } - /** - * @see docking.DockingAction#isEnabledForContext(java.lang.Object) - */ @Override public boolean isEnabledForContext(ActionContext context) { Object contextObject = context.getContextObject(); @@ -52,9 +49,6 @@ public class RemoveFieldAction extends DockingAction { return false; } - /** - * Method called when the action is invoked. - */ @Override public void actionPerformed(ActionContext context) { panel.setTabLock( true ); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/RemoveRowAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/RemoveRowAction.java index 44ff90a1e7..0ee7c5e216 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/RemoveRowAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/format/actions/RemoveRowAction.java @@ -37,9 +37,6 @@ public class RemoveRowAction extends DockingAction { setHelpLocation(new HelpLocation(HelpTopics.CODE_BROWSER, "Remove Row")); } - /** - * @see docking.DockingAction#isEnabledForContext(java.lang.Object) - */ @Override public boolean isEnabledForContext(ActionContext context) { Object contextObject = context.getContextObject(); @@ -52,9 +49,6 @@ public class RemoveRowAction extends DockingAction { return false; } - /** - * Method called when the action is invoked. - */ @Override public void actionPerformed(ActionContext context) { panel.setTabLock( true ); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingModel.java index ddc9b14649..b5123b87be 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingModel.java @@ -53,7 +53,7 @@ public interface ListingModel { public boolean isOpen(Data data); /** - * Changes the open state of the given data (open -> closes; closed-> open). + * Changes the open state of the given data (open -> closes; closed-> open). * * @param data the data to open */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingModelListener.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingModelListener.java index 67f48cf43e..e0b91cf061 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingModelListener.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingModelListener.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,8 +25,7 @@ public interface ListingModelListener { /** * Called when the data at an index or range of indexes changes. - * @param start the starting address for the region of data changes. - * @param end the ending address (inclusive) for the region of data changes. + * @param updateImmediately true to immediately update the listing upon change. * */ void dataChanged(boolean updateImmediately); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/base/project/GhidraProject.java b/Ghidra/Features/Base/src/main/java/ghidra/base/project/GhidraProject.java index bee83fdd76..14a46ad8d6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/base/project/GhidraProject.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/base/project/GhidraProject.java @@ -452,8 +452,6 @@ public class GhidraProject { * @param overWrite * if true, any existing program with that name will be * over-written. - * @throws DuplicateNameException - * if a file exists with that name and overwrite is false or overwrite failed * @throws InvalidNameException * the name is null or has invalid characters. * @throws IOException diff --git a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/AbstractFileExtractorTask.java b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/AbstractFileExtractorTask.java index 311e017d10..6c45e5026d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/AbstractFileExtractorTask.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/AbstractFileExtractorTask.java @@ -62,10 +62,9 @@ public abstract class AbstractFileExtractorTask extends Task { * * @param fs the {@link GFileSystem} that holds the files * @param srcDir the starting directory to extract, if {@code null}, start at root of file system - * @param rootOutputDirectory the destination directory * @param monitor {@link TaskMonitor} that will be updated with progress and checked for cancel - * @throws CancelledException - * @throws IOException + * @throws CancelledException if the extraction is cancelled. + * @throws IOException if an exception occurs extracting the files. */ protected void startExtract(GFileSystem fs, GFile srcDir, TaskMonitor monitor) throws CancelledException, IOException { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/DerivedFilePushProducer.java b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/DerivedFilePushProducer.java index 94f0cd1d04..e02095300d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/DerivedFilePushProducer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/DerivedFilePushProducer.java @@ -22,13 +22,13 @@ import java.io.IOException; import java.io.OutputStream; /** - * Used by {@link FileSystemService#getDerivedFilePushInfo(FSRL, String, DerivedFilePushProducer, TaskMonitor)} + * Used by {@link FileSystemService#getDerivedFilePush(FSRL, String, DerivedFilePushProducer, TaskMonitor)} * to produce a derived file from a source file. */ public interface DerivedFilePushProducer { /** * Callback method intended to be implemented by the caller to - * {@link FileSystemService#getDerivedFilePushInfo(FSRL, String, DerivedFileProducer, TaskMonitor)}. + * {@link FileSystemService#getDerivedFilePush(FSRL, String, DerivedFilePushProducer, TaskMonitor)}. *

      * The implementation needs to write bytes to the supplied {@link OutputStream}. *

      diff --git a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FSRLRoot.java b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FSRLRoot.java index 7d8e1c9ef2..1c8a6d4f9d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FSRLRoot.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FSRLRoot.java @@ -27,10 +27,11 @@ package ghidra.formats.gfilesystem; *

        *
      • FSRLRoot [ file:// ]
        * "file://" - *
      • FSRLRoot [ file:// ] <---- FSRL [ /filename.txt ]
        + *
      • {@literal FSRLRoot [ file:// ] <---- FSRL [ /filename.txt ]}
        * "file:///filename.txt" - *
      • FSRLRoot [ file:// ] <---- FSRL [ /filename.txt ] <--- FSRLRoot [ subfs:// ]
        + *
      • {@literal FSRLRoot [ file:// ] <---- FSRL [ /filename.txt ] <--- FSRLRoot [ subfs:// ]}
        * "file:///filename.txt|subfs://" + *
      */ public class FSRLRoot extends FSRL { /** diff --git a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FSUtilities.java b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FSUtilities.java index e3f62536ec..a8871bd11d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FSUtilities.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FSUtilities.java @@ -78,7 +78,7 @@ public class FSUtilities { }; /** - * Converts a string -> string mapping into a "key: value" multi-line string. + * Converts a string -> string mapping into a "key: value" multi-line string. * * @param info map of string key to string value. * @return Multi-line string "key: value" string. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileCache.java b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileCache.java index 668b64b270..8a1c334cb8 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileCache.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileCache.java @@ -263,7 +263,7 @@ public class FileCache { * * @param pusher functional callback that will accept an {@link OutputStream} and write * to it. - *
       (os) -> { os.write(.....); }
      + *
       (os) -> { os.write(.....); }
      * @param monitor {@link TaskMonitor} that will be checked for cancel and updated with * file io progress. * @return a new {@link FileCacheEntry} with the newly added cache file's File and MD5, diff --git a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileSystemIndexHelper.java b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileSystemIndexHelper.java index 55cef99a75..81009360e1 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileSystemIndexHelper.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileSystemIndexHelper.java @@ -208,7 +208,7 @@ public class FileSystemIndexHelper { } /** - * Returns a string->GFile map that holds the contents of a single directory. + * Returns a string->GFile map that holds the contents of a single directory. * @param directoryFile * @return */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileSystemService.java b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileSystemService.java index 8e217d6a36..731695e48f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileSystemService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/FileSystemService.java @@ -42,7 +42,7 @@ import ghidra.util.timer.GTimer; * is always valid and does not force the instantiation of parent objects) *

      * {@link GFileSystem Filesystems} should be used via {@link FileSystemRef filesystem ref} - * handles that ensure the filesystem is pinned in memory and won't be close()ed while + * handles that ensure the filesystem is pinned in memory and won't be closed while * you are using it. *

      * If you are working with {@link GFile} instances, you should have a @@ -51,15 +51,15 @@ import ghidra.util.timer.GTimer; * Thread-safe. *

      * - * + *

      {@literal
        * TODO list:
        *
        * Refactor fileInfo -> needs dialog to show properties
        * Refactor GFile.getInfo() to return Map<> instead of String.
      - * Persistant filesystem - when reopen tool, filesystems should auto-reopen
      - * Unify GhidraFileChooser with GFileSystem
      - *   add "Mounted Filesystems" button to show currently opened GFilesystems?
      - * Dockable filesystem browser in FrontEnd
      + * Persistant filesystem - when reopen tool, filesystems should auto-reopen.
      + * Unify GhidraFileChooser with GFileSystem.
      + * Add "Mounted Filesystems" button to show currently opened GFilesystems?
      + * Dockable filesystem browser in FrontEnd.
        * Reorg filesystem browser right-click popup menu to be more Eclipse action-like
        * 	Show In -> Project tree
        *             Tool [CodeBrowser name]
      @@ -78,7 +78,7 @@ import ghidra.util.timer.GTimer;
        *
        * More format tests
        * Large test binary support
      - *
      + * }
      */ public class FileSystemService { private static int FSRL_INTERN_SIZE = 1000; @@ -452,7 +452,7 @@ public class FileSystemService { * @param derivedName a unique string identifying the derived file inside the source (or container) file * @param producer a {@link DerivedFileProducer callback or lambda} that returns an * {@link InputStream} that will be streamed into a file and placed into the file cache. - * Example:
      (file) -> { return new XYZDecryptorInputStream(file); }
      + * Example:{@code (file) -> { return new XYZDecryptorInputStream(file); }} * @param monitor {@link TaskMonitor} that will be monitor for cancel requests and updated * with file io progress * @return {@link FileCacheEntry} with file and md5 fields @@ -493,7 +493,7 @@ public class FileSystemService { * @param fsrl {@link FSRL} of the source (or container) file that this derived file is based on * @param derivedName a unique string identifying the derived file inside the source (or container) file * @param pusher a {@link DerivedFilePushProducer callback or lambda} that recieves a {@link OutputStream}. - * Example:
      (os) -> { ...write to outputstream os here...; }
      + * Example:{@code (os) -> { ...write to outputstream os here...; }} * @param monitor {@link TaskMonitor} that will be monitor for cancel requests and updated * with file io progress * @return {@link FileCacheEntry} with file and md5 fields diff --git a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/GFileSystem.java b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/GFileSystem.java index 7fd0519d5a..ed7143acb5 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/GFileSystem.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/GFileSystem.java @@ -153,7 +153,7 @@ public interface GFileSystem extends Closeable, ExtensionPoint { /** * Returns a multi-line string with information about the specified {@link GFile file}. *

      - * TODO: this method needs to be refactored to return a Map instead of + * TODO:{@literal this method needs to be refactored to return a Map; instead of} * a pre-formatted multi-line string. *

      * @param file {@link GFile} to get info message for. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/annotations/FileSystemInfo.java b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/annotations/FileSystemInfo.java index c4c586321a..19a2af6294 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/annotations/FileSystemInfo.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/formats/gfilesystem/annotations/FileSystemInfo.java @@ -24,9 +24,10 @@ import java.lang.annotation.*; * Specifies the info needed of a {@link GFileSystem} implementation. *

      *

        - *
      • {@link #type()} is required. - *
      • {@link #description()} is optional. - *
      • {@link #factory()} is required. + *
      • {@link #type()} is required.
      • + *
      • {@link #description()} is optional.
      • + *
      • {@link #factory()} is required.
      • + *
      */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/framework/main/DataTreeDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/framework/main/DataTreeDialog.java index 651183a67a..676d80a80e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/framework/main/DataTreeDialog.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/framework/main/DataTreeDialog.java @@ -465,7 +465,7 @@ public class DataTreeDialog extends DialogComponentProvider /** * Define the Main panel for the dialog here. - * @return JPanel the completed Main Panel<\CODE> + * @return JPanel the completed Main Panel */ protected JPanel buildMainPanel() { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/framework/main/datatree/JavaFileListHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/framework/main/datatree/JavaFileListHandler.java index cf3c03d8a8..4b55af2220 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/framework/main/datatree/JavaFileListHandler.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/framework/main/datatree/JavaFileListHandler.java @@ -32,7 +32,7 @@ import ghidra.util.Msg; import util.CollectionUtils; /** - * A drag-and-drop handler for trees that is specific to List<File>. (see + * {@literal A drag-and-drop handler for trees that is specific to List.} (see * {@link DataFlavor#javaFileListFlavor}). */ public final class JavaFileListHandler implements DataTreeFlavorHandler, FileOpenDataFlavorHandler { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/framework/main/datatree/VersionControlDataTypeArchiveUndoCheckoutAction.java b/Ghidra/Features/Base/src/main/java/ghidra/framework/main/datatree/VersionControlDataTypeArchiveUndoCheckoutAction.java index ba65b703ce..5131cc1824 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/framework/main/datatree/VersionControlDataTypeArchiveUndoCheckoutAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/framework/main/datatree/VersionControlDataTypeArchiveUndoCheckoutAction.java @@ -132,9 +132,8 @@ public class VersionControlDataTypeArchiveUndoCheckoutAction extends VersionCont * user chooses to do so.
      * All unmodified checkouts will be undone. Only modified checkouts the user chooses * will be undone. - * @param unmodifiedCheckOutsList the list of unmodified checked out files - * @param modifiedArchivesList the list of checked out files that have been modified - * @param changedList the list of checked out files that have been modified and not yet saved + * @param unmodifiedArchivesList the list of unmodified archives + * @param modifiedArchivesList the list of archives that have been modified * @throws CancelledException */ protected void undoCheckOuts(List unmodifiedArchivesList, @@ -204,8 +203,8 @@ public class VersionControlDataTypeArchiveUndoCheckoutAction extends VersionCont } /** - * - * @param changedList + * Saves all checked out changes. + * @param changedList the list of changes */ protected void saveCheckOutChanges(List changedList) throws CancelledException { if (changedList.size() > 0) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/ProgramMappingService.java b/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/ProgramMappingService.java index 63bd2783e3..d4545f7081 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/ProgramMappingService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/ProgramMappingService.java @@ -42,10 +42,10 @@ import ghidra.util.task.TaskMonitor; * Threadsafe. *

      * The current implementation searches current open Ghidra Programs and maintains a - * short-lived, in-memory only mapping of FSRL->DomainFile paths + * short-lived, in-memory only mapping of FSRL->DomainFile paths * (manually updated by users of the ProgramMappingService when * they do an import or other operation that creates a Ghidra DomainFile by calling - * {@link #createAssociation(FSLR, DomainFile)} and friends.) + * {@link #createAssociation(FSRL, DomainFile)} and friends.) *

      * [1] - best-effort (adverb): meaning a dirty hack. */ @@ -293,7 +293,7 @@ public class ProgramMappingService { *

      * (ie. an open program has a MD5 or FSRL metadata value that matches the file) *

      - * See also {@link #isFileOpen(GFile)}. + * See also {@link #isFileOpen(FSRL)}. *

      * @param fsrl {@link FSRL} to use when inspecting each open Program's metadata. * @param consumer Object that will be used to pin the matching Program open. Caller diff --git a/Ghidra/Features/Base/src/main/java/ghidra/plugins/importer/batch/BatchSegregatingCriteria.java b/Ghidra/Features/Base/src/main/java/ghidra/plugins/importer/batch/BatchSegregatingCriteria.java index 84ef345780..d01eba03ce 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/plugins/importer/batch/BatchSegregatingCriteria.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/plugins/importer/batch/BatchSegregatingCriteria.java @@ -29,9 +29,10 @@ import ghidra.app.util.opinion.Loader; *

      * Criteria are: *

        - *
      • Filename extension of source file - *
      • Loader name - *
      • Set of LanguageCompilerSpecs & preferred flags (ie. {@link BatchGroupLoadSpec}) + *
      • Filename extension of source file
      • + *
      • Loader name
      • + *
      • Set of LanguageCompilerSpecs and preferred flags (ie. {@link BatchGroupLoadSpec})
      • + *
      */ public class BatchSegregatingCriteria { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/database/ProgramBuilder.java b/Ghidra/Features/Base/src/main/java/ghidra/program/database/ProgramBuilder.java index a6ef1260ea..94031eb87e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/database/ProgramBuilder.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/database/ProgramBuilder.java @@ -116,7 +116,6 @@ public class ProgramBuilder { * Construct program builder using specified language and default compiler spec * @param name program name * @param languageName supported language ID (includes all Toy language IDs) - * @param compilerSpecID compiler specification ID (if null default spec will be used) * @param consumer program consumer (if null this builder will be used as consumer and must be disposed to release program) * @throws Exception */ @@ -368,7 +367,7 @@ public class ProgramBuilder { *

      * @param address String containing numeric value, preferably hex encoded: "0x1004000" * @param byteString String containing 2 digit hex values, separated by ' ' space chars - * or by comma ',' chars: "12 05 ff". See {@link NumericUtilities#parseBytes(String)}. + * or by comma ',' chars: "12 05 ff". See {@link NumericUtilities#parseHexLong(String)}. * @throws Exception */ public void setBytes(String address, String byteString) throws Exception { @@ -384,7 +383,7 @@ public class ProgramBuilder { *

      * @param address String containing numeric value, preferably hex encoded: "0x1004000" * @param byteString String containing 2 digit hex values, separated by ' ' space chars - * or by comma ',' chars: "12 05 ff". See {@link NumericUtilities#parseBytes(String)}. + * or by comma ',' chars: "12 05 ff". See {@link NumericUtilities#parseHexLong(String)}. * @param disassemble boolean flag. * @throws Exception */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/flatapi/FlatProgramAPI.java b/Ghidra/Features/Base/src/main/java/ghidra/program/flatapi/FlatProgramAPI.java index 222b3079b7..8c1678b6dc 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/flatapi/FlatProgramAPI.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/flatapi/FlatProgramAPI.java @@ -29,6 +29,7 @@ import ghidra.app.plugin.core.analysis.AutoAnalysisManager; import ghidra.app.plugin.core.clear.ClearCmd; import ghidra.app.plugin.core.clear.ClearOptions; import ghidra.app.plugin.core.searchmem.RegExSearchData; +import ghidra.app.script.GhidraScript; import ghidra.framework.main.AppInfo; import ghidra.framework.model.*; import ghidra.framework.plugintool.PluginTool; @@ -511,13 +512,13 @@ public class FlatProgramAPI { /** * Returns the PLATE comment at the specified address. The comment returned is the raw text - * of the comment. Contrastingly, calling {@link #getPlateCommentAsRendered(Address)} will + * of the comment. Contrastingly, calling {@link GhidraScript#getPlateCommentAsRendered(Address)} will * return the text of the comment as it is rendered in the display. * * @param address the address to get the comment * @return the PLATE comment at the specified address or null * if one does not exist - * @see #getPlateCommentAsRendered(Address) + * @see GhidraScript#getPlateCommentAsRendered(Address) */ public final String getPlateComment(Address address) { return currentProgram.getListing().getComment(CodeUnit.PLATE_COMMENT, address); @@ -525,13 +526,13 @@ public class FlatProgramAPI { /** * Returns the PRE comment at the specified address. The comment returned is the raw text - * of the comment. Contrastingly, calling {@link #getPreCommentAsRendered(Address)} will + * of the comment. Contrastingly, calling {@link GhidraScript#getPreCommentAsRendered(Address)} will * return the text of the comment as it is rendered in the display. * * @param address the address to get the comment * @return the PRE comment at the specified address or null * if one does not exist - * @see #getPreCommentAsRendered(Address) + * @see GhidraScript#getPreCommentAsRendered(Address) */ public final String getPreComment(Address address) { return currentProgram.getListing().getComment(CodeUnit.PRE_COMMENT, address); @@ -539,13 +540,13 @@ public class FlatProgramAPI { /** * Returns the POST comment at the specified address. The comment returned is the raw text - * of the comment. Contrastingly, calling {@link #getPostCommentAsRendered(Address)} will + * of the comment. Contrastingly, calling {@link GhidraScript#getPostCommentAsRendered(Address)} will * return the text of the comment as it is rendered in the display. * * @param address the address to get the comment * @return the POST comment at the specified address or null * if one does not exist - * @see #getPostCommentAsRendered(Address) + * @see GhidraScript#getPostCommentAsRendered(Address) */ public final String getPostComment(Address address) { return currentProgram.getListing().getComment(CodeUnit.POST_COMMENT, address); @@ -553,12 +554,12 @@ public class FlatProgramAPI { /** * Returns the EOL comment at the specified address. The comment returned is the raw text - * of the comment. Contrastingly, calling {@link #getEOLCommentAsRendered(Address)} will + * of the comment. Contrastingly, calling {@link GhidraScript#getEOLCommentAsRendered(Address)} will * return the text of the comment as it is rendered in the display. * @param address the address to get the comment * @return the EOL comment at the specified address or null * if one does not exist - * @see #getEOLCommentAsRendered(Address) + * @see GhidraScript#getEOLCommentAsRendered(Address) */ public final String getEOLComment(Address address) { return currentProgram.getListing().getComment(CodeUnit.EOL_COMMENT, address); @@ -624,9 +625,9 @@ public class FlatProgramAPI { } /** - * Finds the first occurrences of the byte array sequence that matches the given byte string, - * starting from the address. If the start address is null, then the find will start - * from the minimum address of the program. + * Finds the first {@code } occurrences of the byte array sequence that matches + * the given byte string, starting from the address. If the start address is null, then the + * find will start from the minimum address of the program. *

      * The byteString may contain regular expressions. The following * highlights some example search strings (note the use of double backslashes ("\\")): @@ -650,9 +651,9 @@ public class FlatProgramAPI { } /** - * Finds the first occurrences of the byte array sequence that matches the given byte string, - * starting from the address. If the start address is null, then the find will start - * from the minimum address of the program. + * Finds the first {@code } occurrences of the byte array sequence that matches + * the given byte string, starting from the address. If the start address is null, then the + * find will start from the minimum address of the program. *

      * The byteString may contain regular expressions. The following * highlights some example search strings (note the use of double backslashes ("\\")): @@ -1180,7 +1181,7 @@ public class FlatProgramAPI { * Returns the instruction defined before the specified address or null * if no instruction exists. * The instruction that is returned does not have to be contiguous. - * @param instruction the instruction + * @param address the address of the instruction * @return the instruction defined before the specified address or null if no instruction exists */ public final Instruction getInstructionBefore(Address address) { @@ -1202,7 +1203,7 @@ public class FlatProgramAPI { * Returns the instruction defined after the specified address or null * if no instruction exists. * The instruction that is returned does not have to be contiguous. - * @param instruction the instruction + * @param address the address of the prior instruction * @return the instruction defined after the specified address or null if no instruction exists */ public final Instruction getInstructionAfter(Address address) { @@ -1255,7 +1256,7 @@ public class FlatProgramAPI { /** * Returns the defined data before the specified data or null if no data exists. - * @param address the data address + * @param data the succeeding data * @return the defined data before the specified data or null if no data exists */ public final Data getDataBefore(Data data) { @@ -1273,7 +1274,7 @@ public class FlatProgramAPI { /** * Returns the defined data after the specified data or null if no data exists. - * @param address the data address + * @param data preceeding data * @return the defined data after the specified data or null if no data exists */ public final Data getDataAfter(Data data) { @@ -1388,7 +1389,7 @@ public class FlatProgramAPI { /** * Returns the previous non-default primary symbol defined * after the previous address. - * @param symbol the symbol to use as a starting point + * @param address the address to use as a starting point * @return the next non-default primary symbol */ public final Symbol getSymbolBefore(Address address) { @@ -1796,8 +1797,7 @@ public class FlatProgramAPI { /** * Returns a new address inside the specified program as indicated by the string. - * @param p the program to use for determining the address - * @param s string representation of the address desired + * @param addressString string representation of the address desired * @return the address. Otherwise, return null if the string fails to evaluate * to a legitimate address */ @@ -1843,7 +1843,7 @@ public class FlatProgramAPI { /** * Sets the 'byte' values starting at the specified address. * @param address the address to set the bytes - * @param second the values to set + * @param values the values to set * @throws MemoryAccessException if memory does not exist or is uninitialized */ public final void setBytes(Address address, byte[] values) throws MemoryAccessException { @@ -2303,7 +2303,6 @@ public class FlatProgramAPI { * Removes the equates defined at the operand index of the instruction. * @param instruction the instruction * @param operandIndex the operand index - * @param second scalar value corresponding to equate */ public final void removeEquates(Instruction instruction, int operandIndex) { Address address = instruction.getMinAddress(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/AddressTranslator.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/AddressTranslator.java index c34c9a9e8b..07b3d333cf 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/AddressTranslator.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/AddressTranslator.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,7 +58,7 @@ public interface AddressTranslator { * This interface is intended to translate an address range from the source program to an * address range in the destination program. *
      This method should be implemented if isOneForOneTranslator() returns true. - * @param sourceAddressSet the source address set to be converted. + * @param sourceAddressRange the source address range to be converted. * @return the destination address range that is equivalent in some way to the source address range. * How the address range is equivalent depends upon the particular translator. * throws AddressTranslationException if the address set can't be translated to an equivalent diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramDiff.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramDiff.java index 2f2e697db3..24f1ed4fd1 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramDiff.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramDiff.java @@ -1354,8 +1354,7 @@ public class ProgramDiff { for (BookmarkType element : types2) { boolean found = false; - for (int i = 0; i < list.size(); ++i) { - BookmarkType type = list.get(i); + for (BookmarkType type : list) { if (element.getTypeString().compareTo(type.getTypeString()) == 0) { found = true; break; @@ -3202,7 +3201,7 @@ public class ProgramDiff { } /** An IteratorWrapper provides a common class for accessing the methods - * for several different iterator types (Iterator, CodeUnitIterator, & + * for several different iterator types (Iterator, CodeUnitIterator, and * AddressIterator). */ private static class IteratorWrapper { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMemoryComparator.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMemoryComparator.java index e4d5c8a1c5..7437d64efb 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMemoryComparator.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMemoryComparator.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -66,7 +65,7 @@ public class ProgramMemoryComparator { private AddressSet compatibleOnlyInTwo; /** - * ProgramMemoryComparator/CODE> is used to determine the memory + * ProgramMemoryComparator is used to determine the memory * address differences between two programs. * * @param program1 the first program diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMemoryUtil.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMemoryUtil.java index 0c89c48bec..f87cc044b4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMemoryUtil.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMemoryUtil.java @@ -413,11 +413,9 @@ public class ProgramMemoryUtil { * Direct references are only found at addresses that match the indicated alignment. * @param program the program whose memory is to be checked. * @param alignment direct references are to only be found at the indicated alignment in memory. - * @param toAddressSet the set of addresses that we are interested in finding references to. - * @param directReferenceList the list to be populated with possible direct references + * @param codeUnit the code unit to to search for references to. * @param monitor a task monitor for progress or to allow canceling. - * @return list of addresses referring directly to the toAddress - * @throws CancelledException if the user cancels via the monitor. + * @return list of addresses referring directly to the toAddress. */ public static List

      findDirectReferencesCodeUnit(Program program, int alignment, CodeUnit codeUnit, TaskMonitor monitor) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMerge.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMerge.java index 2f049102bb..fc7c1a24c5 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMerge.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMerge.java @@ -98,7 +98,7 @@ public class ProgramMerge implements PropertyVisitor { * which changes are made. * The source program from the translator is the origin program for obtaining the changes. * - * @param addressTranslator converts addresses from the origin program into an + * @param originToResultTranslator converts addresses from the origin program into an * equivalent address in the destination program. * @see AddressTranslator */ @@ -490,13 +490,13 @@ public class ProgramMerge implements PropertyVisitor { // **** CODE UNIT methods **** /** - * mergeCodeUnits merges all instructions &/or data + * mergeCodeUnits merges all instructions and/or data * (as indicated) in the specified address set from the origin program. * It merges them into the result program. When merging * instructions, the bytes are also replaced if they differ. * This assumes originToResultTranslator maps address spaces and does * not do fine-grained mapping of addresses. - * @param addrSet the addresses to be merged. + * @param originAddressSet the addresses to be merged. * The addresses in this set should be derived from the origin program. * @param byteDiffs address set indicating addresses where the bytes differ * between the result program and the origin program. @@ -1141,13 +1141,13 @@ public class ProgramMerge implements PropertyVisitor { originToResultMap.put(origRef, resultRef); } // Remove references we don't need any more or those that are there but not the same. - for (int i = 0; i < resultRefs.length; i++) { + for (Reference resultRef : resultRefs) { // Leave fallthroughs as they are, so the code unit merge can handle them. - if (resultRefs[i].getReferenceType().isFallthrough()) { + if (resultRef.getReferenceType().isFallthrough()) { continue; } - if (!originToResultMap.containsKey(resultRefs[i])) { - resultRM.delete(resultRefs[i]); + if (!originToResultMap.containsKey(resultRef)) { + resultRM.delete(resultRef); } } // Add the references that aren't there yet and those that weren't the same. @@ -1260,9 +1260,9 @@ public class ProgramMerge implements PropertyVisitor { resultsToKeep.put(originRef, resultRef); // resultRef may be null } // Remove references we don't need any more or those that are there but not the same. - for (int i = 0; i < resultRefs.length; i++) { - if (!resultsToKeep.containsValue(resultRefs[i])) { - resultRM.delete(resultRefs[i]); + for (Reference resultRef : resultRefs) { + if (!resultsToKeep.containsValue(resultRef)) { + resultRM.delete(resultRef); } } // Add the references that aren't there yet and those that weren't the same. @@ -1610,7 +1610,7 @@ public class ProgramMerge implements PropertyVisitor { * type in program1 with the comment in program2 at the specified address. * @param commentType comment type to merge (from CodeUnit class). *
      EOL_COMMENT, PRE_COMMENT, POST_COMMENT, REPEATABLE_COMMENT, OR PLATE_COMMENT. - * @param addr the address + * @param originAddress the address * This address should be derived from the origin program. */ public void mergeComments(int commentType, Address originAddress) { @@ -1626,7 +1626,7 @@ public class ProgramMerge implements PropertyVisitor { * type in program1 with the comment in program2 at the specified address. * @param commentType comment type to replace (from CodeUnit class). *
      EOL_COMMENT, PRE_COMMENT, POST_COMMENT, REPEATABLE_COMMENT, OR PLATE_COMMENT. - * @param addr the address + * @param originAddress the address * This address should be derived from the origin program. */ public void replaceComment(int commentType, Address originAddress) { @@ -2271,9 +2271,8 @@ public class ProgramMerge implements PropertyVisitor { * mergeFunctionReturn replaces the return type/storage of the * function in program1 with the return type/storage of the function in program2 * at the specified entry point address. - * @param entry the entry point address of the function. + * @param entry2 the entry point address of the function. * This address should be derived from the origin program. - * @param monitor the task monitor for notifying the user of this merge's progress. */ public void mergeFunctionReturn(Address entry2) { Address entry = originToResultTranslator.getAddress(entry2); @@ -2361,11 +2360,9 @@ public class ProgramMerge implements PropertyVisitor { * mergeFunctionName replaces the name of the * function in program1 with the name of the function in program2 * at the specified entry point address. - * @param entry the entry point address of the function. + * @param entry2 the entry point address of the function. * This address should be derived from the origin program. * @param monitor the task monitor for notifying the user of this merge's progress. - * @throws InvalidInputException - * @throws DuplicateNameException */ public void mergeFunctionName(Address entry2, TaskMonitor monitor) { Address entry = originToResultTranslator.getAddress(entry2); @@ -3423,12 +3420,11 @@ public class ProgramMerge implements PropertyVisitor { /** * replaceFunctionVariable replaces the name of the indicated * function variable in program1 with that from the origin program. - * @param entry the entry point address of the function to modify. + * @param originEntryPoint the entry point address of the function to modify. * This address should be derived from program1. * @param var a variable that is equivalent to the one in program1 to be replaced. * The variable passed here could be from another program. * @param monitor the task monitor for notifying the user of progress. - * @throws DuplicateNameException */ public void replaceFunctionVariable(Address originEntryPoint, Variable var, TaskMonitor monitor) { @@ -3471,12 +3467,11 @@ public class ProgramMerge implements PropertyVisitor { /** * replaceFunctionVariables replaces the * function variables/parameters in program1 with that from the origin program. - * @param entry the entry point address of the function to modify. + * @param originEntryPoint the entry point address of the function to modify. * This address should be derived from program1. - * @param var a variable that is equivalent to the one in program1 to be replaced. - * The variable passed here could be from another program. + * @param varList the list of variables to replace. * @param monitor the task monitor for notifying the user of progress. - * @throws DuplicateNameException + * @throws CancelledException if the user canceled the operation via the task monitor. */ public void replaceVariables(Address originEntryPoint, List varList, TaskMonitor monitor) throws CancelledException { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMergeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMergeManager.java index 5b35e423c0..d7b533a078 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMergeManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramMergeManager.java @@ -549,7 +549,7 @@ public class ProgramMergeManager { } /** - * mergeCodeUnits merges all instructions &/or data + * mergeCodeUnits merges all instructions and/or data * (as indicated) in the specified address set from the second program. * It merges them into the merge program. When merging * instructions, the bytes are also moved if they differ. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/SymbolicPropogator.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/SymbolicPropogator.java index 39157d281d..92d9d11f45 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/SymbolicPropogator.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/SymbolicPropogator.java @@ -125,10 +125,13 @@ public class SymbolicPropogator { * Process a subroutine using the processor function. * The process function can control what flows are followed and when to stop. * - * @param entryPoint start address - * @param processor processor to use + * @param startAddr start address + * @param restrictSet the address set to restrict the constant flow to + * @param eval the context evaluator to use + * @param saveContext true if the context should be saved + * @param monitor the task monitor * @return the address set of instructions that were followed - * @throws CancelledException + * @throws CancelledException if the task is cancelled */ public AddressSet flowConstants(Address startAddr, AddressSetView restrictSet, ContextEvaluator eval, boolean saveContext, TaskMonitor monitor) @@ -278,7 +281,7 @@ public class SymbolicPropogator { /** * Get constant or register relative value assigned to the * specified register at the specified address - * @param addr address + * @param toAddr address * @param reg register * @return register value */ @@ -2165,14 +2168,14 @@ public class SymbolicPropogator { * The target could be an external Address carried along and then finally used. * External addresses are OK as long as nothing is done to the offset. * - * @param varnodeContext - context to use for any other infomation needed + * @param vContext - context to use for any other infomation needed * @param instruction - instruction to place the reference on. * @param opIndex - operand it should be placed on, or -1 if unknown - * @param spaceID target space ID or -1 if only offset is known + * @param knownSpaceID target space ID or -1 if only offset is known * @param wordOffset - target offset that is word addressing based * @param refType - type of reference * @param pcodeop - pcode op that caused the reference - * @param monitor + * @param monitor - the task monitor */ public void makeReference(VarnodeContext vContext, Instruction instruction, int opIndex, long knownSpaceID, long wordOffset, int size, RefType refType, int pcodeop, diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/VarnodeContext.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/VarnodeContext.java index 8be976f8d9..e5ce35c9ac 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/VarnodeContext.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/VarnodeContext.java @@ -565,9 +565,8 @@ public class VarnodeContext implements ProcessorContext { } /** - * Check if a symbol is read_only. + * Check if the symbol at the address is read_only. * - * @param sym - symbol to check * @param addr - address of the symbol * * @return true if the block is read_only, and there are no write references. @@ -824,11 +823,13 @@ public class VarnodeContext implements ProcessorContext { return lastSetAddr; } + // TODO unused parameter bval /** * return the location that this varnode was last set * This is a transient thing, so it should only be used as a particular flow is being processed... * - * @param reg + * @param rvar the register varnode + * @param bval this parameter is unused. * @return address that the register was set. */ public Address getLastSetLocation(Varnode rvar, BigInteger bval) { @@ -908,9 +909,10 @@ public class VarnodeContext implements ProcessorContext { * get the value of a register as a varnode (value, space, size) * * @param reg register to get value for - * @param address location for value + * @param fromAddr from address + * @param toAddr to address * @param signed true if signed - * @return null if the register has no value + * @return the register value or null */ public Varnode getRegisterVarnodeValue(Register reg, Address fromAddr, Address toAddr, boolean signed) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/string/AbstractStringSearcher.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/string/AbstractStringSearcher.java index d733f71f32..42494c762f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/string/AbstractStringSearcher.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/string/AbstractStringSearcher.java @@ -91,8 +91,10 @@ public abstract class AbstractStringSearcher { * Searches the given addressSet for strings. *

      * Note: The address set searched will be modified before searching in the following ways: + *

        *
      • if the given set is null, it will be re-initialized to encompass all of program memory
      • *
      • the set will be further culled to only include loaded memory blocks, if specified
      • + *
      *

      * @param addressSet the address set to search over; if null, will initialized to all memory * @param callback the callback invoked when a string is found diff --git a/Ghidra/Features/Base/src/main/java/ghidra/test/ProjectTestUtils.java b/Ghidra/Features/Base/src/main/java/ghidra/test/ProjectTestUtils.java index 8486713697..927da808a3 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/test/ProjectTestUtils.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/test/ProjectTestUtils.java @@ -181,7 +181,8 @@ public class ProjectTestUtils { * Create an empty program file within the specified project folder. * @param proj active project. * @param progName name of program and domain file to be created. - * @param langType a specified language, or 0 if it does not matter. + * @param language a specified language, or 0 if it does not matter. + * @param compilerSpec the compiler spec * @param folder domain folder within the specified project which the * user has permission to write. If null, the root data folder will be used. * @return new domain file. @@ -242,7 +243,6 @@ public class ProjectTestUtils { * @param project The project which with the tool is associated. * @param tool The tool to be saved * @return The tool template for the given tool. - * @throws DuplicateNameException */ public static ToolTemplate saveTool(Project project, Tool tool) { // save the tool to the project tool chest diff --git a/Ghidra/Features/Base/src/main/java/ghidra/test/ToyProgramBuilder.java b/Ghidra/Features/Base/src/main/java/ghidra/test/ToyProgramBuilder.java index 6e867533d6..83e08c570e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/test/ToyProgramBuilder.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/test/ToyProgramBuilder.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -293,7 +292,7 @@ public class ToyProgramBuilder extends ProgramBuilder { /** * Add move immediate instruction (consumes 2-bytes) - * @param addr instruction address + * @param offset instruction offset * @param imm immediate byte value * @throws MemoryAccessException */ @@ -395,7 +394,7 @@ public class ToyProgramBuilder extends ProgramBuilder { /** * Add call (consumes 2-bytes) * @param addr instruction address - * @param dest call destination address + * @param destAddr call destination address * @throws MemoryAccessException */ public void addBytesCall(String addr, String destAddr) throws MemoryAccessException { @@ -418,7 +417,7 @@ public class ToyProgramBuilder extends ProgramBuilder { /** * Add call w/ delayslot (consumes 4-bytes) * @param addr instruction address - * @param dest call destination address + * @param destAddr call destination address * @throws MemoryAccessException */ public void addBytesCallWithDelaySlot(String addr, String destAddr) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestCombinedTestResults.java b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestCombinedTestResults.java index 964456b478..367a1fad8f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestCombinedTestResults.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestCombinedTestResults.java @@ -166,7 +166,7 @@ public class PCodeTestCombinedTestResults { /** * - * @param groupTestName . + * @param groupTestName {@code .} */ NamedTestColumn(String groupTestName) { this.groupTestName = groupTestName; @@ -183,14 +183,14 @@ public class PCodeTestCombinedTestResults { } /** - * @return . + * @return {@code .} */ public String getGroupTestName() { return groupTestName; } /** - * @return + * @return {@code } */ public String getTestName() { return testName; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestResults.java b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestResults.java index 6db03c1b22..feaeb881a1 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestResults.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/PCodeTestResults.java @@ -65,7 +65,7 @@ public class PCodeTestResults { } /** - * @return collection of group/testNames in the form "." + * @return collection of group/testNames in the form {@code "."} */ public Collection getGroupTestNames() { return results.keySet(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/ProcessorEmulatorTestAdapter.java b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/ProcessorEmulatorTestAdapter.java index 7f7f5c49a5..a7dbe917dc 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/ProcessorEmulatorTestAdapter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/test/processors/support/ProcessorEmulatorTestAdapter.java @@ -72,7 +72,7 @@ import utility.application.ApplicationLayout; * contained within the binary repository (e.g., ghidra.bin). *

      * Within the pcodetests directory all files and folders which start with the prefix - * _pcodetest* will be processed. All files contained within a matching + * {@literal _pcodetest*} will be processed. All files contained within a matching * subdirectory will be treated as related binaries and imported. Any *.gzf file will be * imported but assumed to be pre-analyzed. Binary files to be imported and analyzed must * utilize the *.out file extension. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/StackFrameImpl.java b/Ghidra/Features/Base/src/main/java/ghidra/util/StackFrameImpl.java index 51ead2222f..a5852f40c7 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/StackFrameImpl.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/StackFrameImpl.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,8 +36,8 @@ import java.lang.UnsupportedOperationException; * saved registers). *

      *

      When a frame is created, the parameter stack start offset must be set up. - * If the parameter start is >= 0, then the stack grows in the negative - * direction. If the parameter start < 0, then the stack grows in the positive + * If the parameter start is >= 0, then the stack grows in the negative + * direction. If the parameter start < 0, then the stack grows in the positive * direction. When a frame is created the parameter start offset must be * specified. Later the parameter start offset can be changed, but it must * remain positive/negative if the frame was created with a positive/negative @@ -86,7 +85,7 @@ class StackFrameImpl implements StackFrame { * * Specified source is always ignored * and the variable instance returned will never be a parameter. - * @see ghidra.program.model.listing.StackFrame#createVariable(java.lang.String, int, ghidra.program.model.data.DataType, ghidra.program.model.symbol.SourceType) + * @see ghidra.program.model.listing.StackFrame#createVariable(String, int, DataType, SourceType) */ @Override public Variable createVariable(String name, int offset, DataType dataType, @@ -95,18 +94,11 @@ class StackFrameImpl implements StackFrame { throw new UnsupportedOperationException(); } - /** - * @see ghidra.program.model.listing.StackFrame#getStackVariables() - */ @Override public Variable[] getStackVariables() { return getAllVariables(); } - /** - * - * @see ghidra.program.model.listing.StackFrame#getLocals() - */ @Override public Variable[] getLocals() { if (getParameterOffset() >= 0) { @@ -115,20 +107,12 @@ class StackFrameImpl implements StackFrame { return getPositiveVariables(); } - /** - * - * @see ghidra.program.model.listing.StackFrame#getParameters() - */ @Override public Variable[] getParameters() { return (getParameterOffset() >= 0) ? getPositiveVariables() : getNegativeVariables(); } - /** - * - * @see ghidra.program.model.listing.StackFrame#getFrameSize() - */ @Override public int getFrameSize() { int size = getLocalSize(); @@ -137,10 +121,6 @@ class StackFrameImpl implements StackFrame { return size; } - /** - * - * @see ghidra.program.model.listing.StackFrame#getLocalSize() - */ @Override public int getLocalSize() { if (localSize > 0) { @@ -153,28 +133,16 @@ class StackFrameImpl implements StackFrame { return getPositiveSize(); } - /** - * - * @see ghidra.program.model.listing.StackFrame#growsNegative() - */ @Override public boolean growsNegative() { return growsNegative; } - /** - * - * @see ghidra.program.model.listing.StackFrame#setLocalSize(int) - */ @Override public void setLocalSize(int size) { throw new UnsupportedOperationException(); } - /** - * - * @see ghidra.program.model.listing.StackFrame#getParameterSize() - */ @Override public int getParameterSize() { if (growsNegative()) { @@ -184,8 +152,10 @@ class StackFrameImpl implements StackFrame { } /** + * Gets the number of parameters in the stack frame regardless + * of the direction the stack grows in. * - * @see ghidra.program.model.listing.StackFrame#getParameterCount() + * @return the number of parameters in the stack frame. */ public int getParameterCount() { if (growsNegative()) { @@ -194,19 +164,11 @@ class StackFrameImpl implements StackFrame { return getNegativeCount(); } - /** - * - * @see ghidra.program.model.listing.StackFrame#clearVariable(int) - */ @Override public void clearVariable(int offset) { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * @see ghidra.program.model.listing.StackFrame#getParameterOffset() - */ @Override public int getParameterOffset() { return paramStart; @@ -227,31 +189,19 @@ class StackFrameImpl implements StackFrame { // stackChanged(); // } - /** - * - * @see ghidra.program.model.listing.StackFrame#getReturnAddressOffset() - */ @Override public int getReturnAddressOffset() { return returnStart; } - /** - * - * @see ghidra.program.model.listing.StackFrame#setReturnAddressOffset(int) - */ @Override public void setReturnAddressOffset(int offset) { throw new UnsupportedOperationException(); } - /** - * - * @see ghidra.program.model.listing.StackFrame#getVariableContaining(int) - */ @Override public Variable getVariableContaining(int offset) { - Object key = new Integer(offset); + Object key = Integer.valueOf(offset); int index = Collections.binarySearch(variables, key, StackVariableComparator.get()); if (index >= 0) { return variables.get(index); @@ -454,10 +404,6 @@ class StackFrameImpl implements StackFrame { return length - index; } - /** - * - * @see ghidra.program.model.listing.StackFrame#getFunction() - */ @Override public Function getFunction() { return function; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/ascii/MinLengthCharSequenceMatcher.java b/Ghidra/Features/Base/src/main/java/ghidra/util/ascii/MinLengthCharSequenceMatcher.java index 5e36b65065..cfcd7a7509 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/ascii/MinLengthCharSequenceMatcher.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/ascii/MinLengthCharSequenceMatcher.java @@ -71,7 +71,7 @@ public class MinLengthCharSequenceMatcher { /** * Indicates there are no more contiguous chars to add to this matcher. If a minimum or more * number of included chars have been seen before this call, then a sequence is returned. - * @return a Sequence if there was a sequence of chars >= the min length just before this call. + * @return a Sequence if there was a sequence of chars >= the min length just before this call. */ public boolean endSequence() { lastSequence = null; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/bean/field/AnnotatedTextFieldElement.java b/Ghidra/Features/Base/src/main/java/ghidra/util/bean/field/AnnotatedTextFieldElement.java index 0c8daf1af9..de6f2fd326 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/bean/field/AnnotatedTextFieldElement.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/bean/field/AnnotatedTextFieldElement.java @@ -24,7 +24,7 @@ import ghidra.program.util.ProgramLocation; /** * A subclass of {@link FieldElement} that allows for mouse handling callbacks via the - * {@link #handleMouseClicked(ProgramLocation, ServiceProvider)} method. This class + * {@link #handleMouseClicked(Navigatable, ServiceProvider)} method. This class * is based upon {@link Annotation} objects, which are elements that perform actions when the * use clicks an instance of this class in the display. */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/data/DataTypeParser.java b/Ghidra/Features/Base/src/main/java/ghidra/util/data/DataTypeParser.java index 682d45e558..840c786a35 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/data/DataTypeParser.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/data/DataTypeParser.java @@ -112,7 +112,7 @@ public class DataTypeParser { * @param dataTypeManagerService data-type manager tool service, or null * @param allowedTypes constrains which data-types may be parsed * - * @see #DataTypeParser(DataTypeManagerService, AllowedDataTypes) + * @see #DataTypeParser(DataTypeQueryService, AllowedDataTypes) */ public DataTypeParser(DataTypeManager sourceDataTypeManager, DataTypeManager destinationDataTypeManager, diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/search/trie/ByteTrieIfc.java b/Ghidra/Features/Base/src/main/java/ghidra/util/search/trie/ByteTrieIfc.java index 60b4d63492..57a4c69fee 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/search/trie/ByteTrieIfc.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/search/trie/ByteTrieIfc.java @@ -79,7 +79,7 @@ public interface ByteTrieIfc { * trie search algorithm. * @param text the bytes to search * @return a list of results (tuple of offset position, text found) - * @throws CancelledException + * @throws CancelledException if the search is cancelled */ public abstract List> search(byte[] text, TaskMonitor monitor) throws CancelledException; @@ -87,11 +87,12 @@ public interface ByteTrieIfc { /** * Search an array of bytes using the Aho-Corasick multiple string * trie search algorithm. - * @param monitor - * @param text the bytes to search + * @param memory the memory to search in + * @param view the AddressSetView to restrict the memory search to. + * @param monitor the task monitor * @return a list of results (tuple of offset position, text found) - * @throws MemoryAccessException - * @throws CancelledException + * @throws MemoryAccessException if an error occurs reading the memory + * @throws CancelledException if the search is cancelled */ public abstract List> search(Memory memory, AddressSetView view, TaskMonitor monitor) throws MemoryAccessException, CancelledException; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/state/ContextState.java b/Ghidra/Features/Base/src/main/java/ghidra/util/state/ContextState.java index e609d114fe..2bab002944 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/state/ContextState.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/state/ContextState.java @@ -70,9 +70,8 @@ public class ContextState { /** * Constructs an empty state. - * @param pcodeEntry instruction identifies the instruction entry point for this context state. - * A pcodeIndex of 0 is assumed. Initial state utilizes the program's stored context. - * @param program + * @param entryPt the entry point for the context state + * @param program the program */ public ContextState(Address entryPt, Program program) { this(entryPt, program.getProgramContext(), program); @@ -80,10 +79,9 @@ public class ContextState { /** * Constructs an empty state. - * @param pcodeEntry instruction identifies the instruction entry point for this context state. - * A pcodeIndex of 0 is assumed. + * @param entryPt the entry point for the context state * @param programCtx initial program context or null - * @param program + * @param program the program */ public ContextState(Address entryPt, ProgramContext programCtx, Program program) { this.program = program; @@ -100,8 +98,7 @@ public class ContextState { /** * Derive a new context state from an initial state - * @param instructionAddr instruction identifies the instruction entry point for this context state. - * @param pcodeIndex pcode identifies the pcode entry point for this context state. + * @param pcodeEntry the pcode entry sequence number * @param previousState previous context state flowing into the specified pcode location */ public ContextState(SequenceNumber pcodeEntry, ContextState previousState) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/state/ResultsState.java b/Ghidra/Features/Base/src/main/java/ghidra/util/state/ResultsState.java index 257d4855b8..ae3fc3064e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/state/ResultsState.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/state/ResultsState.java @@ -110,10 +110,10 @@ public class ResultsState { /** * Constructor from a function entry point. Program context is used to establish the entry context state. * Analysis is performed during construction. - * @param entryAddr function entry point + * @param entryPt function entry point * @param analyzer function analysis call-back handler * @param program program containing function - * @param maintainInstructionResults + * @param maintainInstructionResults true to maintain the instruction results * @param monitor task monitor * @throws CancelledException */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/table/AbstractSelectionNavigationAction.java b/Ghidra/Features/Base/src/main/java/ghidra/util/table/AbstractSelectionNavigationAction.java index e77df537bb..1a985ad94c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/table/AbstractSelectionNavigationAction.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/table/AbstractSelectionNavigationAction.java @@ -33,7 +33,7 @@ import resources.Icons; /** * - * An action used to trigger navigation callback on instances of {@link #JTable}. Users can + * An action used to trigger navigation callback on instances of {@link JTable}. Users can * toggle this action to control navigation that is based upon selection. *

      * Subclasses need to implement {@link #navigate()}, which will be called when a navigation is diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/table/AddressArrayTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/util/table/AddressArrayTableModel.java index 7c730cbb8a..a9eaae08be 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/table/AddressArrayTableModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/table/AddressArrayTableModel.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +28,8 @@ import ghidra.util.task.TaskMonitor; *

      * If you need to compute the address array, then you should * extend {@link AddressPreviewTableModel} and override the - * {@link AddressPreviewTableModel#doLoad(Accumulator

      accumulator, TaskMonitor monitor)} + * {@link AddressPreviewTableModel#doLoad(Accumulator, TaskMonitor) + * doLoad(Accumulator<Address> accumulator, TaskMonitor monitor)} * method which will be called in a dedicated thread. *

      * Alternatively, you can create an instance of the {@link CustomLoadingAddressTableModel}, diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/table/CompositeGhidraTableCellRenderer.java b/Ghidra/Features/Base/src/main/java/ghidra/util/table/CompositeGhidraTableCellRenderer.java index 4eb91a5dcd..a402312469 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/table/CompositeGhidraTableCellRenderer.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/table/CompositeGhidraTableCellRenderer.java @@ -30,7 +30,7 @@ import docking.widgets.table.GTableCellRenderingData; * Why: Sometimes the need arises to be able to use the default table rendering while adding * additional rendering (e.g., to be able to add row coloring). * How: Create a cell renderer that extends this class and install that into your table. Then, - * override {@link #getTableCellRendererComponent(JTable, Object, Settings, boolean, boolean, int, int)} + * override {@link #getTableCellRendererComponent(JTable, Object, boolean, boolean, int, int)} * to call this class' implementation. Finally, add desired decoration. * */ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/xml/XmlTestHelper.java b/Ghidra/Features/Base/src/main/java/ghidra/util/xml/XmlTestHelper.java index 7462fb6e34..a45a0c1af6 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/util/xml/XmlTestHelper.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/util/xml/XmlTestHelper.java @@ -71,10 +71,11 @@ public class XmlTestHelper { /** * Read an XML file as a resource. * - * @param package + * @param pkg * where resource resides * @param name * name of the resource that is in the given package + * @throws IOException thrown if there was a problem accessing the xml resource. */ public void loadXmlResource(Package pkg, String name) throws IOException { String pkgName = pkg.getName(); @@ -200,12 +201,13 @@ public class XmlTestHelper { } /** - * @param string - * @return + * @param programName the program name + * @return the program * @throws VersionException * @throws InvalidNameException * @throws DuplicateNameException * @throws CancelledException + * @throws FileNotFoundException if the file is not found */ public Program loadResourceProgram(String programName) throws IOException, CancelledException, DuplicateNameException, InvalidNameException, VersionException { diff --git a/Ghidra/Features/Base/src/main/java/help/screenshot/TutorialScreenShotGenerator.java b/Ghidra/Features/Base/src/main/java/help/screenshot/TutorialScreenShotGenerator.java index 5bb5dce955..27da6c9fa0 100644 --- a/Ghidra/Features/Base/src/main/java/help/screenshot/TutorialScreenShotGenerator.java +++ b/Ghidra/Features/Base/src/main/java/help/screenshot/TutorialScreenShotGenerator.java @@ -29,8 +29,7 @@ public class TutorialScreenShotGenerator extends AbstractScreenShotGenerator { } /** - * @deprecated use instead {@link #showImage(String)}, which will show a comparison of the old - * and new images + * @deprecated * * NOTE: Please do not remove this until we have decided how to create a showImage() method * that is compatible with screenshots NOT in Help (ahem, Tutorial!!!). diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/ClangXML.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/ClangXML.java index a84f8c0039..e8c6dce897 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/ClangXML.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/ClangXML.java @@ -27,7 +27,7 @@ import ghidra.xml.*; * * * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments + *{@literal Window>Preferences>Java>Code Generation>Code and Comments} */ public abstract class ClangXML { // Placeholder for CLANG XML identifiers diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompInterface.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompInterface.java index 40a14b8e0b..f5c2fb9d59 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompInterface.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompInterface.java @@ -124,7 +124,7 @@ public class DecompInterface { /** * Turn on debugging dump for the next decompiled * function - * @param filename in which to save dump + * @param debugfile the file to enable debug dubp */ public synchronized void enableDebug(File debugfile) { debug = new DecompileDebug(debugfile); @@ -685,7 +685,6 @@ public class DecompInterface { * will be returned and a timeout error set. * @param monitor optional task monitor which may be used to cancel decompile * @return decompiled function text - * @throws CancelledException operation was cancelled via monitor */ public synchronized DecompileResults decompileFunction(Function func, int timeoutSecs, TaskMonitor monitor) { diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileOptions.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileOptions.java index a8e86814cf..1e51b4ace3 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileOptions.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileOptions.java @@ -452,7 +452,7 @@ public class DecompileOptions { // * @param ownerPlugin the plugin to which the options should be registered * @param opt the options object to register with * @param program the program - * @param hlep + * @param help the help */ public void registerOptions(Plugin ownerPlugin, ToolOptions opt, Program program, HelpLocation help) { diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerController.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerController.java index 97c9c2cfce..b84d9290f9 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerController.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerController.java @@ -88,7 +88,7 @@ public class DecompilerController { * Shows the function containing the given location in the decompilerPanel. Also, positions the * decompilerPanel's cursor to the closest equivalent position. If the decompilerPanel is * already displaying the function, then only the cursor is repositioned. To force a - * re-decompile use {@link #refreshDisplay(Program, ProgramLocation)}. + * re-decompile use {@link #refreshDisplay(Program, ProgramLocation, File)}. * * @param program the program for the given location * @param location the location containing the function to be displayed and the location in diff --git a/Ghidra/Features/GhidraServer/src/main/java/db/buffers/RemoteBufferFileImpl.java b/Ghidra/Features/GhidraServer/src/main/java/db/buffers/RemoteBufferFileImpl.java index 9ddaab6ba0..387275d32f 100644 --- a/Ghidra/Features/GhidraServer/src/main/java/db/buffers/RemoteBufferFileImpl.java +++ b/Ghidra/Features/GhidraServer/src/main/java/db/buffers/RemoteBufferFileImpl.java @@ -175,7 +175,7 @@ public class RemoteBufferFileImpl extends UnicastRemoteObject * Dispose and unexport all RemoteBufferFileImpl instances associated with the * specified owner. * @param owner - * @returns true if one or more buffer files were disposed. + * @return true if one or more buffer files were disposed. */ public static synchronized boolean dispose(Object owner) { boolean found = false; diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/Repository.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/Repository.java index 66b33f68fb..0930194376 100644 --- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/Repository.java +++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/Repository.java @@ -418,7 +418,7 @@ public class Repository implements FileSystemListener, RepositoryLogger { } /** - * @returns true if anonymous access is allowed for this repository + * @return true if anonymous access is allowed for this repository */ public boolean anonymousAccessAllowed() { return anonymousAccessAllowed; diff --git a/Ghidra/Features/Python/src/main/java/ghidra/python/GhidraPythonInterpreter.java b/Ghidra/Features/Python/src/main/java/ghidra/python/GhidraPythonInterpreter.java index 8c3deb4672..4b8b98d228 100644 --- a/Ghidra/Features/Python/src/main/java/ghidra/python/GhidraPythonInterpreter.java +++ b/Ghidra/Features/Python/src/main/java/ghidra/python/GhidraPythonInterpreter.java @@ -472,7 +472,7 @@ public class GhidraPythonInterpreter extends InteractiveInterpreter { } /** - * Returns a Map of property->string_substitution pairs. + * Returns a Map of property->string_substitution pairs. * * @param cmd current command * @param includeBuiltins True if we should include python built-ins; otherwise, false. diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/main/VTProgramCorrelator.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/main/VTProgramCorrelator.java index 036adb8677..a27829c8c7 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/main/VTProgramCorrelator.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/api/main/VTProgramCorrelator.java @@ -29,7 +29,7 @@ public interface VTProgramCorrelator { * @param session An existing manager that may contain previous results that may * influence this correlation. * @param monitor a task monitor for reporting progress during the correlation. - * @returns the match set created by this correlator used to store results. + * @return the match set created by this correlator used to store results. * * @throws CancelledException if the user cancels the correlation via the task monitor. */ diff --git a/Ghidra/Framework/DB/src/main/java/db/BinaryCodedField.java b/Ghidra/Framework/DB/src/main/java/db/BinaryCodedField.java index b48925f4aa..ae03cf7851 100644 --- a/Ghidra/Framework/DB/src/main/java/db/BinaryCodedField.java +++ b/Ghidra/Framework/DB/src/main/java/db/BinaryCodedField.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -91,7 +90,7 @@ public class BinaryCodedField extends BinaryField { /** * Construct a coded field from an existing binary field. - * @param binary field + * @param binField the binary field */ public BinaryCodedField(BinaryField binField) { data = binField.getBinaryData(); @@ -99,7 +98,7 @@ public class BinaryCodedField extends BinaryField { /** * Construct a coded field from a double value. - * @param value + * @param value the double value */ public BinaryCodedField(double value) { BinaryDataBuffer buffer = new BinaryDataBuffer(9); @@ -110,7 +109,7 @@ public class BinaryCodedField extends BinaryField { /** * Construct a coded field from a float value. - * @param value + * @param value the float value */ public BinaryCodedField(float value) { BinaryDataBuffer buffer = new BinaryDataBuffer(5); diff --git a/Ghidra/Framework/DB/src/main/java/db/ChainedBuffer.java b/Ghidra/Framework/DB/src/main/java/db/ChainedBuffer.java index 9e69467d86..19d16b3d5e 100644 --- a/Ghidra/Framework/DB/src/main/java/db/ChainedBuffer.java +++ b/Ghidra/Framework/DB/src/main/java/db/ChainedBuffer.java @@ -115,7 +115,7 @@ public class ChainedBuffer implements Buffer { * Construct a new chained buffer with optional obfuscation and uninitialized data source. * This method may only be invoked while a database transaction * is in progress. - * @param size buffer size (0 < size <= 0x7fffffff) + * @param size {@literal buffer size (0 < size <= 0x7fffffff)} * @param enableObfuscation true to enable xor-ing of stored data to facilitate data obfuscation. * @param uninitializedDataSource optional data source for uninitialized data. This should be a * read-only buffer which will always be used when re-instantiating the same stored ChainedBuffer. @@ -168,7 +168,7 @@ public class ChainedBuffer implements Buffer { * Construct a new chained buffer with optional obfuscation. * This method may only be invoked while a database transaction * is in progress. - * @param size buffer size (0 < size <= 0x7fffffff) + * @param size {@literal buffer size (0 < size <= 0x7fffffff)} * @param enableObfuscation true to enable xor-ing of stored data to facilitate data obfuscation. * @param bufferMgr database buffer manager * @throws IOException @@ -181,7 +181,7 @@ public class ChainedBuffer implements Buffer { /** * Construct a new chained buffer. * This method may only be invoked while a database transaction is in progress. - * @param size buffer size (0 < size <= 0x7fffffff) + * @param size {@literal buffer size (0 < size <= 0x7fffffff)} * @param bufferMgr database buffer manager * @throws IOException */ diff --git a/Ghidra/Framework/DB/src/main/java/db/DBBuffer.java b/Ghidra/Framework/DB/src/main/java/db/DBBuffer.java index b0ee1552c5..a16da3e6e8 100644 --- a/Ghidra/Framework/DB/src/main/java/db/DBBuffer.java +++ b/Ghidra/Framework/DB/src/main/java/db/DBBuffer.java @@ -106,7 +106,7 @@ public class DBBuffer { * Append the contents of the specified dbBuf onto the end of this buffer. * The size of this buffer increases by the size of dbBuf. When the operation * is complete, dbBuf object is no longer valid and must not be used. - * @param dbBuf the buffer to be appended to this buffer. + * @param buffer the buffer to be appended to this buffer. * @throws IOException thrown if an IO error occurs */ public void append(DBBuffer buffer) throws IOException { @@ -168,11 +168,9 @@ public class DBBuffer { * at the specified offset. The number of bytes stored is specified by the * length specified. * @param offset byte offset from start of buffer. - * @param data the byte data to be stored. + * @param bytes the byte data to be stored. * @param dataOffset the starting offset into the data. * @param length the number of bytes to be stored. - * @return the next available offset into the buffer, or -1 if the buffer is - * full. * @throws ArrayIndexOutOfBoundsException if an invalid offset is provided * or the end of buffer was encountered while storing the data. * @throws IOException is thrown if an error occurs while accessing the @@ -192,8 +190,6 @@ public class DBBuffer { * array. * @param offset byte offset from start of buffer. * @param bytes the byte data to be stored. - * @return the next available offset into the buffer, or -1 if the buffer is - * full. * @throws ArrayIndexOutOfBoundsException if an invalid offset is provided * or the end of buffer was encountered while storing the data. * @throws IOException is thrown if an error occurs while accessing the @@ -210,8 +206,6 @@ public class DBBuffer { * Put the 8-bit byte value into the buffer at the specified offset. * @param offset byte offset from start of buffer. * @param b the byte value to be stored. - * @return the next available offset into the buffer, or -1 if the buffer is - * full. * @throws ArrayIndexOutOfBoundsException if an invalid offset is provided. * @throws IOException is thrown if an error occurs while accessing the * underlying storage. @@ -226,7 +220,6 @@ public class DBBuffer { /** * Get the byte data located at the specified offset. * @param offset byte offset from start of buffer. - * @return the byte array. * @throws ArrayIndexOutOfBoundsException is thrown if an invalid offset is * specified or the end of the buffer was encountered while reading the * data. diff --git a/Ghidra/Framework/DB/src/main/java/db/DBHandle.java b/Ghidra/Framework/DB/src/main/java/db/DBHandle.java index c7453a9303..a99a3a43ac 100644 --- a/Ghidra/Framework/DB/src/main/java/db/DBHandle.java +++ b/Ghidra/Framework/DB/src/main/java/db/DBHandle.java @@ -670,7 +670,6 @@ public class DBHandle { * @param newDatabaseId database ID to be forced for new database or null to generate * new database ID * @param monitor progress monitor - * @param associateWithNewFile if true this handle will be associated with the new file * @throws IOException if IO error occurs * @throws CancelledException if monitor cancels operation */ @@ -915,10 +914,11 @@ public class DBHandle { } /** - * - * @param table - * @param id - * @throws DuplicateNameException + * Changes the name of an existing table. + * @param oldName the old name of the table + * @param newName the new name of the table + * @throws DuplicateNameException if a table with the new name already exists + * @return true if the name was changed successfully */ public synchronized boolean setTableName(String oldName, String newName) throws DuplicateNameException { diff --git a/Ghidra/Framework/DB/src/main/java/db/DBLongIterator.java b/Ghidra/Framework/DB/src/main/java/db/DBLongIterator.java index 69b19c4346..a52d67b1d0 100644 --- a/Ghidra/Framework/DB/src/main/java/db/DBLongIterator.java +++ b/Ghidra/Framework/DB/src/main/java/db/DBLongIterator.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,14 +38,14 @@ public interface DBLongIterator { /** * Return the next long value. * @throws IOException thrown if an IO error occurs - * @throws NoSuchElementException if the next value is not available. + * @throws java.util.NoSuchElementException if the next value is not available. */ public long next() throws IOException; /** * Return the previous long value. * @throws IOException thrown if an IO error occurs - * @throws NoSuchElementException if the previous value is not available. + * @throws java.util.NoSuchElementException if the previous value is not available. */ public long previous() throws IOException; diff --git a/Ghidra/Framework/DB/src/main/java/db/Record.java b/Ghidra/Framework/DB/src/main/java/db/Record.java index ac03950a29..f757ac5e0f 100644 --- a/Ghidra/Framework/DB/src/main/java/db/Record.java +++ b/Ghidra/Framework/DB/src/main/java/db/Record.java @@ -347,7 +347,7 @@ public class Record implements Comparable { /** * Set the binary data array for the specified field. * @param colIndex field index - * @param value field value + * @param bytes field value * @throws IllegalFieldAccessException if field does support binary data access */ public void setBinaryData(int colIndex, byte[] bytes) { @@ -369,7 +369,7 @@ public class Record implements Comparable { /** * Set the string value for the specified field. * @param colIndex field index - * @param value field value + * @param str field value * @throws IllegalFieldAccessException if field does support string data access */ public void setString(int colIndex, String str) { diff --git a/Ghidra/Framework/DB/src/main/java/db/Table.java b/Ghidra/Framework/DB/src/main/java/db/Table.java index 91ab3f54b7..2c125cd2f0 100644 --- a/Ghidra/Framework/DB/src/main/java/db/Table.java +++ b/Ghidra/Framework/DB/src/main/java/db/Table.java @@ -1497,11 +1497,10 @@ public class Table { * @param columnIndex schema column to sort on. * @param startValue the starting and minimum value of the secondary index field. * @param endValue the ending and maximum value of the secondary index field. - * @param primaryKey the primary key associated with the startField. * @param atStart if true, position the iterator before the start value. * Otherwise, position the iterator after the end value. * - * @return RecordIterator record iterator. + * @return record iterator. * @throws IOException if a secondary index does not exist for the specified * column, or the wrong field type was specified, or an I/O error occurs. */ @@ -1787,7 +1786,7 @@ public class Table { * Iterate over the records in ascending sorted order. Sorting occurs on the primary key value * starting at the specified startKey. * @param minKey the minimum primary key. - * @param endKey the maximum primary key. + * @param maxKey the maximum primary key. * @param startKey the initial iterator position. * @return record iterator * @throws IOException if an I/O error occurs. @@ -1823,7 +1822,7 @@ public class Table { * Iterate over the records in ascending sorted order. Sorting occurs on the primary key value * starting at the specified startKey. * @param minKey the minimum primary key, may be null. - * @param endKey the maximum primary key, may be null. + * @param maxKey the maximum primary key, may be null. * @param startKey the initial iterator position, if null minKey is also start. * @return record iterator * @throws IOException if an I/O error occurs. @@ -1872,7 +1871,7 @@ public class Table { * Iterate over the long primary keys in ascending sorted order * starting at the specified startKey. * @param minKey the minimum primary key. - * @param endKey the maximum primary key. + * @param maxKey the maximum primary key. * @param startKey the initial iterator position. * @return long key iterator * @throws IOException if an I/O error occurs. @@ -1888,7 +1887,6 @@ public class Table { /** * Iterate over all primary keys in ascending sorted order. - * @param startKey the first primary key, may be null. * @return Field type key iterator * @throws IOException if an I/O error occurs. */ diff --git a/Ghidra/Framework/DB/src/main/java/db/VarKeyInteriorNode.java b/Ghidra/Framework/DB/src/main/java/db/VarKeyInteriorNode.java index 6dd223f6c8..d56d279136 100644 --- a/Ghidra/Framework/DB/src/main/java/db/VarKeyInteriorNode.java +++ b/Ghidra/Framework/DB/src/main/java/db/VarKeyInteriorNode.java @@ -243,7 +243,7 @@ class VarKeyInteriorNode extends VarKeyNode { * key index which corresponds to the specified key offset. This facilitates * finding the key which utilizes the buffer storage at the specified * offset. - * @returns key index. + * @return key index. */ private int getOffsetIndex(int offset) { diff --git a/Ghidra/Framework/DB/src/main/java/db/VarKeyRecordNode.java b/Ghidra/Framework/DB/src/main/java/db/VarKeyRecordNode.java index c0de9152bb..e8da06aaac 100644 --- a/Ghidra/Framework/DB/src/main/java/db/VarKeyRecordNode.java +++ b/Ghidra/Framework/DB/src/main/java/db/VarKeyRecordNode.java @@ -630,7 +630,7 @@ class VarKeyRecordNode extends VarKeyNode { /** * Find the index which represents the halfway point within the record data. - * @returns key index. + * @return key index. */ private int getSplitIndex() { diff --git a/Ghidra/Framework/DB/src/main/java/db/VarRecNode.java b/Ghidra/Framework/DB/src/main/java/db/VarRecNode.java index 49a095ed18..946a149f6b 100644 --- a/Ghidra/Framework/DB/src/main/java/db/VarRecNode.java +++ b/Ghidra/Framework/DB/src/main/java/db/VarRecNode.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -233,7 +232,7 @@ class VarRecNode extends LongKeyRecordNode { /** * Find the index which represents the halfway point within the record data. - * @returns key index. + * @return key index. */ private int getSplitIndex() { diff --git a/Ghidra/Framework/DB/src/main/java/db/buffers/BufferFile.java b/Ghidra/Framework/DB/src/main/java/db/buffers/BufferFile.java index 481346bd3d..60017ed585 100644 --- a/Ghidra/Framework/DB/src/main/java/db/buffers/BufferFile.java +++ b/Ghidra/Framework/DB/src/main/java/db/buffers/BufferFile.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +39,7 @@ public interface BufferFile { * If file is open read-write, the modified contents are flushed * and the file re-opened as read-only. This is also used to commit * a new version if the file had been modified for update. - * @returns true if successfully transitioned from read-write to read-only + * @return true if successfully transitioned from read-write to read-only * @throws IOException if an I/O error occurs */ boolean setReadOnly() throws IOException; @@ -120,7 +119,7 @@ public interface BufferFile { /** * Delete this buffer file if writable. Once deleted, * this object is immediately disposed and may no longer be used. - * @returns true if deleted, false if the file is read-only + * @return true if deleted, false if the file is read-only * @throws IOException if an I/O error occurs. */ boolean delete() throws IOException; diff --git a/Ghidra/Framework/DB/src/main/java/db/buffers/BufferMgr.java b/Ghidra/Framework/DB/src/main/java/db/buffers/BufferMgr.java index 77d4aa0af7..a157bbe596 100644 --- a/Ghidra/Framework/DB/src/main/java/db/buffers/BufferMgr.java +++ b/Ghidra/Framework/DB/src/main/java/db/buffers/BufferMgr.java @@ -1439,7 +1439,7 @@ public class BufferMgr { * @param changeSet an optional database-backed change set which reflects changes * made since the last version. * @param monitor task monitor - * @returns true if snapshot successful, false if + * @return true if snapshot successful, false if */ public boolean takeRecoverySnapshot(DBChangeSet changeSet, TaskMonitor monitor) throws IOException, CancelledException { diff --git a/Ghidra/Framework/DB/src/main/java/db/buffers/DataBuffer.java b/Ghidra/Framework/DB/src/main/java/db/buffers/DataBuffer.java index 6e4f782a77..7497b69c1f 100644 --- a/Ghidra/Framework/DB/src/main/java/db/buffers/DataBuffer.java +++ b/Ghidra/Framework/DB/src/main/java/db/buffers/DataBuffer.java @@ -88,7 +88,6 @@ public class DataBuffer implements Buffer, Externalizable { /** * Get the storage array associated with this buffer. - * @return byte storage array. */ protected void setData(byte[] data) { this.data = data; diff --git a/Ghidra/Framework/DB/src/main/java/db/buffers/LocalManagedBufferFile.java b/Ghidra/Framework/DB/src/main/java/db/buffers/LocalManagedBufferFile.java index b7e056bd66..dbdba45143 100644 --- a/Ghidra/Framework/DB/src/main/java/db/buffers/LocalManagedBufferFile.java +++ b/Ghidra/Framework/DB/src/main/java/db/buffers/LocalManagedBufferFile.java @@ -533,15 +533,13 @@ public class LocalManagedBufferFile extends LocalBufferFile implements ManagedBu } /** - * Create a new buffer file version (used for checkin) - * @param srcFile must be a revision of destFile since change data from - * srcFile will control the actual modifications made to destFile. + * Create a new buffer file version (used for check-in) * @param destFile must be an versioned file representing an earlier version * of srcFile. - * @param fileComment - * @param monitor - * @throws CancelledException - * @throws IOException + * @param fileComment a comment for the new version. + * @param monitor the current monitor. + * @throws CancelledException if the operation is canceled. + * @throws IOException if the file is in an unexpected state. */ public void createNewVersion(ManagedBufferFile destFile, String fileComment, TaskMonitor monitor) throws CancelledException, IOException { @@ -568,13 +566,13 @@ public class LocalManagedBufferFile extends LocalBufferFile implements ManagedBu changeDataFile = getNextChangeDataFile(true); if (changeDataFile == null) { - throw new IOException("Unexpected state for checkin file"); + throw new IOException("Unexpected state for check-in file"); } BufferFile nextChangeDataFile = getNextChangeDataFile(false); if (nextChangeDataFile != null) { nextChangeDataFile.dispose(); - throw new IOException("Unexpected state for checkin file"); + throw new IOException("Unexpected state for check-in file"); } // Create new version diff --git a/Ghidra/Framework/DB/src/main/java/db/buffers/ManagedBufferFile.java b/Ghidra/Framework/DB/src/main/java/db/buffers/ManagedBufferFile.java index 2abe97e66a..9bddf954cf 100644 --- a/Ghidra/Framework/DB/src/main/java/db/buffers/ManagedBufferFile.java +++ b/Ghidra/Framework/DB/src/main/java/db/buffers/ManagedBufferFile.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -83,7 +82,7 @@ public interface ManagedBufferFile extends BufferFile { * Returns true if a save file is provided for creating a new * version of this buffer file. * @throws IOException if an I/O error occurs - * @see BufferFile.getSaveFile + * @see #getSaveFile() */ boolean canSave() throws IOException; diff --git a/Ghidra/Framework/DB/src/main/java/db/buffers/ManagedBufferFileAdapter.java b/Ghidra/Framework/DB/src/main/java/db/buffers/ManagedBufferFileAdapter.java index 4660e9f467..3d36a6738c 100644 --- a/Ghidra/Framework/DB/src/main/java/db/buffers/ManagedBufferFileAdapter.java +++ b/Ghidra/Framework/DB/src/main/java/db/buffers/ManagedBufferFileAdapter.java @@ -28,7 +28,7 @@ public class ManagedBufferFileAdapter extends BufferFileAdapter implements Manag /** * Constructor. - * @param remoteBufferFile remote buffer file handle + * @param remoteManagedBufferFile remote buffer file handle */ public ManagedBufferFileAdapter(ManagedBufferFileHandle remoteManagedBufferFile) { super(remoteManagedBufferFile); diff --git a/Ghidra/Framework/Demangler/src/main/java/util/demangler/CharacterIterator.java b/Ghidra/Framework/Demangler/src/main/java/util/demangler/CharacterIterator.java index 27a4131c86..3a8fd0fcef 100644 --- a/Ghidra/Framework/Demangler/src/main/java/util/demangler/CharacterIterator.java +++ b/Ghidra/Framework/Demangler/src/main/java/util/demangler/CharacterIterator.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,7 +73,6 @@ public class CharacterIterator { /** * Sets the position to the specified position in the text. * @param index the position within the text. - * @return the character at the specified position * @throws IllegalArgumentException if index is not in range from 0 to string.length()-1 */ public void setIndex(int index) { diff --git a/Ghidra/Framework/Demangler/src/main/java/util/demangler/GenericDemangledObject.java b/Ghidra/Framework/Demangler/src/main/java/util/demangler/GenericDemangledObject.java index f31c6cf6ef..54c8fab421 100644 --- a/Ghidra/Framework/Demangler/src/main/java/util/demangler/GenericDemangledObject.java +++ b/Ghidra/Framework/Demangler/src/main/java/util/demangler/GenericDemangledObject.java @@ -224,11 +224,11 @@ public abstract class GenericDemangledObject { /** * Returns a complete signature for the demangled symbol. - * For example: - * "unsigned long foo" + *
      For example: + * {@code "unsigned long foo" * "unsigned char * ClassA::getFoo(float, short *)" - * "void * getBar(int **, MyStruct &)" - * Note: based on the underlying mangling scheme, the + * "void * getBar(int **, MyStruct &)"} + *
      Note: based on the underlying mangling scheme, the * return type may or may not be specified in the signature. * @param format true if signature should be pretty printed * @return a complete signature for the demangled symbol diff --git a/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java b/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java index 415b74836b..820c198ad2 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java @@ -532,7 +532,7 @@ public abstract class ComponentProvider implements HelpDescriptor, ActionContext * text returned from {@link #getTitle()} will be used by default. * * @return the optionally set text to display in the tab for a component provider. - * @set {@link #setTabText(String)} + * @see #setTabText(String) */ public String getTabText() { diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DisabledComponentLayerFactory.java b/Ghidra/Framework/Docking/src/main/java/docking/DisabledComponentLayerFactory.java index a89e4d4ae6..a85bd9234c 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/DisabledComponentLayerFactory.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/DisabledComponentLayerFactory.java @@ -22,7 +22,7 @@ import javax.swing.*; import javax.swing.plaf.LayerUI; /** - * A factory to create JLayer instances to provide the L&F and functionality of a + * A factory to create JLayer instances to provide the L&F and functionality of a * disabled panel -- the component assumes a disabled color, and selection via mouse and * keyboard is prevented. As this is simply a layer in the UI stack, previous states of * components is maintained and unmodified. diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DockingUtils.java b/Ghidra/Framework/Docking/src/main/java/docking/DockingUtils.java index ea54da70d4..dfbfdfcfb3 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/DockingUtils.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/DockingUtils.java @@ -42,7 +42,7 @@ import ghidra.util.HTMLUtilities; import resources.ResourceManager; /** - *

      Notes about how to use HTML safely:

      + *

      Notes about how to use HTML safely:

      * Java's built-in HTML rendering in UI components is very useful, but can also introduce security * issues when a hostile actor is providing the text strings that are being rendered. *

      @@ -77,9 +77,9 @@ import resources.ResourceManager; * value at the start of the string, but instead put a quote or some other delimiter to prevent * html mode). *

      - *

      Recommended Ghidra UI Components:

      + *

      Recommended Ghidra UI Components:

      *

      - * + *
      * * * diff --git a/Ghidra/Framework/Docking/src/main/java/docking/KeyBindingOverrideKeyEventDispatcher.java b/Ghidra/Framework/Docking/src/main/java/docking/KeyBindingOverrideKeyEventDispatcher.java index 7b07df4319..7be392989b 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/KeyBindingOverrideKeyEventDispatcher.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/KeyBindingOverrideKeyEventDispatcher.java @@ -87,7 +87,7 @@ public class KeyBindingOverrideKeyEventDispatcher implements KeyEventDispatcher *
    • Reserved keybinding actions *
    • KeyListeners on the focused Component
    • *
    • InputMap and ActionMap actions for the Component
    • - *
    • Ghidra tool-level actions
    • + *
    • Ghidra tool-level actions
    • *
    • InputMap and ActionMap actions for the Component's parent, and so on up the * Swing hierarchy
    • * diff --git a/Ghidra/Framework/Docking/src/main/java/docking/WindowPosition.java b/Ghidra/Framework/Docking/src/main/java/docking/WindowPosition.java index 7655989417..938b258d0c 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/WindowPosition.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/WindowPosition.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +27,7 @@ public enum WindowPosition { * be placed into their own window. *

      * This position is ignored when used with components that share the same group (a.k.a., - * when used as an intragroup positioning item). + * when used as an intragroup positioning item). */ WINDOW, diff --git a/Ghidra/Framework/Docking/src/main/java/docking/action/DockingAction.java b/Ghidra/Framework/Docking/src/main/java/docking/action/DockingAction.java index 84c09e7ef0..3752314dbe 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/action/DockingAction.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/action/DockingAction.java @@ -92,6 +92,10 @@ public abstract class DockingAction implements DockingActionIf { supportsKeyBindings ? KeyBindingType.INDIVIDUAL : KeyBindingType.UNSUPPORTED; } + protected KeyBindingType getPreferredKeyBindingType() { + return KeyBindingType.INDIVIDUAL; + } + @Override public abstract void actionPerformed(ActionContext context); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingUtils.java b/Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingUtils.java index b7b48bfee9..0ccf9c1202 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingUtils.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingUtils.java @@ -633,7 +633,7 @@ public class KeyBindingUtils { /** * Convert the toString() form of the keyStroke. - *
      In Java 1.4.2 & earlier, Ctrl-M is returned as "keyCode CtrlM-P" + *
      In Java 1.4.2 and earlier, Ctrl-M is returned as "keyCode CtrlM-P" * and we want it to look like: "Ctrl-M". *
      In Java 1.5.0, Ctrl-M is returned as "ctrl pressed M" * and we want it to look like: "Ctrl-M". diff --git a/Ghidra/Framework/Docking/src/main/java/docking/dnd/Draggable.java b/Ghidra/Framework/Docking/src/main/java/docking/dnd/Draggable.java index 7fe61f99b3..8195bcf7f4 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/dnd/Draggable.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/dnd/Draggable.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,7 +61,7 @@ public interface Draggable { *

    • DnDConstants.ACTION_MOVE *
    • DnDConstants.ACTION_COPY *
    • DnDConstants.ACTION_COPY_OR_MOVE - *
    • + * * * @return the drag actions */ diff --git a/Ghidra/Framework/Docking/src/main/java/docking/dnd/GenericDataFlavor.java b/Ghidra/Framework/Docking/src/main/java/docking/dnd/GenericDataFlavor.java index e094f6c460..4366f66bcf 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/dnd/GenericDataFlavor.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/dnd/GenericDataFlavor.java @@ -59,9 +59,9 @@ public class GenericDataFlavor extends DataFlavor { /** * Construct a GenericDataFlavor that represents a MimeType * If the mimeType is - * "application/x-java-serialized-object; class=", + * {@code "application/x-java-serialized-object; class=", * the result is the same as calling - * new GenericDataFlavor(Class:forName() + * new GenericDataFlavor(Class:forName()} * @param mimeType the string used to identify the MIME type for * this flavor * @param humanPresentableName the human-readable string used to @@ -77,9 +77,9 @@ public class GenericDataFlavor extends DataFlavor { /** * Construct a GenericDataFlavor that represents a MimeType * If the mimeType is - * "application/x-java-serialized-object; class=", + * {@code "application/x-java-serialized-object; class=", * the result is the same as calling - * new GenericDataFlavor(Class:forName(). + * new GenericDataFlavor(Class:forName().} * * @param mimeType the string used to identify the MIME type for this flavor * @param humanPresentableName the human-readable string used to diff --git a/Ghidra/Framework/Docking/src/main/java/docking/help/GHelpSet.java b/Ghidra/Framework/Docking/src/main/java/docking/help/GHelpSet.java index ab0c363e53..b60a15a30f 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/help/GHelpSet.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/help/GHelpSet.java @@ -40,9 +40,9 @@ import ghidra.util.SystemUtilities; * The HelpSet class uses a javax.help.Map object to locate HTML files by javax.help.map.ID objects. * This class has overridden that basic usage of the Map object to allow ID lookups to take * place across GHelpSet objects. We need to do this due to how we merge help set content - * across modules. More specifically, in order to merge, we have to make all xml tags + * across modules. More specifically, in order to merge, we have to make all {@code } xml tags * the same, including the target HTML file they may reference. Well, when a module uses a - * tag that references an HTML file not inside of it's module, then JavaHelp + * {@code } tag that references an HTML file not inside of it's module, then JavaHelp * considers this an error and does not correctly merge the HelpSets that share the reference. * Further, it does not properly locate the shared HTML file reference. This class allows lookups * across modules by overridden the lookup functionality done by the map object. More specifically, diff --git a/Ghidra/Framework/Docking/src/main/java/docking/help/HelpManager.java b/Ghidra/Framework/Docking/src/main/java/docking/help/HelpManager.java index 4d48b19f11..47046a22f7 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/help/HelpManager.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/help/HelpManager.java @@ -80,7 +80,6 @@ public class HelpManager implements HelpService { * Constructor. * * @param url url for the main HelpSet file for the application. - * @param helpActionManager The HelpActionManager with which help location will be registered * @throws HelpSetException if HelpSet could not be created */ protected HelpManager(URL url) throws HelpSetException { diff --git a/Ghidra/Framework/Docking/src/main/java/docking/menu/MenuManager.java b/Ghidra/Framework/Docking/src/main/java/docking/menu/MenuManager.java index 8bab73843e..4d7fbcfc6d 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/menu/MenuManager.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/menu/MenuManager.java @@ -202,7 +202,7 @@ public class MenuManager implements ManagedMenuItem { } /*** - * Removes the Mnemonic indicator character (&) from the text + * Removes the Mnemonic indicator character (&) from the text * @param text the text to strip * @return the stripped mnemonic */ diff --git a/Ghidra/Framework/Docking/src/main/java/docking/menu/ToolBarItemManager.java b/Ghidra/Framework/Docking/src/main/java/docking/menu/ToolBarItemManager.java index 223c91d687..7085f6632e 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/menu/ToolBarItemManager.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/menu/ToolBarItemManager.java @@ -43,8 +43,7 @@ public class ToolBarItemManager implements PropertyChangeListener, ActionListene /** * Constructs a new ToolBarItemManager * @param action the action to be managed on the toolbar. - * @param iconSize the iconSize to scale to. - * @param buttonListener listener for button state changes. + * @param windowManager the window manager. */ public ToolBarItemManager(DockingActionIf action, DockingWindowManager windowManager) { this.toolBarAction = action; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/options/editor/OptionsEditorPanel.java b/Ghidra/Framework/Docking/src/main/java/docking/options/editor/OptionsEditorPanel.java index 34dace2a33..aae4aa4a37 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/options/editor/OptionsEditorPanel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/options/editor/OptionsEditorPanel.java @@ -49,7 +49,9 @@ public class OptionsEditorPanel extends JPanel implements OptionsEditor { /** * Creates a panel for editing the given options. * @param title The title of the options panel - * @param optionsList The list of options to display + * @param options The options to display + * @param optionNames The list of option names + * @param editorStateFactory The EditorStateFactory */ public OptionsEditorPanel(String title, Options options, List optionNames, EditorStateFactory editorStateFactory) { @@ -118,10 +120,6 @@ public class OptionsEditorPanel extends JPanel implements OptionsEditor { // OptionsEditor Interface Methods //================================================================================================== - /** - * @throws InvalidInputException - * @see ghidra.framework.options.OptionsEditor#apply() - */ @Override public void apply() throws InvalidInputException { for (EditorState state : editorInfoList) { @@ -129,9 +127,6 @@ public class OptionsEditorPanel extends JPanel implements OptionsEditor { } } - /** - * @see ghidra.framework.options.OptionsEditor#cancel() - */ @Override public void cancel() { // nothing to do @@ -142,17 +137,11 @@ public class OptionsEditorPanel extends JPanel implements OptionsEditor { // nothing to do, as this component is reloaded when options are changed } - /** - * @see ghidra.framework.options.OptionsEditor#getEditorComponent() - */ @Override public JComponent getEditorComponent(Options o, EditorStateFactory factory) { return this; } - /** - * @see OptionsEditor#setOptionsPropertyChangeListener(PropertyChangeListener) - */ @Override public void setOptionsPropertyChangeListener(PropertyChangeListener listener) { this.propertyChangeListener = listener; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java b/Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java index f2a0e37611..ef0c86bb0e 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/test/AbstractDockingTest.java @@ -1564,7 +1564,7 @@ public abstract class AbstractDockingTest extends AbstractGenericTest { *
      ABCDEFGHIJKLMNOPQRSTUVWXYZ *
      abcdefghijklmnopqrstuvwxyz *
      `1234567890-=[]\;',./ - *
      ~!@#$%^&*()_+{}|:"<>? + *
      {@literal ~!@#$%^&*()_+{}|:"<>?} *
      *
      It also handles '\n', '\t', and '\b'. * @@ -1588,7 +1588,7 @@ public abstract class AbstractDockingTest extends AbstractGenericTest { *
      ABCDEFGHIJKLMNOPQRSTUVWXYZ *
      abcdefghijklmnopqrstuvwxyz *
      `1234567890-=[]\;',./ - *
      ~!@#$%^&*()_+{}|:"<>? + *
      {@literal ~!@#$%^&*()_+{}|:"<>?} *
      *
      It also handles '\n', '\t', and '\b'. * diff --git a/Ghidra/Framework/Docking/src/main/java/docking/util/BadgedIcon.java b/Ghidra/Framework/Docking/src/main/java/docking/util/BadgedIcon.java index 429cd2e83a..02402cf29c 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/util/BadgedIcon.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/util/BadgedIcon.java @@ -230,7 +230,7 @@ public class BadgedIcon implements Icon { /** * Get the visibility status of the badge at the specified location * @param position Which icon to enquire about - * @Return True if the badge is visible, false otherwise + * @return True if the badge is visible, false otherwise * @see #setBadgeVisisble(BadgePosition, boolean) */ public boolean isBadgeVisible(BadgePosition position) { diff --git a/Ghidra/Framework/Docking/src/main/java/docking/util/image/ToolIconURL.java b/Ghidra/Framework/Docking/src/main/java/docking/util/image/ToolIconURL.java index 81cb1739ee..0698451074 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/util/image/ToolIconURL.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/util/image/ToolIconURL.java @@ -243,7 +243,7 @@ public class ToolIconURL implements Comparable { } /** - * Return the icon as {@link ToolConstants#ICON_SIZE} pixel size. + * Return the icon as {@link ToolConstants#LARGE_ICON_SIZE} pixel size. */ public ImageIcon getIcon() { if (largeIcon == null) { diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/AbstractGCellRenderer.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/AbstractGCellRenderer.java index cf5711f340..48c057437f 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/AbstractGCellRenderer.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/AbstractGCellRenderer.java @@ -34,7 +34,7 @@ public abstract class AbstractGCellRenderer extends GDHtmlLabel { private static final Color ALTERNATE_BACKGROUND_COLOR = new Color(237, 243, 254); - /** Allows the user to disable alternating row colors on JLists & JTables */ + /** Allows the user to disable alternating row colors on JLists and JTables */ private static final String DISABLE_ALTERNATING_ROW_COLORS_PROPERTY = "disable.alternating.row.colors"; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/GComponent.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/GComponent.java index 667df73dd1..538bd01057 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/GComponent.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/GComponent.java @@ -30,9 +30,9 @@ public interface GComponent { /** * Enables and disables the rendering of HTML content in this component. If enabled, this * component will interpret HTML content when the text this component is showing begins with - * <html> + * {@code } * - * @param enable true to enable HTML rendering; false to disable it + * @param enabled true to enable HTML rendering; false to disable it */ public default void setHTMLRenderingEnabled(boolean enabled) { setHTMLRenderingFlag((JComponent) this, enabled); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/OptionDialog.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/OptionDialog.java index a8531781ef..e9bba099bb 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/OptionDialog.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/OptionDialog.java @@ -35,7 +35,7 @@ import ghidra.util.exception.AssertException; * A utility class to easily show dialogs that require input from the user. * * - *

      Option Dialogs


      + *

      Option Dialogs


      *
      *

      * The primary type of diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/VariableHeightPanel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/VariableHeightPanel.java index 5819b47e2c..6d4960e692 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/VariableHeightPanel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/VariableHeightPanel.java @@ -93,7 +93,7 @@ public class VariableHeightPanel extends JPanel implements Scrollable { * This method is in place because the clients of this panel are not the ones that * construct this panel and thus cannot create the desired type of layout at construction time. * This method has no effect if this panel was constructed with pack set to - * false, which makes this panel use a grid style layout. + * false, which makes this panel use a grid style layout. * * @param singleLineLayout True signals to put all children on a single row; false will use * as many rows as are needed to layout all of the children. diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/autocomplete/AutocompletionModel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/autocomplete/AutocompletionModel.java index 59319e8181..08b1e57f09 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/autocomplete/AutocompletionModel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/autocomplete/AutocompletionModel.java @@ -28,7 +28,7 @@ public interface AutocompletionModel { * @param text the prefix, i.e., the text to the left of the user's caret. * @return a (possibly null or empty) list of suggested completions. * - * @note there is no requirement that the returned items actually start with the given prefix; + * NOTE: there is no requirement that the returned items actually start with the given prefix; * however, by default, the displayed text for the suggested item is inserted at the caret, * without changing the surrounding text. */ diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/autocomplete/TextFieldAutocompleter.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/autocomplete/TextFieldAutocompleter.java index 4ad7e976ad..ae6a08f322 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/autocomplete/TextFieldAutocompleter.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/autocomplete/TextFieldAutocompleter.java @@ -58,7 +58,7 @@ import ghidra.util.task.SwingUpdateManager; * completion is possible, it is automatically activated. This logic is applied again and again, * until either no suggestions are given, or more than one suggestion is given (or until the * autocompleter detects an infinite loop). This behavior can by modified on an item-by-item basis - * by overriding the {@link #getCompletionCanDefault(T)} method. This same behavior can be + * by overriding the {@link #getCompletionCanDefault(Object) getCompletionCanDefault(T)} method. This same behavior can be * activated by calling the {@link #startCompletion(JTextField)} method, which may be useful, e.g., * to bind a different key sequence to start autocompletion. * @@ -70,21 +70,20 @@ import ghidra.util.task.SwingUpdateManager; * The simplest use case is to create a text field, create an autocompleter with a custom model, * and then attach and show. * - * {@code + * *

        * JTextField field = new JTextField();
        * 
      - * AutocompletionModel model = new AutocompletionModel() {
      - *     @Override
      - *     public Collection computeCompletions(String text) {
      + * {@code AutocompletionModel model = new AutocompletionModel() }{
      + *     @Override
      + *     {@code public Collection computeCompletions(String text)} {
        *         ... // Populate the completion list based on the given prefix.
        *     }
        * }
      - * TextFieldAutocompleter completer = new TextFieldAutocompleter(model);
      + * {@code TextFieldAutocompleter completer = new TextFieldAutocompleter(model);
        * completer.attachTo(field);
        * ... // Add the field to, e.g., a dialog, and show.
      - * 
      - * } + * } * * @param the type of suggestions presented by this autocompleter. */ @@ -447,7 +446,7 @@ public class TextFieldAutocompleter { * * A programmer may override this if the various {@code getCompletion...} methods prove * insufficient for customizing the display of the suggestions. Please remember that - * {@link JLabels} can render HTML, so {@link #getCompletionDisplay(T)} is quite powerful + * {@link JLabel}s can render HTML, so {@link #getCompletionDisplay(Object) getCompletionDisplay(T)} is quite powerful * with the default {@link AutocompletionCellRenderer}. * @return a list cell renderer for the completion list. */ @@ -679,12 +678,12 @@ public class TextFieldAutocompleter { * Starts the autocompleter on the given text field. * * First, this repeatedly attempts auto-activation. When there are many suggestions, or when - * auto-activation is prevented (see {@link #getCompletionCanDefault(T)}), a list is displayed + * auto-activation is prevented (see {@link #getCompletionCanDefault(Object) getCompletionCanDefault(T)}), a list is displayed * (usually below the caret) containing the suggestions given the fields current contents. The * list remains open until either the user cancels it (usually via ESC) or the user activates * a suggestion. * - * @note The text field must already be attached. + * NOTE: The text field must already be attached. * @param field the field on which to start autocompletion. */ public void startCompletion(JTextField field) { diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/checkbox/GCheckBox.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/checkbox/GCheckBox.java index 9e9886eb6b..5e08fe495e 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/checkbox/GCheckBox.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/checkbox/GCheckBox.java @@ -23,7 +23,7 @@ import docking.widgets.GComponent; * A {@link JCheckBox} that has HTML rendering disabled. *

      * See also: - *

      Native ComponentRecommended Component
      {@link JLabel}{@link GLabel}
      {@link GDLabel}
      {@link GHtmlLabel}
      {@link GDHtmlLabel}
      {@link GIconLabel}
      {@link JCheckBox}{@link GCheckBox}
      {@link GHtmlCheckBox}
      + *
      * * * diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/checkbox/GHtmlCheckBox.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/checkbox/GHtmlCheckBox.java index 3b6bb21c63..3431008622 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/checkbox/GHtmlCheckBox.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/checkbox/GHtmlCheckBox.java @@ -23,7 +23,7 @@ import docking.widgets.GComponent; * A {@link JCheckBox} that allows HTML rendering. *

      * See also: - *

      ClassHTML renderingDescription
      {@link GCheckBox}NOHTML disabled JCheckBox
      {@link GHtmlCheckBox}YESHTML allowed JCheckBox
      + *
      * * * diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/InputWithChoicesDialog.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/InputWithChoicesDialog.java index 0d0fb281ce..f638ff626c 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/InputWithChoicesDialog.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/InputWithChoicesDialog.java @@ -46,8 +46,8 @@ public class InputWithChoicesDialog extends DialogComponentProvider { * * @param dialogTitle used as the name of the dialog's title bar * @param label value to use for the label of the text field - * @param String[] optionValues to populate the combo box - * @param String initial value - can be null + * @param optionValues values to populate the combo box + * @param initialValue the initial value - can be null * @param messageIcon the icon to display on the dialog--can be null */ public InputWithChoicesDialog(String dialogTitle, String label, String[] optionValues, @@ -75,9 +75,9 @@ public class InputWithChoicesDialog extends DialogComponentProvider { * * @param dialogTitle used as the name of the dialog's title bar * @param label value to use for the label of the text field - * @param String[] optionValues to populate the combo box - * @param String initial value - can be null - * @param boolean allowEdits true allows the user to add custom entries to the combo box by entering text + * @param optionValues values to populate the combo box + * @param initialValue the initial value - can be null + * @param allowEdits true allows the user to add custom entries to the combo box by entering text * @param messageIcon the icon to display on the dialog--can be null */ public InputWithChoicesDialog(String dialogTitle, String label, String[] optionValues, diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/NumberInputDialog.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/NumberInputDialog.java index 31be805028..3a2ccd91fa 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/NumberInputDialog.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/NumberInputDialog.java @@ -133,7 +133,7 @@ public class NumberInputDialog extends DialogComponentProvider { /** * Define the Main panel for the dialog here. * @param showAsHex - * @return JPanel the completed Main Panel<\CODE> + * @return JPanel the completed Main Panel */ protected JPanel buildMainPanel(String prompt, boolean showAsHex) { JPanel panel = createPanel(prompt); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/FieldPanel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/FieldPanel.java index 819dfead1c..bcaa0c33ab 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/FieldPanel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/FieldPanel.java @@ -578,10 +578,10 @@ public class FieldPanel extends JPanel } /** - * Add a new hover service to be managed. + * Add a new hover provider to be managed. * - * @param hoverService - * the new hover service to be managed. + * @param hoverProvider + * the new hover provider to be managed. */ public void setHoverProvider(HoverProvider hoverProvider) { hoverHandler.setHoverProvider(hoverProvider); @@ -864,7 +864,7 @@ public class FieldPanel extends JPanel /** * Scrolls the display to show the layout specified by index at the vertical * position specified by yPos. Generally, the index will be layout at the - * top of the screen and the yPos will be <= 0, meaning the layout may be + * top of the screen and the yPos will be <= 0, meaning the layout may be * partially off the top of the screen. * * @param index diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/FieldPanelOverLayoutManager.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/FieldPanelOverLayoutManager.java index 16818a151b..7ea4bd90b9 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/FieldPanelOverLayoutManager.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/FieldPanelOverLayoutManager.java @@ -36,7 +36,7 @@ import docking.widgets.fieldpanel.support.FieldLocation; /** * A {@link LayoutManager} that can be applied to a {@link FieldPanel}, allowing - * {@link Components} to be placed over a given field location. + * {@link Component}s to be placed over a given field location. * * To apply it, use {@link Container#setLayout(LayoutManager)} to install it. In this case, the * {@link Container} must be a {@link FieldPanel}. Then, use diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/LayoutModel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/LayoutModel.java index 2aeef517bb..08e403051c 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/LayoutModel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/LayoutModel.java @@ -98,8 +98,6 @@ public interface LayoutModel { /** * Returns true if the model knows about changes that haven't yet been told to the * LayoutModelListeners. - * @return true if changes have occurred, but no one has been notified. False if no changes - * since last listener notification. */ public void flushChanges(); } diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/AbstractTextFieldElement.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/AbstractTextFieldElement.java index 4f559b6aeb..e81cd91f5f 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/AbstractTextFieldElement.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/AbstractTextFieldElement.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,25 +47,16 @@ abstract public class AbstractTextFieldElement implements FieldElement { this.column = column; } - /** - * @see docking.widgets.fieldpanel.field.FieldElement#getText() - */ @Override public String getText() { return attributedString.getText(); } - /** - * @see docking.widgets.fieldpanel.field.FieldElement#charAt(int) - */ @Override public char charAt(int index) { return attributedString.getText().charAt(index); } - /** - * @see docking.widgets.fieldpanel.field.FieldElement#length() - */ @Override public int length() { return getText().length(); @@ -76,57 +66,36 @@ abstract public class AbstractTextFieldElement implements FieldElement { // font metrics methods //================================================================================================== - /** - * @see docking.widgets.fieldpanel.field.FieldElement#getStringWidth() - */ @Override public int getStringWidth() { return attributedString.getStringWidth(); } - /** - * @see docking.widgets.fieldpanel.field.FieldElement#getHeightAbove() - */ @Override public int getHeightAbove() { return attributedString.getHeightAbove(); } - /** - * @see docking.widgets.fieldpanel.field.FieldElement#getHeightBelow() - */ @Override public int getHeightBelow() { return attributedString.getHeightBelow(); } - /** - * @see docking.widgets.fieldpanel.field.FieldElement#getMaxCharactersForWidth(int) - */ @Override public int getMaxCharactersForWidth(int width) { return attributedString.getColumnPosition(width); } - /** - * @see docking.widgets.fieldpanel.field.FieldElement#getColor(int) - */ @Override public Color getColor(int charIndex) { return attributedString.getColor(charIndex); } - /** - * @see docking.widgets.fieldpanel.field.FieldElement#getFieldElement(int) - */ @Override public FieldElement getFieldElement(int characterOffset) { return this; } - /** - * @see docking.widgets.fieldpanel.field.FieldElement#substring(int) - */ @Override public FieldElement substring(int start) { return substring(start, attributedString.length()); @@ -140,9 +109,6 @@ abstract public class AbstractTextFieldElement implements FieldElement { //================================================================================================== // location info //================================================================================================== - /** - * @see docking.widgets.fieldpanel.field.FieldElement#getDataLocationForCharacterIndex(int) - */ @Override public RowColLocation getDataLocationForCharacterIndex(int characterIndex) { if (characterIndex < 0 || characterIndex > attributedString.getText().length()) { @@ -151,9 +117,6 @@ abstract public class AbstractTextFieldElement implements FieldElement { return new RowColLocation(row, column + characterIndex); } - /** - * @see docking.widgets.fieldpanel.field.FieldElement#getCharacterIndexForDataLocation(int, int) - */ @Override public int getCharacterIndexForDataLocation(int dataRow, int dataColumn) { if (dataRow == row && (dataColumn >= column) && (dataColumn <= column + length())) { @@ -167,9 +130,6 @@ abstract public class AbstractTextFieldElement implements FieldElement { // paint methods //================================================================================================== - /** - * @see docking.widgets.fieldpanel.field.FieldElement#paint(java.awt.Graphics, int, int) - */ @Override public void paint(JComponent c, Graphics g, int x, int y) { attributedString.paint(c, g, x, y); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/ClippingTextField.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/ClippingTextField.java index bb25ba0477..2648ba3764 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/ClippingTextField.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/ClippingTextField.java @@ -95,9 +95,6 @@ public class ClippingTextField implements TextField { textElement = textElement.substring(0, length); } - /** - * @see docking.widgets.fieldpanel.field.Field#contains(int, int) - */ @Override public boolean contains(int x, int y) { if ((x >= startX) && (x < startX + width) && (y >= -textElement.getHeightAbove()) && @@ -107,9 +104,6 @@ public class ClippingTextField implements TextField { return false; } - /** - * @see docking.widgets.fieldpanel.field.Field#getCol(int, int) - */ @Override public int getCol(int row, int x) { int xPos = Math.max(x - startX, 0); // make x relative to this fields @@ -117,9 +111,6 @@ public class ClippingTextField implements TextField { return textElement.getMaxCharactersForWidth(xPos); } - /** - * @see docking.widgets.fieldpanel.field.Field#getCursorBounds(int, int) - */ @Override public Rectangle getCursorBounds(int row, int col) { if (row != 0) { @@ -132,17 +123,11 @@ public class ClippingTextField implements TextField { textElement.getHeightAbove() + textElement.getHeightBelow()); } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeight() - */ @Override public int getHeight() { return textElement.getHeightAbove() + textElement.getHeightBelow(); } - /** - * @see docking.widgets.fieldpanel.field.Field#getNumCols(int) - */ @Override public int getNumCols(int row) { return getNumCols(); @@ -152,26 +137,16 @@ public class ClippingTextField implements TextField { return textElement.length() + 1; // allow one column past the end of the text } - /** - * @see docking.widgets.fieldpanel.field.Field#getNumRows() - */ @Override public int getNumRows() { return 1; } - /** - * @see docking.widgets.fieldpanel.field.Field#getRow(int) - */ @Override public int getRow(int y) { return 0; } - /** - * @see docking.widgets.fieldpanel.field.Field#getScrollableUnitIncrement(int, int, - * int) - */ @Override public int getScrollableUnitIncrement(int topOfScreen, int direction, int max) { @@ -186,17 +161,11 @@ public class ClippingTextField implements TextField { return -getHeightAbove() - topOfScreen; } - /** - * @see docking.widgets.fieldpanel.field.Field#getStartX() - */ @Override public int getStartX() { return startX; } - /** - * @see docking.widgets.fieldpanel.field.Field#getWidth() - */ @Override public int getWidth() { return width; @@ -207,9 +176,6 @@ public class ClippingTextField implements TextField { return preferredWidth; } - /** - * @see docking.widgets.fieldpanel.field.Field#getX(int, int) - */ @Override public int getX(int row, int col) { if (col >= getNumCols()) { @@ -218,33 +184,21 @@ public class ClippingTextField implements TextField { return findX(col) + startX; } - /** - * @see docking.widgets.fieldpanel.field.Field#getY(int) - */ @Override public int getY(int row) { return -getHeightAbove(); } - /** - * @see docking.widgets.fieldpanel.field.Field#isPrimary() - */ @Override public boolean isPrimary() { return isPrimary; } - /** - * @see docking.widgets.fieldpanel.field.TextField#setPrimary(boolean) - */ @Override public void setPrimary(boolean b) { isPrimary = b; } - /** - * @see docking.widgets.fieldpanel.field.Field#isValid(int, int) - */ @Override public boolean isValid(int row, int col) { if (row != 0) { @@ -261,11 +215,6 @@ public class ClippingTextField implements TextField { return fullText; } - /** - * @see docking.widgets.fieldpanel.field.Field#paint(java.awt.Graphics, - * docking.widgets.fieldpanel.internal.PaintContext, boolean, - * docking.widgets.fieldpanel.support.RowColLocation) - */ @Override public void paint(JComponent c, Graphics g, PaintContext context, FieldBackgroundColorManager colorManager, RowColLocation cursorLoc, int rowHeight) { @@ -384,9 +333,6 @@ public class ClippingTextField implements TextField { } - /** - * @see docking.widgets.fieldpanel.field.TextField#dataToScreenLocation(int, int) - */ @Override public RowColLocation dataToScreenLocation(int dataRow, int dataColumn) { int column = textElement.getCharacterIndexForDataLocation(dataRow, dataColumn); @@ -408,33 +354,21 @@ public class ClippingTextField implements TextField { return isClipped; } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeightAbove() - */ @Override public int getHeightAbove() { return textElement.getHeightAbove(); } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeightBelow() - */ @Override public int getHeightBelow() { return textElement.getHeightBelow(); } - /** - * @see docking.widgets.fieldpanel.field.Field#rowHeightChanged(int, int) - */ @Override public void rowHeightChanged(int heightAbove, int heightBelow) { // Don't care } - /** - * @see docking.widgets.fieldpanel.field.Field#getText() - */ @Override public String getText() { return getString(); @@ -445,25 +379,16 @@ public class ClippingTextField implements TextField { return getString(); } - /** - * @see docking.widgets.fieldpanel.field.Field#textOffsetToScreenLocation(int) - */ @Override public RowColLocation textOffsetToScreenLocation(int textOffset) { return new RowColLocation(0, Math.min(textOffset, textElement.getText().length() - 1)); } - /** - * @see docking.widgets.fieldpanel.field.Field#screenLocationToTextOffset(int, int) - */ @Override public int screenLocationToTextOffset(int row, int col) { return Math.min(textElement.getText().length(), col); } - /** - * @see ghidra.app.util.viewer.field.ListingField#getClickedObject(FieldLocation) - */ public Object getClickedObject(FieldLocation fieldLocation) { return getFieldElement(fieldLocation.row, fieldLocation.col); } diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/EmptyTextField.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/EmptyTextField.java index 1360ffe084..0f9067f7a1 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/EmptyTextField.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/EmptyTextField.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,10 +59,6 @@ public class EmptyTextField implements Field { return false; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getWidth() - */ @Override public int getWidth() { return width; @@ -74,82 +69,46 @@ public class EmptyTextField implements Field { return 0; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getHeight() - */ @Override public int getHeight() { return height; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getStartX() - */ @Override public int getStartX() { return startX; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getNumRows() - */ @Override public int getNumRows() { return 1; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getNumCols(int) - */ @Override public int getNumCols(int row) { return 0; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getRow(int) - */ @Override public int getRow(int y) { return 0; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getCol(int, int) - */ @Override public int getCol(int row, int x) { return 0; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getY(int) - */ @Override public int getY(int row) { return -heightAbove; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getX(int, int) - */ @Override public int getX(int row, int col) { return 0; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#isValid(int, int) - */ @Override public boolean isValid(int row, int col) { @@ -162,9 +121,6 @@ public class EmptyTextField implements Field { return true; } - /** - * @see docking.widgets.fieldpanel.field.Field#paint(java.awt.Graphics, docking.widgets.fieldpanel.internal.PaintContext, boolean, docking.widgets.fieldpanel.support.RowColLocation) - */ @Override public void paint(JComponent c, Graphics g, PaintContext context, FieldBackgroundColorManager map, RowColLocation cursorLoc, int rowHeight) { @@ -182,10 +138,6 @@ public class EmptyTextField implements Field { } } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getCursorBounds(int, int) - */ @Override public Rectangle getCursorBounds(int row, int col) { if (row != 0) { @@ -195,10 +147,6 @@ public class EmptyTextField implements Field { return new Rectangle(x, -heightAbove, 2, height); } - /** - * - * @see docking.widgets.fieldpanel.field.Field#contains(int, int) - */ @Override public boolean contains(int x, int y) { if ((x >= startX) && (x < startX + width) && (y >= -heightAbove) && @@ -226,10 +174,6 @@ public class EmptyTextField implements Field { return Color.WHITE; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getScrollableUnitIncrement(int, int, int) - */ @Override public int getScrollableUnitIncrement(int topOfScreen, int direction, int max) { if ((topOfScreen < -heightAbove) || (topOfScreen > height - heightAbove)) { @@ -242,9 +186,6 @@ public class EmptyTextField implements Field { return heightAbove - topOfScreen; } - /** - * @see docking.widgets.fieldpanel.field.Field#isPrimary() - */ @Override public boolean isPrimary() { return isPrimary; @@ -258,34 +199,22 @@ public class EmptyTextField implements Field { isPrimary = state; } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeightAbove() - */ @Override public int getHeightAbove() { return heightAbove; } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeightBelow() - */ @Override public int getHeightBelow() { return height - heightAbove; } - /** - * @see docking.widgets.fieldpanel.field.Field#rowHeightChanged(int, int) - */ @Override public void rowHeightChanged(int newHeightAbove, int newHeightBelow) { // don't care } - /** - * @see docking.widgets.fieldpanel.field.Field#getText() - */ @Override public String getText() { return ""; @@ -296,17 +225,11 @@ public class EmptyTextField implements Field { return ""; } - /** - * @see docking.widgets.fieldpanel.field.Field#textOffsetToScreenLocation(int) - */ @Override public RowColLocation textOffsetToScreenLocation(int textOffset) { return new RowColLocation(0, 0); } - /** - * @see docking.widgets.fieldpanel.field.Field#screenLocationToTextOffset(int, int) - */ @Override public int screenLocationToTextOffset(int row, int col) { return 0; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/FlowLayoutTextField.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/FlowLayoutTextField.java index fba061aa91..762d9ea2c5 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/FlowLayoutTextField.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/FlowLayoutTextField.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +29,7 @@ public class FlowLayoutTextField extends VerticalLayoutTextField { /** * This constructor will create a text field that will render one line of - * text. If metrics.stringWidth(text) > width, then the text + * text. If metrics.stringWidth(text) > width, then the text * will be clipped. No wrapping will be performed. If text * contains the highlight string, then it will be highlighted using the * highlight color. diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/ReverseClippingTextField.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/ReverseClippingTextField.java index bffa921952..ab5a995266 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/ReverseClippingTextField.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/ReverseClippingTextField.java @@ -108,9 +108,6 @@ public class ReverseClippingTextField implements TextField { textStartX = startX + DOT_DOT_DOT_WIDTH + margin; } - /** - * @see docking.widgets.fieldpanel.field.Field#contains(int, int) - */ @Override public boolean contains(int x, int y) { if ((x >= startX) && (x < startX + width) && (y >= -textElement.getHeightAbove()) && @@ -120,9 +117,6 @@ public class ReverseClippingTextField implements TextField { return false; } - /** - * @see docking.widgets.fieldpanel.field.Field#getCol(int, int) - */ @Override public int getCol(int row, int x) { int xPos = Math.max(x - textStartX, 0); // make x relative to this fields @@ -130,9 +124,6 @@ public class ReverseClippingTextField implements TextField { return textElement.getMaxCharactersForWidth(xPos); } - /** - * @see docking.widgets.fieldpanel.field.Field#getCursorBounds(int, int) - */ @Override public Rectangle getCursorBounds(int row, int col) { if (row != 0) { @@ -145,17 +136,11 @@ public class ReverseClippingTextField implements TextField { textElement.getHeightAbove() + textElement.getHeightBelow()); } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeight() - */ @Override public int getHeight() { return textElement.getHeightAbove() + textElement.getHeightBelow(); } - /** - * @see docking.widgets.fieldpanel.field.Field#getNumCols(int) - */ @Override public int getNumCols(int row) { return getNumCols(); @@ -165,26 +150,16 @@ public class ReverseClippingTextField implements TextField { return textElement.length() + 1; // allow one column past the end of the text } - /** - * @see docking.widgets.fieldpanel.field.Field#getNumRows() - */ @Override public int getNumRows() { return 1; } - /** - * @see docking.widgets.fieldpanel.field.Field#getRow(int) - */ @Override public int getRow(int y) { return 0; } - /** - * @see docking.widgets.fieldpanel.field.Field#getScrollableUnitIncrement(int, int, - * int) - */ @Override public int getScrollableUnitIncrement(int topOfScreen, int direction, int max) { @@ -199,17 +174,11 @@ public class ReverseClippingTextField implements TextField { return -getHeightAbove() - topOfScreen; } - /** - * @see docking.widgets.fieldpanel.field.Field#getStartX() - */ @Override public int getStartX() { return startX; } - /** - * @see docking.widgets.fieldpanel.field.Field#getWidth() - */ @Override public int getWidth() { return width; @@ -220,9 +189,6 @@ public class ReverseClippingTextField implements TextField { return preferredWidth; } - /** - * @see docking.widgets.fieldpanel.field.Field#getX(int, int) - */ @Override public int getX(int row, int col) { if (col >= getNumCols()) { @@ -231,33 +197,21 @@ public class ReverseClippingTextField implements TextField { return findX(col) + textStartX; } - /** - * @see docking.widgets.fieldpanel.field.Field#getY(int) - */ @Override public int getY(int row) { return -getHeightAbove(); } - /** - * @see docking.widgets.fieldpanel.field.Field#isPrimary() - */ @Override public boolean isPrimary() { return isPrimary; } - /** - * @see docking.widgets.fieldpanel.field.TextField#setPrimary(boolean) - */ @Override public void setPrimary(boolean b) { isPrimary = b; } - /** - * @see docking.widgets.fieldpanel.field.Field#isValid(int, int) - */ @Override public boolean isValid(int row, int col) { if (row != 0) { @@ -274,11 +228,6 @@ public class ReverseClippingTextField implements TextField { return fullText; } - /** - * @see docking.widgets.fieldpanel.field.Field#paint(java.awt.Graphics, - * docking.widgets.fieldpanel.internal.PaintContext, boolean, - * docking.widgets.fieldpanel.support.RowColLocation) - */ @Override public void paint(JComponent c, Graphics g, PaintContext context, FieldBackgroundColorManager colorManager, RowColLocation cursorLoc, int rowHeight) { @@ -389,9 +338,6 @@ public class ReverseClippingTextField implements TextField { } - /** - * @see docking.widgets.fieldpanel.field.TextField#dataToScreenLocation(int, int) - */ @Override public RowColLocation dataToScreenLocation(int dataRow, int dataColumn) { int column = textElement.getCharacterIndexForDataLocation(dataRow, dataColumn); @@ -413,33 +359,21 @@ public class ReverseClippingTextField implements TextField { return isClipped; } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeightAbove() - */ @Override public int getHeightAbove() { return textElement.getHeightAbove(); } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeightBelow() - */ @Override public int getHeightBelow() { return textElement.getHeightBelow(); } - /** - * @see docking.widgets.fieldpanel.field.Field#rowHeightChanged(int, int) - */ @Override public void rowHeightChanged(int heightAbove, int heightBelow) { // Don't care } - /** - * @see docking.widgets.fieldpanel.field.Field#getText() - */ @Override public String getText() { // TODO: this gets the full string and not the clipped version--we want @@ -452,9 +386,6 @@ public class ReverseClippingTextField implements TextField { return getString(); } - /** - * @see docking.widgets.fieldpanel.field.Field#textOffsetToScreenLocation(int) - */ @Override public RowColLocation textOffsetToScreenLocation(int textOffset) { int col = textOffset + startingCharIndex; @@ -462,9 +393,6 @@ public class ReverseClippingTextField implements TextField { return new RowColLocation(0, Math.min(col, textElement.getText().length() - 1)); } - /** - * @see docking.widgets.fieldpanel.field.Field#screenLocationToTextOffset(int, int) - */ @Override public int screenLocationToTextOffset(int row, int col) { return col + startingCharIndex; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/SimpleImageField.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/SimpleImageField.java index 4313368c35..ac6e856533 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/SimpleImageField.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/SimpleImageField.java @@ -88,10 +88,6 @@ public class SimpleImageField implements Field { } } - /** - * - * @see docking.widgets.fieldpanel.field.Field#contains(int, int) - */ @Override public boolean contains(int x, int y) { if ((x >= startX) && (x < startX + width) && (y >= -heightAbove) && @@ -101,19 +97,11 @@ public class SimpleImageField implements Field { return false; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getCol(int, int) - */ @Override public int getCol(int row, int x) { return 0; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getCursorBounds(int, int) - */ @Override public Rectangle getCursorBounds(int row, int col) { if (row != 0) { @@ -122,46 +110,26 @@ public class SimpleImageField implements Field { return new Rectangle(startX, -heightAbove, width, height); } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getHeight() - */ @Override public int getHeight() { return height; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getNumRows() - */ @Override public int getNumRows() { return 1; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getNumCols(int) - */ @Override public int getNumCols(int row) { return 1; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getRow(int) - */ @Override public int getRow(int y) { return 0; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getScrollableUnitIncrement(int, int, int) - */ @Override public int getScrollableUnitIncrement(int topOfScreen, int direction, int max) { if ((topOfScreen < -heightAbove) || (topOfScreen > height - heightAbove)) { @@ -174,19 +142,11 @@ public class SimpleImageField implements Field { return -heightAbove - topOfScreen; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getStartX() - */ @Override public int getStartX() { return startX; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getWidth() - */ @Override public int getWidth() { return width; @@ -197,28 +157,16 @@ public class SimpleImageField implements Field { return icon.getIconWidth(); } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getX(int, int) - */ @Override public int getX(int row, int col) { return 0; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getY(int) - */ @Override public int getY(int row) { return -heightAbove; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#isValid(int, int) - */ @Override public boolean isValid(int row, int col) { if (row != 0) { @@ -230,9 +178,6 @@ public class SimpleImageField implements Field { return true; } - /** - * @see docking.widgets.fieldpanel.field.Field#paint(java.awt.Graphics, docking.widgets.fieldpanel.internal.PaintContext, boolean, docking.widgets.fieldpanel.support.RowColLocation) - */ @Override public void paint(JComponent c, Graphics g, PaintContext context, FieldBackgroundColorManager map, RowColLocation cursorLoc, int rowHeight) { @@ -278,10 +223,6 @@ public class SimpleImageField implements Field { } } - /** - * - * @see docking.widgets.fieldpanel.field.Field#isPrimary() - */ @Override public boolean isPrimary() { return isPrimary; @@ -295,33 +236,21 @@ public class SimpleImageField implements Field { isPrimary = state; } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeightAbove() - */ @Override public int getHeightAbove() { return heightAbove; } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeightBelow() - */ @Override public int getHeightBelow() { return height - heightAbove; } - /** - * @see docking.widgets.fieldpanel.field.Field#rowHeightChanged(int, int) - */ @Override public void rowHeightChanged(int newHeightAbove, int newHeightBelow) { // don't care } - /** - * @see docking.widgets.fieldpanel.field.Field#getText() - */ @Override public String getText() { return ""; @@ -332,17 +261,11 @@ public class SimpleImageField implements Field { return ""; } - /** - * @see docking.widgets.fieldpanel.field.Field#textOffsetToScreenLocation(int) - */ @Override public RowColLocation textOffsetToScreenLocation(int textOffset) { return new RowColLocation(0, 0); } - /** - * @see docking.widgets.fieldpanel.field.Field#screenLocationToTextOffset(int, int) - */ @Override public int screenLocationToTextOffset(int row, int col) { return 0; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/VerticalLayoutTextField.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/VerticalLayoutTextField.java index dad543cad9..1246ad6644 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/VerticalLayoutTextField.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/field/VerticalLayoutTextField.java @@ -106,9 +106,6 @@ public class VerticalLayoutTextField implements TextField { return widest; } - /** - * @see docking.widgets.fieldpanel.field.Field#getText() - */ @Override public String getText() { if (text == null) { @@ -122,18 +119,11 @@ public class VerticalLayoutTextField implements TextField { return generateText("\n"); } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { return getText(); } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getWidth() - */ @Override public int getWidth() { return width; @@ -144,45 +134,27 @@ public class VerticalLayoutTextField implements TextField { return preferredWidth; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getHeight() - */ @Override public int getHeight() { return height; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getStartX() - */ @Override public int getStartX() { return startX; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getNumRows() - */ @Override public int getNumRows() { return subFields.size(); } - /** - * @see docking.widgets.fieldpanel.field.Field#getNumCols(int) - */ @Override public int getNumCols(int row) { Field f = subFields.get(row); return f.getNumCols(0); } - /** - * @see docking.widgets.fieldpanel.field.Field#getRow(int) - */ @Override public int getRow(int y) { if (y < -heightAbove) { @@ -201,20 +173,12 @@ public class VerticalLayoutTextField implements TextField { return n - 1; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getCol(int, int) - */ @Override public int getCol(int row, int x) { Field f = subFields.get(row); return f.getCol(0, x); } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getY(int) - */ @Override public int getY(int row) { @@ -226,20 +190,12 @@ public class VerticalLayoutTextField implements TextField { return y; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getX(int, int) - */ @Override public int getX(int row, int col) { Field f = subFields.get(row); return f.getX(0, col); } - /** - * - * @see docking.widgets.fieldpanel.field.Field#isValid(int, int) - */ @Override public boolean isValid(int row, int col) { @@ -250,9 +206,6 @@ public class VerticalLayoutTextField implements TextField { return f.isValid(0, col); } - /** - * @see docking.widgets.fieldpanel.field.Field#paint(java.awt.Graphics, docking.widgets.fieldpanel.internal.PaintContext, boolean, docking.widgets.fieldpanel.support.RowColLocation) - */ @Override public void paint(JComponent c, Graphics g, PaintContext context, FieldBackgroundColorManager colorManager, RowColLocation cursorLoc, int rowHeight) { @@ -308,10 +261,6 @@ public class VerticalLayoutTextField implements TextField { g.translate(0, -height); } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getCursorBounds(int, int) - */ @Override public Rectangle getCursorBounds(int row, int col) { if ((row < 0) || (row >= subFields.size())) { @@ -326,10 +275,6 @@ public class VerticalLayoutTextField implements TextField { return r; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#contains(int, int) - */ @Override public boolean contains(int x, int y) { if ((x >= startX) && (x < startX + width) && (y >= -heightAbove) && @@ -339,10 +284,6 @@ public class VerticalLayoutTextField implements TextField { return false; } - /** - * - * @see docking.widgets.fieldpanel.field.Field#getScrollableUnitIncrement(int, int, int) - */ @Override public int getScrollableUnitIncrement(int topOfScreen, int direction, int max) { @@ -364,9 +305,6 @@ public class VerticalLayoutTextField implements TextField { } } - /** - * @see docking.widgets.fieldpanel.field.Field#isPrimary() - */ @Override public boolean isPrimary() { return isPrimary; @@ -388,25 +326,16 @@ public class VerticalLayoutTextField implements TextField { return Collections.unmodifiableList(subFields); } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeightAbove() - */ @Override public int getHeightAbove() { return heightAbove; } - /** - * @see docking.widgets.fieldpanel.field.Field#getHeightBelow() - */ @Override public int getHeightBelow() { return height - heightAbove; } - /** - * @see docking.widgets.fieldpanel.field.Field#rowHeightChanged(int, int) - */ @Override public void rowHeightChanged(int heightAbove1, int heightBelow) { // most fields don't care @@ -494,9 +423,6 @@ public class VerticalLayoutTextField implements TextField { return buf.toString(); } - /** - * @see docking.widgets.fieldpanel.field.Field#screenLocationToTextOffset(int, int) - */ @Override public int screenLocationToTextOffset(int row, int col) { if (row >= textElements.length) { @@ -511,9 +437,6 @@ public class VerticalLayoutTextField implements TextField { return len; } - /** - * @see docking.widgets.fieldpanel.field.Field#textOffsetToScreenLocation(int) - */ @Override public RowColLocation textOffsetToScreenLocation(int textOffset) { int extraSpace = lineDelimiter.length(); @@ -528,9 +451,6 @@ public class VerticalLayoutTextField implements TextField { return new RowColLocation(n - 1, textElements[n - 1].getText().length()); } - /** - * @see docking.widgets.fieldpanel.field.TextField#isClipped() - */ @Override public boolean isClipped() { return isClipped; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/FieldPanelCoordinator.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/FieldPanelCoordinator.java index 2b89379e63..1e2e02ea0d 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/FieldPanelCoordinator.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/FieldPanelCoordinator.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -80,9 +79,7 @@ public class FieldPanelCoordinator implements ViewListener { panels = newPanels; } - /** - * @see docking.widgets.fieldpanel.listener.ViewListener#viewChanged(docking.widgets.fieldpanel.FieldPanel, int, int) - */ + @Override public void viewChanged(FieldPanel fp, BigInteger index, int xPos, int yPos) { if (valuesChanging) return; valuesChanging = true; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/LineLockedFieldPanelCoordinator.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/LineLockedFieldPanelCoordinator.java index 16a5e930b6..d9d6717b37 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/LineLockedFieldPanelCoordinator.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/internal/LineLockedFieldPanelCoordinator.java @@ -113,9 +113,6 @@ public class LineLockedFieldPanelCoordinator extends FieldPanelCoordinator { super.remove(fp); } - /** - * @see docking.widgets.fieldpanel.listener.ViewListener#viewChanged(docking.widgets.fieldpanel.FieldPanel, int, int) - */ @Override public void viewChanged(FieldPanel fp, BigInteger index, int xPos, int yPos) { if (valuesChanging) diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/listener/ViewListener.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/listener/ViewListener.java index f83dc37303..1e23fe9466 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/listener/ViewListener.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/listener/ViewListener.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,8 +26,10 @@ public interface ViewListener { /** * Notifies the listener that the top of the screen has changed position. * @param fp the field panel whose view changed. - * @param index the index of the layout at the top of the screen - * @param offset the y coordinate of the layout displayed at the top of the + * @param index the index of the layout at the top of the screen. + * @param xOffset the x coordinate of the layout displayed at the left of the + * screen. + * @param yOffset the y coordinate of the layout displayed at the top of the * screen. */ public void viewChanged(FieldPanel fp, BigInteger index, int xOffset, int yOffset); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldRange.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldRange.java index cd2ee7bd43..af911ef861 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldRange.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldRange.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -82,9 +81,8 @@ public class FieldRange implements Comparable { /** * checks if the given location is contained in the range. - * @param row - * @param column - * @return + * @param loc the field location. + * @return true if the field range contains the specified location. */ public boolean contains(FieldLocation loc) { return (loc.compareTo(start) >= 0) && (loc.compareTo(end) < 0); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldSelection.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldSelection.java index a3443473c5..db1b5d6eba 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldSelection.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/FieldSelection.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,8 +58,8 @@ public class FieldSelection implements Iterable { /** * Returns true if the given Field at the given index is in the selection. - * @param index the index of the layout to check if in the selection - * @param field the index of the field in the layout to check if in the selection. + * @param loc the field location. + * @return true if the field selection contains the specified location. */ public boolean contains(FieldLocation loc) { return getRangeContaining(loc) != null; @@ -69,7 +68,7 @@ public class FieldSelection implements Iterable { /** * Returns the range if the given Field at the given index is in the selection. * Otherwise returns null. - * @param fieldLocation location to find the range for. + * @param loc location to find the range for. */ public FieldRange getRangeContaining(FieldLocation loc) { int insertIndex = Collections.binarySearch(ranges, new FieldRange(loc, FieldLocation.MAX)); @@ -140,10 +139,8 @@ public class FieldSelection implements Iterable { /** * Adds a field range to this selection. - * @param startIndex the layout index of the start field - * @param startField the index of the field in the start layout. - * @param endIndex the layout index of the end field. - * @param endField the index of the field in the end layout. + * @param start the starting field location. + * @param end the ending field location. */ public void addRange(FieldLocation start, FieldLocation end) { if (start.equals(end)) { @@ -204,10 +201,8 @@ public class FieldSelection implements Iterable { /** * Removes the given field range from the current selection. - * @param startIndex the layout index of the startField to remove from the selection - * @param startField the field index of first field to remove from the selection - * @param endIndex the layout index of the endField to remove from the selection. - * @param endField the field index of the last field to remove from the selection. + * @param start the starting field location. + * @param end the ending field location. */ public void removeRange(FieldLocation start, FieldLocation end) { FieldRange deleteRange = new FieldRange(start, end); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/HoverProvider.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/HoverProvider.java index fb785aa9a7..d8eaed33f9 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/HoverProvider.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/HoverProvider.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +39,6 @@ public interface HoverProvider { * @param field the field over which the mouse is hovering * @param fieldBounds the rectangle containing the bounds of the given field. * @param event the last mouse motion event over the field viewer component (i.e., FieldPanel). - * @return true if a popup window has been displayed adjacent to the mouse location. */ public void mouseHovered(FieldLocation fieldLocation, Field field, Rectangle fieldBounds, MouseEvent event); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/MultiRowLayout.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/MultiRowLayout.java index 04424019f0..67aff7150b 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/MultiRowLayout.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/MultiRowLayout.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,10 +73,6 @@ public class MultiRowLayout implements Layout { offsets[layouts.length] = soFar; } - /** - * - * @see docking.widgets.fieldpanel.Layout#getHeight() - */ @Override public int getHeight() { return heightAbove + heightBelow; @@ -96,19 +91,11 @@ public class MultiRowLayout implements Layout { return max; } - /** - * - * @see docking.widgets.fieldpanel.Layout#getNumFields() - */ @Override public int getNumFields() { return numFields; } - /** - * - * @see docking.widgets.fieldpanel.Layout#getField(int) - */ @Override public Field getField(int index) { for (int i = 0; i < layouts.length; i++) { @@ -119,9 +106,6 @@ public class MultiRowLayout implements Layout { return null; } - /** - * @see docking.widgets.fieldpanel.Layout#paint(java.awt.Graphics, docking.widgets.fieldpanel.internal.PaintContext, java.awt.Rectangle, ghidra.util.bean.field.LayoutSelection, ghidra.util.bean.field.LayoutSelection, int, int, int) - */ @Override public void paint(JComponent c, Graphics g, PaintContext context, Rectangle rect, LayoutBackgroundColorManager colorManager, FieldLocation cursorLocation) { @@ -151,10 +135,6 @@ public class MultiRowLayout implements Layout { rect.y += totalShift; } - /** - * - * @see docking.widgets.fieldpanel.Layout#setCursor(docking.widgets.fieldpanel.support.FieldLocation, int, int) - */ @Override public int setCursor(FieldLocation cursorLoc, int x, int y) { int offset = 0; @@ -169,10 +149,6 @@ public class MultiRowLayout implements Layout { return layouts[0].setCursor(cursorLoc, x, y); } - /** - * - * @see docking.widgets.fieldpanel.Layout#getCursorRect(int, int, int) - */ @Override public Rectangle getCursorRect(int fieldNum, int row, int col) { int offset = 0; @@ -189,10 +165,6 @@ public class MultiRowLayout implements Layout { return null; } - /** - * - * @see docking.widgets.fieldpanel.Layout#cursorUp(docking.widgets.fieldpanel.support.FieldLocation, int) - */ @Override public boolean cursorUp(FieldLocation cursorLoc, int lastX) { int row = findRow(cursorLoc); @@ -210,10 +182,6 @@ public class MultiRowLayout implements Layout { return result; } - /** - * - * @see docking.widgets.fieldpanel.Layout#cursorDown(docking.widgets.fieldpanel.support.FieldLocation, int) - */ @Override public boolean cursorDown(FieldLocation cursorLoc, int lastX) { int row = findRow(cursorLoc); @@ -232,10 +200,6 @@ public class MultiRowLayout implements Layout { return result; } - /** - * - * @see docking.widgets.fieldpanel.Layout#cursorBeginning(docking.widgets.fieldpanel.support.FieldLocation) - */ @Override public int cursorBeginning(FieldLocation cursorLoc) { int row = findRow(cursorLoc); @@ -245,10 +209,6 @@ public class MultiRowLayout implements Layout { return lastX; } - /** - * - * @see docking.widgets.fieldpanel.Layout#cursorEnd(docking.widgets.fieldpanel.support.FieldLocation) - */ @Override public int cursorEnd(FieldLocation cursorLoc) { int row = findRow(cursorLoc); @@ -258,10 +218,6 @@ public class MultiRowLayout implements Layout { return lastX; } - /** - * - * @see docking.widgets.fieldpanel.Layout#cursorLeft(docking.widgets.fieldpanel.support.FieldLocation) - */ @Override public int cursorLeft(FieldLocation cursorLoc) { int row = findRow(cursorLoc); @@ -279,10 +235,6 @@ public class MultiRowLayout implements Layout { return returnVal; } - /** - * - * @see docking.widgets.fieldpanel.Layout#cursorRight(docking.widgets.fieldpanel.support.FieldLocation) - */ @Override public int cursorRight(FieldLocation cursorLoc) { int row = findRow(cursorLoc); @@ -300,10 +252,6 @@ public class MultiRowLayout implements Layout { return returnVal; } - /** - * - * @see docking.widgets.fieldpanel.Layout#enterLayout(docking.widgets.fieldpanel.support.FieldLocation, int, boolean) - */ @Override public boolean enterLayout(FieldLocation cursorLoc, int lastX, boolean fromTop) { if (fromTop) { @@ -315,10 +263,6 @@ public class MultiRowLayout implements Layout { return result; } - /** - * - * @see docking.widgets.fieldpanel.Layout#getScrollableUnitIncrement(int, int) - */ @Override public int getScrollableUnitIncrement(int topOfScreen, int direction) { int searchPoint = topOfScreen; @@ -337,10 +281,6 @@ public class MultiRowLayout implements Layout { direction); } - /** - * - * @see docking.widgets.fieldpanel.Layout#contains(int) - */ @Override public boolean contains(int yPos) { if ((yPos >= 0) && (yPos < heightAbove + heightBelow)) { @@ -420,9 +360,6 @@ public class MultiRowLayout implements Layout { } } - /** - * @see docking.widgets.fieldpanel.Layout#getPrimaryOffset() - */ @Override public int getPrimaryOffset() { if (primaryOffset == -1) { @@ -442,9 +379,6 @@ public class MultiRowLayout implements Layout { primaryOffset = 0; } - /** - * @see docking.widgets.fieldpanel.Layout#getFieldBounds(int) - */ @Override public Rectangle getFieldBounds(int index) { int offset = 0; @@ -460,18 +394,12 @@ public class MultiRowLayout implements Layout { } - /** - * @see docking.widgets.fieldpanel.Layout#insertSpaceAbove(int) - */ @Override public void insertSpaceAbove(int size) { layouts[0].insertSpaceAbove(size); heightAbove += size; } - /** - * @see docking.widgets.fieldpanel.Layout#insertSpaceBelow(int) - */ @Override public void insertSpaceBelow(int size) { layouts[layouts.length - 1].insertSpaceBelow(size); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/RowLayout.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/RowLayout.java index 75927209ea..df9c58dbd9 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/RowLayout.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/RowLayout.java @@ -61,10 +61,6 @@ public class RowLayout implements Layout { } } - /** - * - * @see docking.widgets.fieldpanel.Layout#getHeight() - */ @Override public int getHeight() { return heightAbove + heightBelow; @@ -116,43 +112,26 @@ public class RowLayout implements Layout { return rowID; } - /** - * @see docking.widgets.fieldpanel.Layout#insertSpaceAbove(int) - */ @Override public void insertSpaceAbove(int size) { heightAbove += size; } - /** - * @see docking.widgets.fieldpanel.Layout#insertSpaceBelow(int) - */ @Override public void insertSpaceBelow(int size) { heightBelow += size; } - /** - * - * @see docking.widgets.fieldpanel.Layout#getNumFields() - */ @Override public int getNumFields() { return fields.length; } - /** - * - * @see docking.widgets.fieldpanel.Layout#getField(int) - */ @Override public Field getField(int index) { return fields[index]; } - /** - * @see docking.widgets.fieldpanel.Layout#paint(java.awt.Graphics, docking.widgets.fieldpanel.internal.PaintContext, java.awt.Rectangle, docking.widgets.fieldpanel.support.field.LayoutSelection, docking.widgets.fieldpanel.support.field.LayoutSelection, int, int, int) - */ @Override public void paint(JComponent c, Graphics g, PaintContext context, Rectangle rect, LayoutBackgroundColorManager colorManager, FieldLocation cursorLocation) { @@ -209,10 +188,6 @@ public class RowLayout implements Layout { } } - /** - * - * @see docking.widgets.fieldpanel.Layout#setCursor(docking.widgets.fieldpanel.support.FieldLocation, int, int) - */ @Override public int setCursor(FieldLocation cursorLoc, int x, int y) { @@ -229,10 +204,6 @@ public class RowLayout implements Layout { return field.getX(cursorLoc.row, cursorLoc.col); } - /** - * - * @see docking.widgets.fieldpanel.Layout#getCursorRect(int, int, int) - */ @Override public Rectangle getCursorRect(int fieldNum, int row, int col) { if (fieldNum >= fields.length) { // somehow we got a call where this happened @@ -247,10 +218,6 @@ public class RowLayout implements Layout { return null; } - /** - * - * @see docking.widgets.fieldpanel.Layout#cursorUp(docking.widgets.fieldpanel.support.FieldLocation, int) - */ @Override public boolean cursorUp(FieldLocation cursorLoc, int lastX) { if (cursorLoc.row > 0) { @@ -261,10 +228,6 @@ public class RowLayout implements Layout { return false; } - /** - * - * @see docking.widgets.fieldpanel.Layout#cursorDown(docking.widgets.fieldpanel.support.FieldLocation, int) - */ @Override public boolean cursorDown(FieldLocation cursorLoc, int lastX) { if (cursorLoc.row < fields[cursorLoc.fieldNum].getNumRows() - 1) { @@ -275,10 +238,6 @@ public class RowLayout implements Layout { return false; } - /** - * - * @see docking.widgets.fieldpanel.Layout#cursorBeginning(docking.widgets.fieldpanel.support.FieldLocation) - */ @Override public int cursorBeginning(FieldLocation cursorLoc) { @@ -290,10 +249,6 @@ public class RowLayout implements Layout { return field.getX(cursorLoc.row, cursorLoc.col); } - /** - * - * @see docking.widgets.fieldpanel.Layout#cursorEnd(docking.widgets.fieldpanel.support.FieldLocation) - */ @Override public int cursorEnd(FieldLocation cursorLoc) { Field field = fields[fields.length - 1]; @@ -304,10 +259,6 @@ public class RowLayout implements Layout { return field.getX(cursorLoc.row, cursorLoc.col); } - /** - * - * @see docking.widgets.fieldpanel.Layout#cursorLeft(docking.widgets.fieldpanel.support.FieldLocation) - */ @Override public int cursorLeft(FieldLocation cursorLoc) { if (cursorLoc.col > 0) { @@ -334,10 +285,6 @@ public class RowLayout implements Layout { return fields[cursorLoc.fieldNum].getX(cursorLoc.row, cursorLoc.col); } - /** - * - * @see docking.widgets.fieldpanel.Layout#cursorRight(docking.widgets.fieldpanel.support.FieldLocation) - */ @Override public int cursorRight(FieldLocation cursorLoc) { if (cursorLoc.col < fields[cursorLoc.fieldNum].getNumCols(cursorLoc.row) - 1) { @@ -362,10 +309,6 @@ public class RowLayout implements Layout { return fields[cursorLoc.fieldNum].getX(cursorLoc.row, cursorLoc.col); } - /** - * - * @see docking.widgets.fieldpanel.Layout#enterLayout(docking.widgets.fieldpanel.support.FieldLocation, int, boolean) - */ @Override public boolean enterLayout(FieldLocation cursorLoc, int lastX, boolean fromTop) { // locate the field that the cursor will enter @@ -387,10 +330,6 @@ public class RowLayout implements Layout { } - /** - * - * @see docking.widgets.fieldpanel.Layout#getScrollableUnitIncrement(int, int) - */ @Override public int getScrollableUnitIncrement(int topOfScreen, int direction) { int max = 0; @@ -420,10 +359,6 @@ public class RowLayout implements Layout { return max; } - /** - * - * @see docking.widgets.fieldpanel.Layout#contains(int) - */ @Override public boolean contains(int yPos) { if ((yPos >= 0) && (yPos < heightAbove + heightBelow)) { @@ -487,9 +422,7 @@ public class RowLayout implements Layout { // int width = end-start; // g.fillRect(start,0,width,heightAbove+heightBelow); // } - /** - * @see docking.widgets.fieldpanel.Layout#getPrimaryOffset() - */ + @Override public int getPrimaryOffset() { return 0; @@ -499,9 +432,6 @@ public class RowLayout implements Layout { return isPrimary; } - /** - * @see docking.widgets.fieldpanel.Layout#getFieldBounds(int) - */ @Override public Rectangle getFieldBounds(int index) { Field f = fields[index]; @@ -511,9 +441,6 @@ public class RowLayout implements Layout { return rect; } - /** - * @see docking.widgets.fieldpanel.Layout#getIndexSize() - */ @Override public int getIndexSize() { return 1; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/ViewerPosition.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/ViewerPosition.java index fd54531d65..e067d1fe94 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/ViewerPosition.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/support/ViewerPosition.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +36,7 @@ public class ViewerPosition implements Serializable { * @param xOffset The horizontal scroll position (NOT CURRENTLY USED) * @param yOffset the vertical position of the layout at the top of the screen. * If the the layout is totally visible, then the yOffset will be 0. Otherwise, - * it will be < 0 indicating that it begins above the top of the screen. + * it will be < 0 indicating that it begins above the top of the screen. */ public ViewerPosition(BigInteger index, int xOffset, int yOffset) { this.index = index; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GDHtmlLabel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GDHtmlLabel.java index 2b2fed254f..d70b0b80c0 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GDHtmlLabel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GDHtmlLabel.java @@ -25,7 +25,7 @@ import docking.widgets.checkbox.GHtmlCheckBox; * A 'dynamic' label (the text can be changed), with HTML rendering allowed. *

      * See also: - *

      ClassHTML renderingDescription
      {@link GCheckBox}NOHTML disabled JCheckBox
      {@link GHtmlCheckBox}YESHTML allowed JCheckBox
      + *
      * * * diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GDLabel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GDLabel.java index 240ef04605..ec12e5e983 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GDLabel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GDLabel.java @@ -25,7 +25,7 @@ import docking.widgets.checkbox.GHtmlCheckBox; * A 'dynamic' label (the text can be changed), with HTML rendering disabled. *

      * See also: - *

      ClassMutable textHTML renderingDescription
      {@link GLabel}ImmutableNONon-html unchangeable label
      {@link GDLabel}MutableNONon-html changeable label
      + *
      * * * diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GHtmlLabel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GHtmlLabel.java index 6270f9f7c4..67499480d0 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GHtmlLabel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GHtmlLabel.java @@ -29,7 +29,7 @@ import utilities.util.reflection.ReflectionUtilities; * An immutable label (the text can NOT be changed), with HTML rendering allowed. *

      * See also: - *

      ClassMutable textHTML renderingDescription
      {@link GLabel}ImmutableNONon-html unchangeable label
      {@link GDLabel}MutableNONon-html changeable label
      + *
      * * * diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GIconLabel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GIconLabel.java index b9ca14f595..be56868950 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GIconLabel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GIconLabel.java @@ -29,7 +29,7 @@ import utilities.util.reflection.ReflectionUtilities; * A label that only contains an image and no text. *

      * See also: - *

      ClassMutable textHTML renderingDescription
      {@link GLabel}ImmutableNONon-html unchangeable label
      {@link GDLabel}MutableNONon-html changeable label
      + *
      * * * diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GLabel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GLabel.java index fe9d9666e3..fa4f702cfd 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GLabel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/label/GLabel.java @@ -29,7 +29,7 @@ import utilities.util.reflection.ReflectionUtilities; * An immutable label (the text can NOT be changed), with HTML rendering disabled. *

      * See also: - *

      ClassMutable textHTML renderingDescription
      {@link GLabel}ImmutableNONon-html unchangeable label
      {@link GDLabel}MutableNONon-html changeable label
      + *
      * * * diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/pathmanager/PathManager.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/pathmanager/PathManager.java index 556aa1b86c..ac323129e3 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/pathmanager/PathManager.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/pathmanager/PathManager.java @@ -110,7 +110,7 @@ public class PathManager { * Add a new file path and set its enablement * @param file * @param enabled - * @returns true if the enabled path did not already exist + * @return true if the enabled path did not already exist */ public boolean addPath(ResourceFile file, boolean enabled) { ResourceFile dir = file.isDirectory() ? file : file.getParentFile(); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/DefaultTableCellRendererWrapper.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/DefaultTableCellRendererWrapper.java index 7aaaa81bd9..a298d08051 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/DefaultTableCellRendererWrapper.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/DefaultTableCellRendererWrapper.java @@ -37,7 +37,7 @@ public class DefaultTableCellRendererWrapper extends GTableCellRenderer { /** * Enables and disables the rendering of HTML content in this renderer. If enabled, this * renderer will interpret HTML content when the text this renderer is showing begins with - * <html> + * {@code } * * @param enable true to enable HTML rendering; false to disable it */ diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/FilterTypeConverter.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/FilterTypeConverter.java index a4f6e78e9a..760d196b2d 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/FilterTypeConverter.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/FilterTypeConverter.java @@ -22,9 +22,6 @@ import ghidra.docking.settings.Settings; * and convert it to the specified type. This class is meant to be used when the dynamic * filtering mechanism is not correctly filtering a column, usually because the default filter * for the column type does not match what the renderer is displaying in the table. - * - *

      Columns create one of these classes to be returned from - * {@link DynamicTableColumn#getFilterConverter()}. * * @param the column type * @param the new type to be used during filter operations diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GDynamicColumnTableModel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GDynamicColumnTableModel.java index 589d190182..61e74f1ba4 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GDynamicColumnTableModel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GDynamicColumnTableModel.java @@ -241,7 +241,7 @@ public abstract class GDynamicColumnTableModel * implementations to add custom column objects, rather than relying on generic, discovered * DynamicTableColumn implementations. * - *

      Note: this method assumes that the columns have already been sorted + *

      Note: this method assumes that the columns have already been sorted * @param column The field to add */ protected void addTableColumn(DynamicTableColumn column) { @@ -269,7 +269,7 @@ public abstract class GDynamicColumnTableModel * This method is intended for implementations to add custom column objects, rather than * relying on generic, discovered DynamicTableColumn implementations. *

      - * Note: this method assumes that the columns have already been sorted. + * Note: this method assumes that the columns have already been sorted. * @param column The field to add. * @param index The index at which to add the field. If the index value is invalid (negative * or greater than the number of columns), then the column will be added to the diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/MappedColumnConstraint.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/MappedColumnConstraint.java index f748a4672d..5a55333eb7 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/MappedColumnConstraint.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/MappedColumnConstraint.java @@ -22,7 +22,7 @@ import ghidra.util.SystemUtilities; /** * Class that maps one type of column constraint into another. Typically, these are created * automatically based on {@link ColumnTypeMapper} that are discovered by the system. For example, - * if you have a column type of "Foo", and you create a ColumnTypeMapper, then all the + *{@literal if you have a column type of "Foo", and you create a ColumnTypeMapper, then all the} * string constraints would now be available that column. * * @param The column type. @@ -94,7 +94,7 @@ public class MappedColumnConstraint implements ColumnConstraint { /** * Returns the delegate constraint (current value for this mapped constraint) - * @return the delegate constraint. + * @return the delegate constraint. */ public ColumnConstraint getDelegate() { return delegate; @@ -129,8 +129,8 @@ public class MappedColumnConstraint implements ColumnConstraint { } /** - * Class for converting a ColumnDataSource to a ColumnDataSource to be used when - * getting the editor for the delegate ColumnConstraint. + * {@literal Class for converting a ColumnDataSource to a ColumnDataSource to be used when} + * getting the editor for the delegate{@literal ColumnConstraint.} */ protected class DelegateColumnData implements ColumnData { @@ -138,7 +138,7 @@ public class MappedColumnConstraint implements ColumnConstraint { /** * Constructor - * @param columnDataSource the ColumnDataSource whose T data will be converted to + * @param columnDataSource the{@literal ColumnDataSource} whose T data will be converted to * W data for the delegate editor. */ public DelegateColumnData(ColumnData columnDataSource) { diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/StringEndsWithColumnConstraint.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/StringEndsWithColumnConstraint.java index 202b3eb567..a2216f96fe 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/StringEndsWithColumnConstraint.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constraint/StringEndsWithColumnConstraint.java @@ -26,7 +26,7 @@ public class StringEndsWithColumnConstraint extends StringColumnConstraint { /** * Constructor - * @param spec the string to use to create an "ends with" pattern. + * @param patternString the string to use to create an "ends with" pattern. */ public StringEndsWithColumnConstraint(String patternString) { super(patternString); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constrainteditor/AutocompletingStringConstraintEditor.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constrainteditor/AutocompletingStringConstraintEditor.java index 71d62c63ed..ae37ed1350 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constrainteditor/AutocompletingStringConstraintEditor.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constrainteditor/AutocompletingStringConstraintEditor.java @@ -34,7 +34,7 @@ import ghidra.util.HTMLUtilities; /** * An editor that provides suggestions of values that, according to - * {@linkplain StringMatchStrategy}, match a user-supplied + * {@linkplain StringColumnConstraint}, match a user-supplied * pattern. */ public class AutocompletingStringConstraintEditor extends DataLoadingConstraintEditor { diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constrainteditor/EnumConstraintEditor.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constrainteditor/EnumConstraintEditor.java index a6402af288..34e5e83257 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constrainteditor/EnumConstraintEditor.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constrainteditor/EnumConstraintEditor.java @@ -96,7 +96,7 @@ public class EnumConstraintEditor> extends AbstractColumnConst * getName(), getDisplayName(), or getDisplayString() * before falling back to toString(). * - * @returns a more user-friendly name for the value + * @return a more user-friendly name for the value */ public String getElementDisplayName(T value) { String displayName = getDisplayNameUsingMethodNamed("getName", value); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/threaded/TableUpdateJob.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/threaded/TableUpdateJob.java index ab581f01de..90730e7de7 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/threaded/TableUpdateJob.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/threaded/TableUpdateJob.java @@ -401,7 +401,7 @@ public class TableUpdateJob { /** * Gets any existing data that matches the current filter, if any. - * @returns data that should be the start point for the next filter state; null if there + * @return data that should be the start point for the next filter state; null if there * is no filter set or if the current data's filter does not match the pending filter */ private TableData getReusableFilteredData() { diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/threaded/ThreadedTableModelStub.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/threaded/ThreadedTableModelStub.java index 5b95ac7a4a..e97f39895e 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/threaded/ThreadedTableModelStub.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/threaded/ThreadedTableModelStub.java @@ -20,8 +20,7 @@ import ghidra.framework.plugintool.ServiceProviderStub; import ghidra.util.task.TaskMonitor; /** - * A version of {@link ThreadedTableModel} for clients that do not need a - * {@link ThreadedTableModel#DATA_SOURCE}. + * A version of {@link ThreadedTableModel} for clients that do not need a DATA_SOURCE. *

      * * Note: this class will change a null value for the {@link ServiceProvider} parameter diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/textfield/TextFieldLinker.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/textfield/TextFieldLinker.java index 325ad3a32d..2e351ecfa3 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/textfield/TextFieldLinker.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/textfield/TextFieldLinker.java @@ -36,7 +36,7 @@ import org.apache.commons.lang3.StringUtils; * * This fulfills a similar purpose to formatted text fields, except the individual parts may be * placed independent of the other components. Granted, they ought to appear in an intuitive order. - * The input string is split among a collection of {@link JTextFields} each according to a given + * The input string is split among a collection of {@link JTextField}s each according to a given * pattern -- excluding the final field. Cursor navigation, insertion, deletion, etc. are all * applied as if the linked text fields were part of a single composite text field. * @@ -492,7 +492,7 @@ public class TextFieldLinker { * {@link #linkLastField(JTextField)}. Thus, before linking is actually activated, at least one * field must be present. To be meaningful, at least two fields should be linked. * - * @note {@code exp} must match {@code sep}. + * NOTE: {@code exp} must match {@code sep}. * * @param field the field to link * @param exp the separator following the field diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTreeNode.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTreeNode.java index 86889f0e37..cf98ee930c 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTreeNode.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTreeNode.java @@ -54,7 +54,7 @@ import util.CollectionUtils; * i.e., new nodes are created), then, by default, the expanded and selected state * feature will be unable to find the correct nodes, since the default equals() * method on GTreeNode performs a comparison based upon instances. To fix this problem, - * the {@link #equals()} method has been implemented such that nodes are considered equal if they have + * the {@link #equals(Object)} method has been implemented such that nodes are considered equal if they have * the same name. The {@link #hashCode()} method will return the hash of the name. The name * attribute was chosen because it should be the most unique and descriptive piece of information * available in a generic GTreeNode. diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTreeTask.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTreeTask.java index 47131a9b59..3935a7dfba 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTreeTask.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTreeTask.java @@ -53,7 +53,6 @@ public abstract class GTreeTask extends PriorityJob { * values on later calls to getSelectedPaths(). So, to handle that 'feature' of the JTree, we * need to translate the given path to the equivalent path in the current tree (this code may * not be needed in all uses of this task, but it protects us from the aforementioned case). - * @throws CancelledException */ protected TreePath translatePath(TreePath path, TaskMonitor monitor) { diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/internal/GTreeModel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/internal/GTreeModel.java index a147e89f77..c4442df246 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/internal/GTreeModel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/internal/GTreeModel.java @@ -39,8 +39,6 @@ public class GTreeModel implements TreeModel { * Constructs a GTreeModel with the given root node. * * @param root The root of the tree. - * @param isThreaded True signals to perform all tree tasks in a threaded environment to - * avoid hanging the swing thread. */ public GTreeModel(GTreeNode root) { this.root = root; diff --git a/Ghidra/Framework/Docking/src/main/java/docking/wizard/MagePanel.java b/Ghidra/Framework/Docking/src/main/java/docking/wizard/MagePanel.java index a1a7fcc2d2..fed36998b2 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/wizard/MagePanel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/wizard/MagePanel.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,9 +24,6 @@ public interface MagePanel extends WizardPanel { * whether you must, can, or should not be displayed. * @param state the state object * @return displayability - * @throws IllegalPanelStateException indicates that something bad has happened and we should - * return to the very first panel - unless we are the first panel in which case we - * should abort the wizard. */ public WizardPanelDisplayability getPanelDisplayabilityAndUpdateState(WizardState state); diff --git a/Ghidra/Framework/Docking/src/main/java/docking/wizard/WizardManager.java b/Ghidra/Framework/Docking/src/main/java/docking/wizard/WizardManager.java index 459ef295ff..fc2d67dbaa 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/wizard/WizardManager.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/wizard/WizardManager.java @@ -155,7 +155,6 @@ public class WizardManager extends DialogComponentProvider implements WizardPane /** * Notification that the wizard process is complete. * @param success status of the process - * @param msg message to display in the dialog's status area */ public void completed(boolean success) { diff --git a/Ghidra/Framework/Docking/src/main/java/docking/wizard/WizardStateDependencyValidator.java b/Ghidra/Framework/Docking/src/main/java/docking/wizard/WizardStateDependencyValidator.java index c65dc1b515..69d3d3ccc9 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/wizard/WizardStateDependencyValidator.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/wizard/WizardStateDependencyValidator.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +30,7 @@ public class WizardStateDependencyValidator { * the dependent is registered such that a call to {@link #findAffectedDependants(WizardState)} * will include that property key only if its cached value is null. (i.e. the first time it * is called.) - * @param dependant the property key that depends on a previous property being set. + * @param dependent the property key that depends on a previous property being set. * @param predecessor the property key of the property that affects the dependent property. */ public void addDependency(T dependent, T predecessor) { diff --git a/Ghidra/Framework/Docking/src/main/java/ghidra/docking/settings/IntegerSignednessFormattingModeSettingsDefinition.java b/Ghidra/Framework/Docking/src/main/java/ghidra/docking/settings/IntegerSignednessFormattingModeSettingsDefinition.java index bfc25f9a5e..92d945712a 100644 --- a/Ghidra/Framework/Docking/src/main/java/ghidra/docking/settings/IntegerSignednessFormattingModeSettingsDefinition.java +++ b/Ghidra/Framework/Docking/src/main/java/ghidra/docking/settings/IntegerSignednessFormattingModeSettingsDefinition.java @@ -19,9 +19,7 @@ import ghidra.util.SignednessFormatMode; /** * The settings definition for the numeric display format for handling signed values. - * - * - * + *
      */ public class IntegerSignednessFormattingModeSettingsDefinition implements EnumSettingsDefinition { diff --git a/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/CachingSwingWorker.java b/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/CachingSwingWorker.java index a46dc712a6..178c2f0116 100644 --- a/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/CachingSwingWorker.java +++ b/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/CachingSwingWorker.java @@ -102,7 +102,7 @@ public abstract class CachingSwingWorker implements CachingLoader { * * @param monitor the monitor (may be null) * @return the object that this class is managing/caching - * @see #get() + * @see #getCachedValue() */ @Override public T get(TaskMonitor monitor) { diff --git a/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/RunManager.java b/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/RunManager.java index 76c91f00eb..af96c01372 100644 --- a/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/RunManager.java +++ b/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/RunManager.java @@ -45,9 +45,9 @@ import ghidra.util.worker.Worker; * If the given runnable has Swing work to perform after the main Runnable.run() method completes * (e.g., updating Swing components), * the runnable should implement the {@link SwingRunnable} interface and perform this work in - * {@link SwingRunnable#swingRun()}. + * {@link SwingRunnable#swingRun(boolean)}. *

      - * The progress monitor component, retrieved via {@link #getTaskMonitorComponent()}, can be placed + * The progress monitor component, retrieved via {@link #getMonitorComponent()}, can be placed * into a Swing widget. This RunManager will show and hide this progress component as necessary * when runnables are being run. * @@ -220,7 +220,7 @@ public class RunManager { /** * Schedules this runnable to be run after all runnables currently queued. *

      - * This method differs from the {@link #runNow(Runnable, String, int)} methods in that it will + * This method differs from the {@link #runNow(MonitoredRunnable, String, int)} methods in that it will * not cancel any currently running jobs. This allows you to add new jobs to this run * manager, which lets them queue up. See header docs for details. * diff --git a/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/TaskBuilder.java b/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/TaskBuilder.java index 01f9c548c3..cb9fdca552 100644 --- a/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/TaskBuilder.java +++ b/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/TaskBuilder.java @@ -33,7 +33,7 @@ import util.CollectionUtils; * the {@link Task} interface, which means less boiler-plate code. * *

      An example of usage: - *

      + * 
      {@literal
        * 		MonitoredRunnable r = 
        *			monitor -> doWork(parameter, monitor);
        *		new TaskBuilder("Task Title", r)
      @@ -41,18 +41,18 @@ import util.CollectionUtils;
        *			.setCanCancel(true)
        *			.setStatusTextAlignment(SwingConstants.LEADING)
        *			.launchModal();		
      - * 
      + * }
      * * Or, * - *
      + * 
      {@literal
        *	    TaskBuilder.withRunnable(monitor -> doWork(parameter, monitor))
        *			.setTitle("Task Title")
        *			.setHasProgress(true)
        *			.setCanCancel(true)
        *			.setStatusTextAlignment(SwingConstants.LEADING)
        *			.launchModal();		
      - * 
      + * }
      * * Or, * diff --git a/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/TaskLauncher.java b/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/TaskLauncher.java index 0c8b110a8a..2f767830c6 100644 --- a/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/TaskLauncher.java +++ b/Ghidra/Framework/Docking/src/main/java/ghidra/util/task/TaskLauncher.java @@ -69,7 +69,7 @@ public class TaskLauncher { * * TaskLauncher.launchNonModal( "My task",
      *   null, // parent
      - *   monitor -> { while ( !monitor.isCanceled() ) { longRunningWork(); } }
      + *   monitor -> { while ( !monitor.isCanceled() ) { longRunningWork(); } }
      * ); *
      * @@ -99,7 +99,7 @@ public class TaskLauncher { * * TaskLauncher.launchModal( "My task",
      *   null, // parent
      - *   monitor -> { while ( !monitor.isCanceled() ) { longRunningWork(); } }
      + *   monitor -> { while ( !monitor.isCanceled() ) { longRunningWork(); } }
      * ); *
      * @@ -132,7 +132,7 @@ public class TaskLauncher { * *

      * TaskLauncher.launchModal( "My task",
      - *   monitor -> { { foo(); }
      + *   monitor -> { { foo(); }
      * ); *
      * diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ClientAuthenticator.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ClientAuthenticator.java index a478d37957..eb215593d9 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ClientAuthenticator.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ClientAuthenticator.java @@ -38,14 +38,14 @@ public interface ClientAuthenticator extends KeyStorePasswordProvider { * @param serverType type of server (label associated with serverName) * @param serverName name of server * @param nameCb provides storage for user login name. A null indicates - * that the default user name will be used, @see ClientUtil#getUserName(). + * that the default user name will be used, @see ClientUtil#getUserName() * @param passCb provides storage for user password, @see PasswordCallback#setPassword(char[]) * @param choiceCb specifies choice between NT Domain authentication (index=0) and local password * file authentication (index=1). Set selected index to specify authenticator to be used, * @param anonymousCb may be used to request anonymous read-only access to * the server. A null is specified if anonymous access has not been enabed on the server. * @param loginError previous login error message or null for first attempt - * @see ChoiceCallback#setSelectedIndex(int). + * @see ChoiceCallback#setSelectedIndex(int) * A null is specified if no choice is available (password authenticator determined by server configuration). * @see AnonymousCallback#setAnonymousAccessRequested(boolean) * @return diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ClientUtil.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ClientUtil.java index 3896db1727..3b4d1dbe2d 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ClientUtil.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/ClientUtil.java @@ -84,8 +84,6 @@ public class ClientUtil { * @param host server name or address * @param port server port, 0 indicates that default port should be used. * @return repository server adapter - * @throws LoginException thrown if server fails to authenticate user or - * general access is denied. */ public static RepositoryServerAdapter getRepositoryServer(String host, int port) { return getRepositoryServer(host, port, false); @@ -100,8 +98,6 @@ public class ClientUtil { * @param forceConnect if true and the server adapter is disconnected, an * attempt will be made to reconnect. * @return repository server handle - * @throws LoginException thrown if server fails to authenticate user or - * general access is denied. */ public static RepositoryServerAdapter getRepositoryServer(String host, int port, boolean forceConnect) { diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/RepositoryAdapter.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/RepositoryAdapter.java index 77d5df9f24..ef42c7f013 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/RepositoryAdapter.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/RepositoryAdapter.java @@ -158,7 +158,6 @@ public class RepositoryAdapter implements RemoteAdapterListener { /** * Attempt to connect to the server. - * @return true if connected */ public void connect() throws IOException { synchronized (serverAdapter) { @@ -326,7 +325,7 @@ public class RepositoryAdapter implements RemoteAdapterListener { * @throws IOException * @throws UserAccessException user no longer has any permission to use repository. * @throws NotConnectedException if server/repository connection is down (user already informed) - * @see ghidra.framework.remote.RemoteRepositoryHandle#getUserList() + * @see RemoteRepositoryHandle#getUserList() */ public User[] getUserList() throws IOException { synchronized (serverAdapter) { @@ -348,7 +347,7 @@ public class RepositoryAdapter implements RemoteAdapterListener { * @throws IOException * @throws UserAccessException user no longer has any permission to use repository. * @throws NotConnectedException if server/repository connection is down (user already informed) - * @see ghidra.framework.remote.RemoteRepositoryHandle#getServerUserList() + * @see RemoteRepositoryHandle#getServerUserList() */ public String[] getServerUserList() throws IOException { synchronized (serverAdapter) { @@ -373,7 +372,7 @@ public class RepositoryAdapter implements RemoteAdapterListener { * @throws UserAccessException * @throws IOException * @throws NotConnectedException if server/repository connection is down (user already informed) - * @see ghidra.framework.remote.RemoteRepositoryHandle#setUserList(ghidra.framework.remote.User[]) + * @see RemoteRepositoryHandle#setUserList(User[], boolean) */ public void setUserList(User[] users, boolean anonymousAccessAllowed) throws IOException { synchronized (serverAdapter) { @@ -391,8 +390,8 @@ public class RepositoryAdapter implements RemoteAdapterListener { } } - /* - * @see ghidra.framework.remote.RepositoryHandle#createDatabase(java.lang.String, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String) + /** + * @see RepositoryHandle#createDatabase(String, String, String, int, String, String) */ public ManagedBufferFileAdapter createDatabase(String parentPath, String itemName, int bufferSize, String contentType, String fileID, String projectPath) diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/RepositoryServerAdapter.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/RepositoryServerAdapter.java index c22084a17e..4d87877078 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/RepositoryServerAdapter.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/RepositoryServerAdapter.java @@ -299,7 +299,7 @@ public class RepositoryServerAdapter { * @throws UserAccessException * @throws IOException * @throws NotConnectedException if server connection is down (user already informed) - * @see ghidra.framework.remote.RemoteRepositoryServerHandle#createRepository(java.lang.String, long) + * @see ghidra.framework.remote.RemoteRepositoryServerHandle#createRepository(String) */ public synchronized RepositoryAdapter createRepository(String name) throws DuplicateNameException, UserAccessException, IOException, NotConnectedException { @@ -398,7 +398,7 @@ public class RepositoryServerAdapter { } /** - * @returns true if server allows anonymous access. + * @return true if server allows anonymous access. * Individual repositories must grant anonymous access separately. * @throws IOException * @throws NotConnectedException if server connection is down (user already informed) @@ -418,7 +418,7 @@ public class RepositoryServerAdapter { } /** - * @returns true if user has restricted read-only access to server (e.g., anonymous user) + * @return true if user has restricted read-only access to server (e.g., anonymous user) * @throws IOException * @throws NotConnectedException if server connection is down (user already informed) * @see ghidra.framework.remote.RemoteRepositoryServerHandle#isReadOnly() @@ -469,7 +469,7 @@ public class RepositoryServerAdapter { * @throws IOException if user data can't be written to file * @throws NotConnectedException if server connection is down (user already informed) * @see ghidra.framework.remote.RemoteRepositoryServerHandle#setPassword(char[]) - * @see HashUtilities#getSaltedHash("SHA-256", char[]) + * @see ghidra.util.HashUtilities#getSaltedHash(String, char[]) HashUtilities.getSaltedHash("SHA-256", char[]) */ public synchronized boolean setPassword(char[] saltedSHA256PasswordHash) throws IOException, NotConnectedException { @@ -487,8 +487,6 @@ public class RepositoryServerAdapter { /** * Returns true if this server allows the user to change their password. - * @throws IOException - * @throws NotConnectedException if server connection is down (user already informed) * @see ghidra.framework.remote.RemoteRepositoryServerHandle#canSetPassword() */ public synchronized boolean canSetPassword() { diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/AnonymousCallback.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/AnonymousCallback.java index da9b783b71..b44b29e02e 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/AnonymousCallback.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/AnonymousCallback.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +34,7 @@ public class AnonymousCallback implements Callback, Serializable { } /** - * @returns true if anonymous access requested + * @return true if anonymous access requested */ public boolean anonymousAccessRequested() { return anonymousAccessRequested; diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/RepositoryHandle.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/RepositoryHandle.java index ab7b7b7985..9887a05519 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/RepositoryHandle.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/RepositoryHandle.java @@ -219,7 +219,7 @@ public interface RepositoryHandle { * Perform a checkout on the specified item. * @param parentPath parent folder path * @param itemName name of item - * @param CheckoutType checkout type. If exclusive or transient, checkout is only successful + * @param checkoutType checkout type. If exclusive or transient, checkout is only successful * if no other checkouts exist. No new checkouts of item will be permitted while an * exclusive/transient checkout is active. * @param projectPath path of user's project diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/RepositoryItem.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/RepositoryItem.java index c6828d0cbe..6b02a52d2b 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/RepositoryItem.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/RepositoryItem.java @@ -52,7 +52,6 @@ public class RepositoryItem implements java.io.Serializable { * @param contentType content type associated with item * @param version repository item version or -1 if versioning not supported * @param versionTime version creation time - * @param checkoutList list of checkouts for the associated repository item. */ public RepositoryItem(String folderPath, String itemName, String fileID, int itemType, String contentType, int version, long versionTime) { diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/RepositoryServerHandle.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/RepositoryServerHandle.java index 287f50cf14..abbd8fb831 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/RepositoryServerHandle.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/RepositoryServerHandle.java @@ -26,14 +26,14 @@ import ghidra.util.exception.UserAccessException; public interface RepositoryServerHandle { /** - * @returns true if server allows anonymous access. + * @return true if server allows anonymous access. * Individual repositories must grant anonymous access separately. * @throws IOException if an IO error occurs */ boolean anonymousAccessAllowed() throws IOException; /** - * @returns true if user has restricted read-only access to server (e.g., anonymous user) + * @return true if user has restricted read-only access to server (e.g., anonymous user) * @throws IOException if an IO error occurs */ boolean isReadOnly() throws IOException; @@ -102,9 +102,9 @@ public interface RepositoryServerHandle { /** * Set the password for the user. * @param saltedSHA256PasswordHash SHA256 salted password hash - * @returns true if password changed + * @return true if password changed * @throws IOException if an IO error occurs - * @see HashUtilities#getSaltedHash("SHA-256", char[]) + * @see ghidra.util.HashUtilities#getSaltedHash(String, char[]) HashUtilities.getSaltedHash("SHA-256", char[]) */ boolean setPassword(char[] saltedSHA256PasswordHash) throws IOException; diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/SSHSignatureCallback.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/SSHSignatureCallback.java index 3a9e863e89..f21f6e0d64 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/SSHSignatureCallback.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/remote/SSHSignatureCallback.java @@ -52,28 +52,28 @@ public class SSHSignatureCallback implements Callback, Serializable { } /** - * @returns token to be signed using user certificate. + * @return token to be signed using user certificate. */ public byte[] getToken() { return (token == null ? null : (byte[]) token.clone()); } /** - * @returns signed token bytes set by callback handler. + * @return signed token bytes set by callback handler. */ public byte[] getSignature() { return (signature == null ? null : (byte[]) signature.clone()); } /** - * @returns the server's signature of the token bytes. + * @return the server's signature of the token bytes. */ public byte[] getServerSignature() { return serverSignature; } /** - * @returns true if callback has been signed + * @return true if callback has been signed */ public boolean isSigned() { return signature != null; diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/DataFileHandle.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/DataFileHandle.java index 46f7a1f069..9022b4b96b 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/DataFileHandle.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/DataFileHandle.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +36,7 @@ public interface DataFileHandle { * read, the end of the stream is detected, or an exception is thrown. * * @param b the buffer into which the data is read. - * @exception EOFException if this file reaches the end before reading + * @exception java.io.EOFException if this file reaches the end before reading * all the bytes. * @exception IOException if an I/O error occurs. */ @@ -53,7 +52,7 @@ public interface DataFileHandle { * @param b the buffer into which the data is read. * @param off the start offset of the data. * @param len the number of bytes to read. - * @exception EOFException if this file reaches the end before reading + * @exception java.io.EOFException if this file reaches the end before reading * all the bytes. * @exception IOException if an I/O error occurs. */ diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystem.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystem.java index 6db0208eef..6db3bc7b8c 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystem.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystem.java @@ -143,7 +143,6 @@ public interface FileSystem { * @param parentPath folder path of parent * @param name new database name * @param fileID file ID to be associated with new database or null - * @param bufferFile data source * @param contentType application defined content type * @param bufferSize buffer size. If copying an existing BufferFile, the buffer * size must be the same as the source file. @@ -164,7 +163,7 @@ public interface FileSystem { * Creates a new empty data file within the specified parent folder. * @param parentPath folder path of parent * @param name new data file name - * @param inputStream source data + * @param istream source data * @param comment version comment (used for versioned file system only) * @param contentType application defined content type * @param monitor progress monitor (used for cancel support, @@ -286,7 +285,7 @@ public interface FileSystem { public boolean isShared(); /** - * Cleanup & release resources + * Cleanup and release resources */ public void dispose(); diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemListener.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemListener.java index 2d602fff80..867dafff66 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemListener.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemListener.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -70,14 +69,14 @@ public interface FileSystemListener { * Notification that an item was renamed. * @param folderPath the path of the folder that contains the renamed item * @param oldItemName the old name of the item. - * @param newITemName the new name of the item. + * @param newItemName the new name of the item. */ void itemRenamed(String folderPath, String oldItemName, String newItemName); /** * Notification that an item was moved. * @param parentPath the path of the folder that used to contain the item. - * @param itemName the name of the item that was moved. + * @param name the name of the item that was moved. * @param newParentPath the path of the folder that the item was moved to. * @param newName the new name of the item. */ diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemListenerList.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemListenerList.java index 1c1cdf9107..b75d6e8992 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemListenerList.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FileSystemListenerList.java @@ -39,7 +39,7 @@ public class FileSystemListenerList implements FileSystemListener { /** * Construct FileSystemListenerList - * @param enableAsyncronousDispatching if true a seperate dispatch thread will be used + * @param enableAsynchronousDispatching if true a seperate dispatch thread will be used * to notify listeners. If false, blocking notification will be performed. */ public FileSystemListenerList(boolean enableAsynchronousDispatching) { @@ -83,7 +83,7 @@ public class FileSystemListenerList implements FileSystemListener { /** * Forwards itemMoved callback to all listeners within this list. - * @see ghidra.framework.store.FileSystemListener#itemMoved(java.lang.String, java.lang.String, java.lang.String) + * @see ghidra.framework.store.FileSystemListener#itemMoved(String, String, String, String) */ @Override public void itemMoved(String parentPath, String name, String newParentPath, String newName) { @@ -99,7 +99,7 @@ public class FileSystemListenerList implements FileSystemListener { /** * Forwards itemRenamed callback to all listeners within this list. - * @see ghidra.framework.store.FileSystemListener#itemRenamed(java.lang.String, java.lang.String, java.lang.String) + * @see ghidra.framework.store.FileSystemListener#itemRenamed(String, String, String) */ @Override public void itemRenamed(String parentPath, String itemName, String newName) { @@ -115,7 +115,7 @@ public class FileSystemListenerList implements FileSystemListener { /** * Forwards itemDeleted callback to all listeners within this list. - * @see ghidra.framework.store.FileSystemListener#itemDeleted(java.lang.String, java.lang.String) + * @see ghidra.framework.store.FileSystemListener#itemDeleted(String, String) */ @Override public void itemDeleted(String parentPath, String itemName) { @@ -131,7 +131,7 @@ public class FileSystemListenerList implements FileSystemListener { /** * Forwards folderRenamed callback to all listeners within this list. - * @see ghidra.framework.store.FileSystemListener#folderRenamed(java.lang.String, java.lang.String, java.lang.String) + * @see ghidra.framework.store.FileSystemListener#folderRenamed(String, String, String) */ @Override public void folderRenamed(String parentPath, String folderName, String newFolderName) { @@ -147,7 +147,7 @@ public class FileSystemListenerList implements FileSystemListener { /** * Forwards folderMoved callback to all listeners within this list. - * @see ghidra.framework.store.FileSystemListener#folderMoved(java.lang.String, java.lang.String, java.lang.String) + * @see ghidra.framework.store.FileSystemListener#folderMoved(String, String, String) */ @Override public void folderMoved(String parentPath, String folderName, String newParentPath) { @@ -163,7 +163,7 @@ public class FileSystemListenerList implements FileSystemListener { /** * Forwards folderDeleted callback to all listeners within this list. - * @see ghidra.framework.store.FileSystemListener#folderDeleted(java.lang.String, java.lang.String) + * @see ghidra.framework.store.FileSystemListener#folderDeleted(String, String) */ @Override public void folderDeleted(String parentPath, String folderName) { @@ -179,7 +179,7 @@ public class FileSystemListenerList implements FileSystemListener { /** * Forwards itemCreated callback to all listeners within this list. - * @see ghidra.framework.store.FileSystemListener#itemCreated(java.lang.String, java.lang.String) + * @see ghidra.framework.store.FileSystemListener#itemCreated(String, String) */ @Override public void itemCreated(String parentPath, String itemName) { @@ -195,7 +195,7 @@ public class FileSystemListenerList implements FileSystemListener { /** * Forwards folderCreated callback to all listeners within this list. - * @see ghidra.framework.store.FileSystemListener#folderCreated(java.lang.String, java.lang.String) + * @see ghidra.framework.store.FileSystemListener#folderCreated(String, String) */ @Override public void folderCreated(String parentPath, String folderName) { @@ -211,7 +211,7 @@ public class FileSystemListenerList implements FileSystemListener { /** * Forwards itemChanged callback to all listeners within this list. - * @see ghidra.framework.store.FileSystemListener#itemChanged(java.lang.String, java.lang.String) + * @see ghidra.framework.store.FileSystemListener#itemChanged(String, String) */ @Override public void itemChanged(String parentPath, String itemName) { diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FolderItem.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FolderItem.java index 2ae29fd26e..1b446ac5a5 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FolderItem.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/FolderItem.java @@ -258,9 +258,7 @@ public interface FolderItem { /** * Get all current checkouts for this item. - * @param parentPath - * @param itemName - * @return list of checkouts + * @return array of checkouts * @throws IOException if an IO error occurs or this item is not versioned */ ItemCheckoutStatus[] getCheckouts() throws IOException; diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/db/PackedDBHandle.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/db/PackedDBHandle.java index 56a9583858..49ea1afae6 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/db/PackedDBHandle.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/db/PackedDBHandle.java @@ -60,9 +60,6 @@ public class PackedDBHandle extends DBHandle { this.contentType = pdb.getContentType(); } - /* - * @see ghidra.framework.store.db.DBHandle#save(java.lang.String, ghidra.framework.model.ChangeSet, ghidra.util.task.TaskMonitor) - */ @Override public synchronized void save(String comment, DBChangeSet changeSet, TaskMonitor monitor) throws IOException, CancelledException { @@ -125,7 +122,6 @@ public class PackedDBHandle extends DBHandle { * @throws CancelledException if task monitor cancelled operation. * @throws IOException * @throws DuplicateFileException - * @see db.DBHandle#saveAs(java.io.File, java.lang.String, ghidra.util.task.TaskMonitor) */ public synchronized PackedDatabase saveAs(String itemName, File dir, String packedFileName, TaskMonitor monitor) throws IOException, DuplicateFileException, CancelledException { @@ -154,7 +150,6 @@ public class PackedDBHandle extends DBHandle { * @throws CancelledException if task monitor cancelled operation. * @throws IOException * @throws DuplicateFileException - * @see db.DBHandle#saveAs(java.io.File, java.lang.String, ghidra.util.task.TaskMonitor) */ public synchronized PackedDatabase saveAs(String itemName, File dir, String packedFileName, Long newDatabaseId, TaskMonitor monitor) diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/db/PackedDatabase.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/db/PackedDatabase.java index b9cf8bad92..41bfd8c7bf 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/db/PackedDatabase.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/db/PackedDatabase.java @@ -493,11 +493,10 @@ public class PackedDatabase extends Database { /** * Create a new Database with data provided by an ItemDeserializer. - * @param dir the parent directory which contains the "Hidden" database directory. - * @param dbName the unmangled database name - * @param checkinId - * @param packedFile - * @param monitor + * @param bfMgr the buffer manager for the database + * @param checkinId the check-in id + * @param packedFile the file to unpack + * @param monitor the task monitor * @throws CancelledException */ public static void unpackDatabase(BufferFileManager bfMgr, long checkinId, File packedFile, diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/db/PrivateDatabase.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/db/PrivateDatabase.java index 99ed5b1821..372b9411f6 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/db/PrivateDatabase.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/db/PrivateDatabase.java @@ -154,11 +154,8 @@ public class PrivateDatabase extends Database { /** * Open the current version of this database for update use. - * @param recover if true an attempt will be made to recover unsaved changes - * from a previous crash. - * @param monitor task monitor * @return updateable buffer file - * @throws IOException + * @throws IOException if updating this database file is not allowed */ public LocalManagedBufferFile openBufferFileForUpdate() throws IOException { if (!updateAllowed) { @@ -181,7 +178,8 @@ public class PrivateDatabase extends Database { * Following a move of the database directory, * this method should be invoked if this instance will * continue to be used. - * @param dirir new database directory + * @param dir new database directory + * @throws FileNotFoundException if the database directory cannot be found */ public void dbMoved(File dir) throws FileNotFoundException { synchronized (syncObject) { @@ -246,7 +244,7 @@ public class PrivateDatabase extends Database { * If already open for update, a save should not be done or the database * may become corrupted. All existing handles should be closed and reopened * when this method is complete. - * @param privateDb + * @param otherDb the other database. * @throws IOException if an IO error occurs. An attempt will be made to restore * this database to its original state, however the otherDb will not be repaired * and may become unusable. diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/FileChangeListener.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/FileChangeListener.java index 1182b58fdf..6deeb0b70a 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/FileChangeListener.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/FileChangeListener.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +30,6 @@ public interface FileChangeListener { * on behalf of the caller. This method should not attempt to alter the * lock. * @param file the modified file. - * @param haveLock is true if a file lock has been granted (LockFile was - * supplied at time of construction). */ public void fileModified(File file); diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/ItemDeserializer.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/ItemDeserializer.java index 1976e3f72f..4499c350d2 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/ItemDeserializer.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/ItemDeserializer.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,8 +53,7 @@ public class ItemDeserializer { /** * Constructor. - * @param in input stream. The input stream must not be read again until - * after the saveItem method has been invoked successfully. + * @param packedFile item to deserialize. * @throws IOException */ public ItemDeserializer(File packedFile) throws IOException { diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/ItemSerializer.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/ItemSerializer.java index 5e0bf26d2c..0d70420826 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/ItemSerializer.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/ItemSerializer.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -162,7 +161,7 @@ public class ItemSerializer { * @param inputStream a stream for accessing bytes of what may be a packed file * @return true if the bytes from the inputStream represent the bytes of a packed file * @throws IOException If there is a problem accessing the inputStream - * @see {@link #isPackedFile(File)} + * @see #isPackedFile(File) */ public static boolean isPackedFile(InputStream inputStream) throws IOException { inputStream.skip(MAGIC_NUMBER_POS); diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalDataFile.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalDataFile.java index a790a8cc33..7778c9f8b2 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalDataFile.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalDataFile.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -121,16 +120,12 @@ public class LocalDataFile extends LocalFolderItem implements DataFileItem { return new File(getDataDir(), DATA_FILE); } - /** - * @see ghidra.framework.store.DataFile#getInputStream() - */ + @Override public InputStream getInputStream() throws FileNotFoundException { return new FileInputStream(getDataFile()); } - /** - * @see ghidra.framework.store.DataFileItem#getInputStream(int) - */ + @Override public InputStream getInputStream(int version) throws FileNotFoundException { // TODO Versions for DataFiles are not supported @@ -138,16 +133,11 @@ public class LocalDataFile extends LocalFolderItem implements DataFileItem { return new FileInputStream(getDataFile()); } - /** - * @see ghidra.framework.store.DataFile#getOutputStream() - */ + @Override public OutputStream getOutputStream() throws FileNotFoundException { return new FileOutputStream(getDataFile()); } - /* - * @see ghidra.framework.store.FolderItem#updateCheckout(ghidra.framework.store.FolderItem, boolean, ghidra.util.task.TaskMonitor) - */ @Override public void updateCheckout(FolderItem versionedFolderItem, boolean updateItem, TaskMonitor monitor) throws IOException { @@ -156,9 +146,6 @@ public class LocalDataFile extends LocalFolderItem implements DataFileItem { } - /* - * @see ghidra.framework.store.FolderItem#updateCheckout(ghidra.framework.store.FolderItem, int) - */ @Override public void updateCheckout(FolderItem item, int checkoutVersion) throws IOException { @@ -166,9 +153,6 @@ public class LocalDataFile extends LocalFolderItem implements DataFileItem { } - /* - * @see ghidra.framework.store.local.LocalFolderItem#deleteMinimumVersion(java.lang.String) - */ @Override void deleteMinimumVersion(String user) throws IOException { @@ -176,9 +160,6 @@ public class LocalDataFile extends LocalFolderItem implements DataFileItem { } - /* - * @see ghidra.framework.store.local.LocalFolderItem#deleteCurrentVersion(java.lang.String) - */ @Override void deleteCurrentVersion(String user) throws IOException { @@ -186,33 +167,24 @@ public class LocalDataFile extends LocalFolderItem implements DataFileItem { } - /* - * @see ghidra.framework.store.FolderItem#output(java.io.File, int, ghidra.util.task.TaskMonitor) - */ + @Override public void output(File outputFile, int version, TaskMonitor monitor) throws IOException { throw new UnsupportedOperationException("Output not yet supported for DataFiles"); } - /* - * @see ghidra.framework.store.local.LocalFolderItem#getMinimumVersion() - */ @Override int getMinimumVersion() throws IOException { return -1; } - /* - * @see ghidra.framework.store.FolderItem#getCurrentVersion() - */ + @Override public int getCurrentVersion() { return -1; } - /* - * @see ghidra.framework.store.FolderItem#canRecover() - */ + @Override public boolean canRecover() { return false; } diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalFileSystem.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalFileSystem.java index 41e2f7fee0..c8bf0d68d5 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalFileSystem.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LocalFileSystem.java @@ -53,7 +53,7 @@ public abstract class LocalFileSystem implements FileSystem { /** * Hidden directory name prefix. * Should only be prepended to an escaped base-name. - * @see #escapeHiddenPrefixChars(String) + * @see #escapeHiddenDirPrefixChars(String) */ public static final char HIDDEN_DIR_PREFIX_CHAR = '~'; public static final String HIDDEN_DIR_PREFIX = Character.toString(HIDDEN_DIR_PREFIX_CHAR); @@ -169,7 +169,7 @@ public abstract class LocalFileSystem implements FileSystem { /** * Constructor. - * @param file path path for root directory. + * @param rootPath root path directory. * @param isVersioned if true item versioning will be enabled. * @param readOnly if true modifications within this file-system will not be allowed * and result in an ReadOnlyException @@ -273,14 +273,13 @@ public abstract class LocalFileSystem implements FileSystem { * significant performance impact. This does not provide locking which may be * required for a shared environment (e.g., checkin locking is only managed by a * single instance). - * @param validationRequired */ public static void setValidationRequired() { refreshRequired = true; } /** - * @returns true if folder item resources must be refreshed. + * @return true if folder item resources must be refreshed. * @see #setValidationRequired() */ public static boolean isRefreshRequired() { @@ -699,7 +698,7 @@ public abstract class LocalFileSystem implements FileSystem { } /** - * @returns the maximum name length permitted for folders or items. + * @return the maximum name length permitted for folders or items. */ public abstract int getMaxNameLength(); diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LockFile.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LockFile.java index 40cd2edcf1..6e40ad3a77 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LockFile.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/local/LockFile.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -239,7 +238,7 @@ public class LockFile { /** * Return the name of the current lock owner - * or "" if not locked or could not be determined. + * or {@code ""} if not locked or could not be determined. */ public String getLockOwner() { return getLockOwner(false); @@ -346,7 +345,6 @@ public class LockFile { /** * Create the lock file using the default timeout. * Lock is guaranteed for MAX_LOCK_LEASE_PERIOD seconds. - * @param timeout maximum time in seconds to wait for lock. * @return true if lock creation was successful. */ public boolean createLock() { diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/remote/RemoteFileSystem.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/remote/RemoteFileSystem.java index 447b9d127d..a19cb2d84b 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/remote/RemoteFileSystem.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/store/remote/RemoteFileSystem.java @@ -46,7 +46,6 @@ public class RemoteFileSystem implements FileSystem, RemoteAdapterListener { /** * Construct a new remote file system which corresponds to a remote repository. * @param repository remote Repository - * @throws IOException */ public RemoteFileSystem(RepositoryAdapter repository) { this.repository = repository; diff --git a/Ghidra/Framework/FileSystem/src/main/java/ghidra/util/PropertyFile.java b/Ghidra/Framework/FileSystem/src/main/java/ghidra/util/PropertyFile.java index 8a04fd7d4c..85079a383e 100644 --- a/Ghidra/Framework/FileSystem/src/main/java/ghidra/util/PropertyFile.java +++ b/Ghidra/Framework/FileSystem/src/main/java/ghidra/util/PropertyFile.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -147,7 +146,7 @@ public class PropertyFile { /** * Returns the FileID associated with this file. - * @returns FileID associated with this file + * @return FileID associated with this file */ public String getFileID() { return getString(FILE_ID, null); diff --git a/Ghidra/Framework/Generic/src/main/java/generic/algorithms/ReducingListBasedLcs.java b/Ghidra/Framework/Generic/src/main/java/generic/algorithms/ReducingListBasedLcs.java index 57cac9b43c..664f94ff33 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/algorithms/ReducingListBasedLcs.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/algorithms/ReducingListBasedLcs.java @@ -18,7 +18,7 @@ package generic.algorithms; import java.util.List; /** - * An implementation of the {@link ReducingLcs} that takes as its input a list of items, where + * An implementation of the {@link ReducingLcs} that takes as its input a list of {@literal }items, where * the list is the 'sequence' being checked for the Longest Common Subsequence. * * @param the type of the item in the sequence of items diff --git a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/ConcurrentQ.java b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/ConcurrentQ.java index 12a6b2e892..8c4e32c930 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/ConcurrentQ.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/ConcurrentQ.java @@ -35,7 +35,7 @@ import ghidra.util.task.TaskMonitor; *


      *

      * Put and Forget: - *

      + * 
      {@literal
        * QCallback callback = new AbstractQCallback() {
        *     public RESULT process(ITEM item, TaskMonitor monitor) {
        *         // do work here...
      @@ -49,11 +49,11 @@ import ghidra.util.task.TaskMonitor;
        * ...
        * concurrentQ.add(item); // where item is one of the instances of ITEM
        * 
      - * 
      + * }
      *
      *

      * Put Items and Handle Results in Any Order as They Available: - *

      + * 
      {@literal
        * QCallback callback = new AbstractQCallback() {
        *     public RESULT process(ITEM item, TaskMonitor monitor) {
        *         // do work here...
      @@ -62,14 +62,14 @@ import ghidra.util.task.TaskMonitor;
        * 
        * QItemListener itemListener = new QItemListener() {
        *     public void itemProcessed(QResult result) {
      - *         RESULT result = result.getResult();
      - *             // work on my result...
      + *         RESULT result = result.getResult();}
      + *             // work on my result...{@code
        *         }
        * };
        * 
        * ConcurrentQBuilder builder = new ConcurrentQBuilder();
        * builder.setThreadPoolName("Thread Pool Name");
      - * builder.setListener(itemListener);
      + * }builder.setListener(itemListener);{@code
        * concurrentQ = builder.build(callback);
        * ...
        * ...
      @@ -77,12 +77,12 @@ import ghidra.util.task.TaskMonitor;
        * concurrentQ.add(item);
        * concurrentQ.add(item);
        * 
      - * 
      + * }
      * *
      *

      * Put Items and Handle Results When All Items Have Been Processed: - *

      + * 
      {@literal
        * QCallback callback = new AbstractQCallback() {
        *     public RESULT process(ITEM item, TaskMonitor monitor) {
        *         // do work here...
      @@ -91,7 +91,7 @@ import ghidra.util.task.TaskMonitor;
        *
        * ConcurrentQBuilder builder = new ConcurrentQBuilder();
        * builder.setThreadPoolName("Thread Pool Name");
      - * builder.setCollectResults(true);
      + * }builder.setCollectResults(true);{@code
        * concurrentQ = builder.getQueue(callback);
        * ...
        * ...
      @@ -99,14 +99,14 @@ import ghidra.util.task.TaskMonitor;
        * concurrentQ.add(item);
        * concurrentQ.add(item);
        * ...
      - * List<QResult<I, R>> results = concurrentQ.waitForResults();
      + * }{@literal List> results = concurrentQ.waitForResults();}{@literal
        * // process the results...
        * 
      - * 
      + * }
      *
      *

      * Put Items, Blocking While Full, and Handle Results in Any Order as They Available: - *

      + * 
      {@literal
        * QCallback callback = new AbstractQCallback() {
        *     public RESULT process(ITEM item, TaskMonitor monitor) {
        *         // do work here...
      @@ -122,12 +122,12 @@ import ghidra.util.task.TaskMonitor;
        * 
        * ConcurrentQBuilder builder = new ConcurrentQBuilder();
        * 	builder.setThreadPoolName("Thread Pool Name");
      - * builder.setQueue(new LinkedBlockingQueue(100));
      + * }builder.setQueue(new LinkedBlockingQueue(100));{@literal
        * concurrentQ = builder.getQueue(callback);
        * ...
        * ...
      - * Iterator iterator = <get an iterator for 1000s of items somewhere>
      - * concurrentQ.offer(iterator); // this call will block when the queue fills up (100 items or more)
      + * Iterator iterator = 
      + * }{@code concurrentQ.offer(iterator); // this call will block when the queue fills up (100 items or more)}
        * 
        * 
      *
      @@ -378,7 +378,7 @@ public class ConcurrentQ { * * @return the first available result * @throws InterruptedException if interrupted while waiting for a result - * @throws {@link IllegalStateException} if this queue has been set to not collect results + * @throws IllegalStateException if this queue has been set to not collect results * (see the constructor). */ public QResult waitForNextResult() throws InterruptedException { diff --git a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/ConcurrentQBuilder.java b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/ConcurrentQBuilder.java index 678c9af52e..c060a2e6a5 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/ConcurrentQBuilder.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/ConcurrentQBuilder.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +33,7 @@ import java.util.concurrent.LinkedBlockingQueue; *

      * Examples: *

      - *

      + * 
      {@literal
        * QCallback callback = new AbstractQCallback() {
        *     public R process(I item, TaskMonitor monitor) {
        *         // do work here...
      @@ -53,7 +52,7 @@ import java.util.concurrent.LinkedBlockingQueue;
        * 				setMaxInProgress(1).
        * 				build(callback);
        * 
      - * 
      + * }
      *

      * * Note: if you wish to take advantage of blocking when adding items to the {@link ConcurrentQ}, @@ -180,7 +179,7 @@ public class ConcurrentQBuilder { } /** - * @see {@link ConcurrentQ#setMonitor(TaskMonitor, boolean)} + * @see ConcurrentQ#setMonitor(TaskMonitor, boolean) *

      * The default value is true. */ diff --git a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/QCallback.java b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/QCallback.java index b0af02b425..2beb20a9fa 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/QCallback.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/QCallback.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,13 +19,13 @@ import ghidra.util.task.TaskMonitor; /** * Interface that defines the callback to work on the items given to the - * {@link ConcurrentQ#add(I)} methods. Each item that is processed will be handed to the - * {@link #process(I, TaskMonitor)} method of the implementing class. + * {@link ConcurrentQ#add(Object) ConcurrentQ.add(I)} methods. Each item that is processed will be handed to the + * {@link #process(Object, TaskMonitor) process(I, TaskMonitor)} method of the implementing class. * * @param The type of the items to be processed. * @param The type of objects resulting from processing an item; if you don't care about the * return value, then make this value whatever you want, like Object or the - * same value as {@link I} and return null from {@link #process(Object, TaskMonitor)}. + * same value as {@link I} and return null from {@link #process(Object, TaskMonitor) process(I, TaskMonitor)}. */ public interface QCallback { diff --git a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/QProgressListener.java b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/QProgressListener.java index a75f3286fa..5cbeb61ec4 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/QProgressListener.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/QProgressListener.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,18 +25,17 @@ public interface QProgressListener { * Notification that progress has changed during the processing of an item. * @param id the id of the item being processed. Since multiple items can be processed concurrently, * the id can be used to "demultiplex" the progress and messages being generated. - * @param currentProgress the current value of the progress for this task. - * @param progressMessage the last message set for this task.s * @param item the item that was being processed when the worker changed the max progress. + * @param currentProgress the current value of the progress for this task. */ - void progressChanged(long id, I Item, long currentProgress); + void progressChanged(long id, I item, long currentProgress); /** * Notification that a new task has been generated to process an item. * @param id the id of the item being processed. * @param item the item that was being processed when the worker changed the max progress. */ - void taskStarted(long id, I Item); + void taskStarted(long id, I item); /** * Notification that a new task has completed processing for an item. @@ -46,7 +44,7 @@ public interface QProgressListener { * @param totalCount the total number of items that have been submitted to the ConcurrentQ * @param completedCount the total number of items that completed processing. */ - void taskEnded(long id, I Item, long totalCount, long completedCount); + void taskEnded(long id, I item, long totalCount, long completedCount); /** * Notification that the progress mode has changed from/to indeterminate mode diff --git a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/QRunnable.java b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/QRunnable.java index e5c7c690a7..aae2525516 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/concurrent/QRunnable.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/concurrent/QRunnable.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,8 +19,8 @@ import ghidra.util.task.TaskMonitor; /** * Interface that defines the Runnable to work on the items given to the - * {@link ConcurrentQ#add(I)} methods. Each item that is processed will be handed to the - * {@link #run(I, TaskMonitor)} method of the implementing class. + * {@link ConcurrentQ#add(Object) ConcurrentQ.add(I)} methods. Each item that is processed will be handed to the + * {@link #run(Object, TaskMonitor) run(I, TaskMonitor)} method of the implementing class. * * @param The type of the items to be processed. */ diff --git a/Ghidra/Framework/Generic/src/main/java/generic/constraint/Constraint.java b/Ghidra/Framework/Generic/src/main/java/generic/constraint/Constraint.java index 0153e09015..64587ab971 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/constraint/Constraint.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/constraint/Constraint.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,7 +45,7 @@ public abstract class Constraint { /** * Returns true if the given object satisfies this constraint. - * @param the object to test this constraint on. + * @param t the object to test this constraint on. * @return true if the given object satisfies this constraint. */ public abstract boolean isSatisfied(T t); diff --git a/Ghidra/Framework/Generic/src/main/java/generic/json/JSONToken.java b/Ghidra/Framework/Generic/src/main/java/generic/json/JSONToken.java index db0f899ecf..879ff4969c 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/json/JSONToken.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/json/JSONToken.java @@ -4,19 +4,18 @@ package generic.json; public class JSONToken { - - /** - * JSON token description. - * @param type type (object, array, string etc.) - * @param start start position in JSON data string - * @param end end position in JSON data string - */ public JSONType type; public int start; public int end; public int size; - + + /** + * JSON token description. + * @param type the token type (object, array, string etc.) + * @param start the start position in JSON data string + * @param end the end position in JSON data string + */ public JSONToken(JSONType type, int start, int end) { setType(type); setStart(start); diff --git a/Ghidra/Framework/Generic/src/main/java/generic/lsh/vector/LSHCosineVector.java b/Ghidra/Framework/Generic/src/main/java/generic/lsh/vector/LSHCosineVector.java index 34b16d121b..2b603922e5 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/lsh/vector/LSHCosineVector.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/lsh/vector/LSHCosineVector.java @@ -38,7 +38,7 @@ public class LSHCosineVector implements LSHVector { /** * Install a set of features as an int[]. Each integer is a hash. The integers MUST already be sorted. - * The same integer can occur more than once in the array (term frequency (TF) > 1). + * The same integer can occur more than once in the array (term frequency (TF) > 1). * Weights are determined by TF and Inverse Document Frequency (IDF) of individual features * @param feature is the sorted array of integer hashes * @param wfactory is the container of weighting information diff --git a/Ghidra/Framework/Generic/src/main/java/generic/lsh/vector/LSHVectorFactory.java b/Ghidra/Framework/Generic/src/main/java/generic/lsh/vector/LSHVectorFactory.java index be9757f630..ed81f7feaa 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/lsh/vector/LSHVectorFactory.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/lsh/vector/LSHVectorFactory.java @@ -36,7 +36,7 @@ public abstract class LSHVectorFactory { /** * Generate an LSHVector from a feature set, individual features are integer hashes. * The integers MUST already be sorted. - * The same integer can occur more than once in the array (term frequency (TF) > 1). + * The same integer can occur more than once in the array (term frequency (TF) > 1). * The factory decides internally how to create weights based on term frequency and any * knowledge of Inverse Document Frequency (IDF) * @param feature is the sorted array of integer features diff --git a/Ghidra/Framework/Generic/src/main/java/generic/stl/RedBlackTree.java b/Ghidra/Framework/Generic/src/main/java/generic/stl/RedBlackTree.java index 32add1019c..2b4541b9ea 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/stl/RedBlackTree.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/stl/RedBlackTree.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,14 +36,19 @@ public class RedBlackTree { private final boolean allowDuplicateKeys; /** - * Creates a new RedBlackKeySet that can store keys between 0 and n. - * @param n the maximum key for this set. + * Creates a new RedBlackTree + * @param comparator the comparator for this tree + * @param allowDuplicateKeys true to allow duplicate keys */ public RedBlackTree(Comparator comparator, boolean allowDuplicateKeys) { this.comparator = comparator; this.allowDuplicateKeys = allowDuplicateKeys; } + /** + * Creates a copy of an existing RedBlackTree + * @param tree the existing tree to copy + */ public RedBlackTree(RedBlackTree tree) { this.comparator = tree.comparator; this.allowDuplicateKeys = tree.allowDuplicateKeys; @@ -129,10 +133,10 @@ public class RedBlackTree { } /** - * Finds the node with the lowest key that is >= to the given key. Returns null if all nodes + * Finds the node with the lowest key that is >= to the given key. Returns null if all nodes * in the tree have keys less than the given key. * @param key the key to search for. - * @return the node with the lowest key that is >= to the given key or null if no such key exists. + * @return the node with the lowest key that is >= to the given key or null if no such key exists. */ public RedBlackNode lowerBound(K key) { RedBlackNode bestNode = null; @@ -154,10 +158,10 @@ public class RedBlackTree { /** - * Finds the node with the lowest key that is > the given key. Returns null if all nodes + * Finds the node with the lowest key that is > the given key. Returns null if all nodes * in the tree have keys less than or equal to the given key. * @param key the key to search for. - * @return the node with the lowest key that is > to the given key or null if no such key exists. + * @return the node with the lowest key that is > to the given key or null if no such key exists. */ public RedBlackNode upperBound(K key){ RedBlackNode bestNode = null; @@ -183,6 +187,7 @@ public class RedBlackTree { * already exists, the old value will be replaced by the new value and the old value will be * returned. * @param key the key to add to the set. + * @param value the key's value. * @return the old value associated with the key, or null if the key was not previously in the map. */ public Pair, Boolean> put(K key, V value) { diff --git a/Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGenericTest.java b/Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGenericTest.java index 61b0740ef8..309361971d 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGenericTest.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/test/AbstractGenericTest.java @@ -15,7 +15,7 @@ */ package generic.test; -import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.*; import java.awt.*; import java.awt.event.*; @@ -1482,7 +1482,7 @@ public abstract class AbstractGenericTest extends AbstractGTest { /** * Invoke fixupGUI at the beginning of your JUnit test or in * its setup() method to make your GUI for the JUnit test appear using the - * system Look & Feel. The system look and feel is the default that Ghidra + * system Look and Feel. The system look and feel is the default that Ghidra * uses. This will also change the default fonts for the JUnit test to be * the same as those in Ghidra. * diff --git a/Ghidra/Framework/Generic/src/main/java/generic/timer/GhidraSwinglessTimer.java b/Ghidra/Framework/Generic/src/main/java/generic/timer/GhidraSwinglessTimer.java index 2d44c653a0..67472ad139 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/timer/GhidraSwinglessTimer.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/timer/GhidraSwinglessTimer.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -92,7 +91,7 @@ public class GhidraSwinglessTimer implements GhidraTimer { /** * Creates a new repeating timer with a initial and continual delay with the given delay. * @param delay the delay to use for the first and subsequent timer callbacks. - * @callback the callback the be called with the timer fires. + * @param callback the callback the be called with the timer fires. */ public GhidraSwinglessTimer(int delay, TimerCallback callback) { this(delay,delay,callback); @@ -102,7 +101,7 @@ public class GhidraSwinglessTimer implements GhidraTimer { * Creates a new repeating timer with an initial and continual delay. * @param initialDelay the delay to use for the first timer callbacks. * @param delay the delay to use for subsequent timer callbacks. - * @callback the callback the be called with the timer fires. + * @param callback the callback the be called with the timer fires. */ public GhidraSwinglessTimer(int initialDelay, int delay, TimerCallback callback) { this.callback = callback; diff --git a/Ghidra/Framework/Generic/src/main/java/generic/util/MultiIterator.java b/Ghidra/Framework/Generic/src/main/java/generic/util/MultiIterator.java index fc078fb82c..85da8d8dbc 100644 --- a/Ghidra/Framework/Generic/src/main/java/generic/util/MultiIterator.java +++ b/Ghidra/Framework/Generic/src/main/java/generic/util/MultiIterator.java @@ -43,7 +43,7 @@ public class MultiIterator implements Iterator { * Use this constructor when the items of the iterators are naturally comparable (i.e., * they implement {@link Comparable}). * - * @param comparator the comparator used to find the next item + * @param iterators the iterators that provide the data * @param forward true if the iterators provide data sorted ascending; false for descending */ public MultiIterator(List> iterators, boolean forward) { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/SwingExceptionHandler.java b/Ghidra/Framework/Generic/src/main/java/ghidra/SwingExceptionHandler.java index 14471deab4..40ce8a5d9b 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/SwingExceptionHandler.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/SwingExceptionHandler.java @@ -29,10 +29,9 @@ import ghidra.util.exception.ClosedException; public class SwingExceptionHandler implements UncaughtExceptionHandler { /** - * Handle exception caught within the EventDispatchThread. + * Handle exception caught within the Swing event dispatch thread. * @param t exception * @throws Throwable error occurred while attempting to handle exception - * @see java.awt.EventDispatchThread#handleException(java.lang.Throwable) */ public void handle(Throwable t) throws Throwable { handleUncaughtException(t); diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Application.java b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Application.java index 6648dadba9..7199d4947e 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Application.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Application.java @@ -804,7 +804,7 @@ public class Application { /** * Returns a list of all directories in any module that have the given module relative path. For * example, a relative path of "foo/bar" will return all directories that are of the form - * /data/foo/bar + * {@code /data/foo/bar} * @param relativePath the module relative path to search for. * @return a list of all directories in any module that have the given module relative path. */ @@ -890,7 +890,7 @@ public class Application { /** * Returns the file relative to the named module's directory. * @param moduleName the name of the module. - * @param relativeDataPath the path relative to the module's data directory. + * @param relativePath the path relative to the module's data directory. * @throws FileNotFoundException if the file does not exist. */ public static ResourceFile getModuleFile(String moduleName, String relativePath) diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/ModuleInitializer.java b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/ModuleInitializer.java index 0d044cdae1..01bbe7f66d 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/ModuleInitializer.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/ModuleInitializer.java @@ -36,7 +36,7 @@ public interface ModuleInitializer //@formatter:on /** - * @returns initializer name + * @return initializer name */ public String getName(); } diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/ShutdownHookRegistry.java b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/ShutdownHookRegistry.java index b05e17fe58..13f0394535 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/ShutdownHookRegistry.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/ShutdownHookRegistry.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,8 +44,7 @@ public class ShutdownHookRegistry { /** * Remove a shutdown hook previously registered. * Hooks with a higher priority value will run first - * @param r shutdown hook runnable - * @param priority relative priority + * @param hook shutdown hook */ public static synchronized void removeShutdownHook(ShutdownHook hook) { hooks.remove(hook); diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/Options.java b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/Options.java index 1c8795a4ea..21066e45ee 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/Options.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/Options.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,7 +58,7 @@ public interface Options { * from the swing thread. * @return either the PropertyEditor that was registered for this option or a default editor * for the property type if one can be found; otherwise null. - * @throw IllegalStateException if not called from the swing thread. + * @throws IllegalStateException if not called from the swing thread. */ public PropertyEditor getPropertyEditor(String optionName); @@ -112,7 +111,7 @@ public interface Options { * @param optionName the name of the option being registered. * @param defaultValue the defaultValue for the option. The default value must not be * null so that the OptionType can be determined. If the default value should be null, use - * {@link #registerOption(String, OptionType, Object, HelpLocation, String) + * {@link #registerOption(String, OptionType, Object, HelpLocation, String)} * @param help the HelpLocation for this option. * @param description a description of the option. * @throws IllegalArgumentException if the defaultValue is null @@ -151,15 +150,13 @@ public interface Options { /** * Register the options editor that will handle the editing for all the options or a sub group of options. - * @param path the path to the sub group of options or "" for all the options. * @param editor the custom editor panel to be used to edit the options or sub group of options. */ public abstract void registerOptionsEditor(OptionsEditor editor); /** * Get the editor that will handle editing all the values in this options or sub group of options. - * @param path the path to the sub group of options or "" for all the options. - * @return null if no options editor was registered + * @return null if no options editor was registered */ public abstract OptionsEditor getOptionsEditor(); @@ -268,8 +265,8 @@ public interface Options { /** * Get the Date for the given option name. - * @param optionName option name - * @param defaultValue value that is stored and returned if there is no + * @param pName the property name + * @param date the default date that is stored and returned if there is no * option with the given name * @return the Date for the option * @throws IllegalArgumentException is a option exists with the given @@ -376,7 +373,7 @@ public interface Options { /** * Sets the Date value for the option. * @param optionName name of the option - * @param value + * @param newSetting the Date to set */ public abstract void setDate(String optionName, Date newSetting); @@ -508,7 +505,7 @@ public interface Options { /** * Returns the value as a string for the given option. - * @param optionName the name of the option for which to retrieve the value as a string + * @param name the name of the option for which to retrieve the value as a string * @return the value as a string for the given option. */ public abstract String getValueAsString(String name); @@ -518,6 +515,6 @@ public interface Options { * @param optionName the name of the option for which to retrieve the default value as a string * @return the default value as a string for the given option. */ - public abstract String getDefaultValueAsString(String analyzerName); + public abstract String getDefaultValueAsString(String optionName); } diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/generic/util/datastruct/DynamicValueSortedTreeMap.java b/Ghidra/Framework/Generic/src/main/java/ghidra/generic/util/datastruct/DynamicValueSortedTreeMap.java index 6d8655b021..69587aae63 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/generic/util/datastruct/DynamicValueSortedTreeMap.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/generic/util/datastruct/DynamicValueSortedTreeMap.java @@ -28,7 +28,7 @@ import ghidra.util.ReversedListIterator; * Such a tree may be useful as a priority queue where the cost of an entry may change over time. * As such, the collections returned by {@link #entrySet()}, {@link #keySet()}, and * {@link #values()} all implement {@link Deque}. The order of the entries will be updated on any - * call to {@link #put(Object, Object))}, or a call to {@link Collection#add(Object)} on the entry + * call to {@link #put(Object, Object)}, or a call to {@link Collection#add(Object)} on the entry * set. Additionally, if the values are mutable objects, whose costs may change, there is an * {@link #update(Object)} method, which notifies the map that the given key may need to be * repositioned. The associated collections also implement the {@link List} interface, providing @@ -38,9 +38,9 @@ import ghidra.util.ReversedListIterator; * * The underlying implementation is currently an unbalanced binary tree whose nodes also comprise a * doubly-linked list. Currently, it is not thread safe. - * @TODO Consider changing to an AVL tree implementation - * @TODO Consider implementing the {@link NavigableMap} interface - * @TODO Consider making the implementation thread-safe + * TODO Consider changing to an AVL tree implementation + * TODO Consider implementing the {@link NavigableMap} interface + * TODO Consider making the implementation thread-safe * * @param the type of the keys * @param the type of the values @@ -340,7 +340,7 @@ public class DynamicValueSortedTreeMap extends AbstractMap { /** * Insert a node as a successor to this node in the linked list - * @note Called only after the node is inserted into the tree + * NOTE: Called only after the node is inserted into the tree */ private void insertAfter(Node item) { item.prev = this; @@ -357,7 +357,7 @@ public class DynamicValueSortedTreeMap extends AbstractMap { /** * Insert a node as a predecessor to this node in the linked list - * @note Called only after the node is inserted into the tree + * NOTE: Called only after the node is inserted into the tree */ private void insertBefore(Node item) { item.prev = prev; @@ -498,7 +498,7 @@ public class DynamicValueSortedTreeMap extends AbstractMap { /** * When searching for values, identifies which instance to find * - * @TODO When/if implementing {@link NavigableMap}, this seems an appropriate place to put + * TODO When/if implementing {@link NavigableMap}, this seems an appropriate place to put * FLOOR, CEILING, etc. */ private enum SearchMode { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/net/ApplicationTrustManagerFactory.java b/Ghidra/Framework/Generic/src/main/java/ghidra/net/ApplicationTrustManagerFactory.java index 072e21d900..0d7d700279 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/net/ApplicationTrustManagerFactory.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/net/ApplicationTrustManagerFactory.java @@ -41,7 +41,7 @@ import ghidra.util.Msg; * *.cer, *.der) or may be in a Java JKS form (*.jks). The path to this file may be * established in one of two ways using the absolute file path: *

        - *
      1. setting the system property ghidra.cacerts (takes precedence) + *
      2. setting the system property ghidra.cacerts (takes precedence)
      3. *
      4. setting the user preference ghidra.cacerts
      5. *
      *

      diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/net/SSLContextInitializer.java b/Ghidra/Framework/Generic/src/main/java/ghidra/net/SSLContextInitializer.java index 731185b03f..4bfc178c75 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/net/SSLContextInitializer.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/net/SSLContextInitializer.java @@ -45,7 +45,7 @@ public class SSLContextInitializer implements ModuleInitializer { /** * Initialize default SSLContext with optional reset. * This method is primarily intended for testing. - * @param if true a complete reset will be done to force use of + * @param reset if true a complete reset will be done to force use of * any new certificate or keystores previously used. * @return true if successful, else false (see logged error) */ diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/DataConverter.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/DataConverter.java index a73f1955fb..3f5b764463 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/DataConverter.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/DataConverter.java @@ -134,7 +134,7 @@ public interface DataConverter extends Serializable { * @param value value to convert to bytes * @param b byte array to store bytes * @param offset offset into byte array to put the bytes - * @throws IndexOutOfBoundsException if (offset+2)>b.length + * @throws IndexOutOfBoundsException if (offset+2)>b.length */ public void getBytes(short value, byte[] b, int offset); @@ -152,7 +152,7 @@ public interface DataConverter extends Serializable { * @param value value to convert to bytes * @param b byte array to store bytes * @param offset offset into byte array to put the bytes - * @throws IndexOutOfBoundsException if (offset+4)>b.length + * @throws IndexOutOfBoundsException if (offset+4)>b.length */ public void getBytes(int value, byte[] b, int offset); @@ -170,7 +170,7 @@ public interface DataConverter extends Serializable { * @param value value to convert to bytes * @param b byte array to store bytes * @param offset offset into byte array to put the bytes - * @throws IndexOutOfBoundsException if (offset+8)>b.length + * @throws IndexOutOfBoundsException if (offset+8)>b.length */ public void getBytes(long value, byte[] b, int offset); @@ -181,7 +181,7 @@ public interface DataConverter extends Serializable { * @param size number of least significant bytes of value to be written to the byte array * @param b byte array to store bytes * @param offset offset into byte array to put the bytes - * @throws IndexOutOfBoundsException if (offset+size)>b.length. + * @throws IndexOutOfBoundsException if (offset+size)>b.length. */ public void getBytes(long value, int size, byte[] b, int offset); @@ -192,7 +192,7 @@ public interface DataConverter extends Serializable { * @param size number of least significant bytes of value to be written to the byte array * @param b byte array to store bytes * @param offset offset into byte array to put the bytes - * @throws IndexOutOfBoundsException if (offset+size)>b.length. + * @throws IndexOutOfBoundsException if (offset+size)>b.length. */ public void getBytes(BigInteger value, int size, byte[] b, int offset); diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/NumericUtilities.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/NumericUtilities.java index 6a5a371ea0..2d68a46be0 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/NumericUtilities.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/NumericUtilities.java @@ -242,7 +242,7 @@ public final class NumericUtilities { /** * Get an unsigned aligned value corresponding to the specified unsigned value * which will be greater than or equal the specified value. - * @param value value to be aligned + * @param unsignedValue value to be aligned * @param alignment alignment * @return aligned value */ @@ -270,7 +270,7 @@ public final class NumericUtilities { * * For example, consider the mask 00001111:01011100, and the value 00001001:00011000. This * will display as {@code X8:[x0x1][10xx]}. To see the correlation, consider the table: - *

      ClassMutable textHTML renderingDescription
      {@link GLabel}ImmutableNONon-html unchangeable label
      {@link GDLabel}MutableNONon-html changeable label
      + *
      * * * @@ -514,7 +514,7 @@ public final class NumericUtilities { *
    • 10 - renders number as a base-10 integer
    • *
    • 16 (default) - renders number base-16 integer
    • * - *
      Display{@code X} {@code 8} {@code :}{@code [x0x1]}{@code [10xx]}
      Mask {@code 0000}{@code 1111}{@code :}
      + *
      * * * diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/ReversedListIterator.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/ReversedListIterator.java index d1b4d1c07f..3c53a41145 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/ReversedListIterator.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/ReversedListIterator.java @@ -20,7 +20,7 @@ import java.util.ListIterator; /** * Wraps a {@link ListIterator} so that the operations are reversed. * - * @note you must obtain an iterator that is already at its end. E.g., if you wish to traverse a + * NOTE: you must obtain an iterator that is already at its end. E.g., if you wish to traverse a * list in reverse, you would use * {@code new ReversedListIterator<>(list.listIterator(list.size()))}. * diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/TestSuiteUtilities.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/TestSuiteUtilities.java index aa17669fc8..99bc0bce20 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/TestSuiteUtilities.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/TestSuiteUtilities.java @@ -44,7 +44,7 @@ public class TestSuiteUtilities { /** * Build JUnit test suite for the specified package. * TestSuite includes sub-TestSuites for each sub-package. - * @param pkg java package + * @param pkgName the java package name * @return test suite */ public static TestSuite getTestSuite(String pkgName) { @@ -53,7 +53,7 @@ public class TestSuiteUtilities { /** * Build JUnit test suite for the specified package only. - * @param pkg java package + * @param pkgName the java package name * @return test suite */ public static TestSuite getPkgTestSuite(String pkgName) { @@ -447,10 +447,10 @@ public class TestSuiteUtilities { /** * Create the Java source file a JUnit TestSuite which * includes all TestCases within a package directory. - * @param baseDir - * @param className - * @param pkgName - * @param recurse + * @param baseDir the base package directory + * @param className the class name + * @param pkgName the java package name + * @throws IOException */ public static void createTestSuites(File baseDir, String className, String pkgName) throws IOException { File dir = makeDir(baseDir, pkgName); @@ -511,9 +511,9 @@ public class TestSuiteUtilities { * Command-line utilities. *

      * Parameter usage: - *

      +	 * 
      {@literal
       	 *    createAllTests   
      -	 * 
      + * }
      * @param args */ public static void main(String[] args) { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/UserSearchUtils.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/UserSearchUtils.java index 1d88dbc445..e1765dcb82 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/UserSearchUtils.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/UserSearchUtils.java @@ -73,7 +73,7 @@ public class UserSearchUtils { * Create a regular expression from the given input. Note: the regular expression * created by this method is not a pure regular expression. More specifically, many * regular expression characters passed to this method will be escaped - * (see {@link #escapeRegexCharacters(String, boolean, boolean)}. + * (see {@link #escapeAllRegexCharacters(String)}. *

      * Also, globbing characters * will be changed from a regular expression meaning to a @@ -96,7 +96,7 @@ public class UserSearchUtils { * @param caseSensitive * true if the regular expression is case sensitive * @return Pattern the compiled regular expression - * @throws PatternSyntaxExpression + * @throws java.util.regex.PatternSyntaxException * if the input could be compiled */ public static Pattern createSearchPattern(String input, boolean caseSensitive) { @@ -122,7 +122,7 @@ public class UserSearchUtils { * @param text * search string * @return Pattern the compiled regular expression - * @throws PatternSyntaxExpression + * @throws java.util.regex.PatternSyntaxException * if the input could be compiled */ public static Pattern createLiteralSearchPattern(String text) { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/bean/GGlassPane.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/bean/GGlassPane.java index 44b4a78ee7..6c601b5b08 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/bean/GGlassPane.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/bean/GGlassPane.java @@ -55,7 +55,7 @@ public class GGlassPane extends JComponent { /** * Default constructor. *

      - * NOTE: You must call {@link #setVisible( true )} on this component after adding it + * NOTE: You must call {@link #setVisible(boolean) setVisible(true)} on this component after adding it * to the component. This is because the component will set the visibility to that of * the previous glass pane, which is false by default. */ diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/CallbackAccumulator.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/CallbackAccumulator.java index 7e2603f9c0..e4c1af7780 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/CallbackAccumulator.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/CallbackAccumulator.java @@ -24,8 +24,7 @@ import java.util.function.Consumer; * *

      This class is different than normal accumulators in that the values are not * stored internally. As such, calls to {@link #get()}, {@link #iterator()} and - * {@link #size()} will reflect having no data. Further, to use this class, each client - * must override {@link #itemAdded(Object)} in order to process the data as it arrives. + * {@link #size()} will reflect having no data. * * @param the type of the item being accumulated */ @@ -38,7 +37,7 @@ public class CallbackAccumulator implements Accumulator { /** * Constructor * - * @param consumer the consumer that will get called each time an item is addded + * @param consumer the consumer that will get called each time an item is added */ public CallbackAccumulator(Consumer consumer) { this.consumer = Objects.requireNonNull(consumer, "Consumer callback cannot be null"); diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/DoubleArrayArray.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/DoubleArrayArray.java index 31f9e2c5d7..0fc906b916 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/DoubleArrayArray.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/DoubleArrayArray.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -90,7 +89,6 @@ public class DoubleArrayArray implements Array, Serializable { * @return The double array at the given index. An empty array will * be returned for any index not initialized to * another value. - * @exception throws IndexOutOfBoundsException if the index is negative */ public double[] get(int index) { if (index <= starts.length) { @@ -108,7 +106,6 @@ public class DoubleArrayArray implements Array, Serializable { } /** Removes the array at the given index * @param index index of the array to be removed - * @exception throws IndexOutOfBoundsException if the index is negative */ public void remove(int index) { try { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntArrayList.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntArrayList.java index bf2e085083..92f7de828c 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntArrayList.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/IntArrayList.java @@ -63,7 +63,7 @@ public class IntArrayList implements Serializable, Saveable { * @param value value to store * * @throws IndexOutOfBoundsException - * if the index is negative OR index > size + * if the index is negative OR index > size */ public void add(int index, int value) { if (index < 0 || index > size) { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongArrayList.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongArrayList.java index 3b13327374..2c350743e8 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongArrayList.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/LongArrayList.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -121,7 +120,7 @@ public class LongArrayList implements List { return longs[index]; } /** - * @see ghidra.util.datastruct.LongArrayListIf#set(int, long) + * @see LongArraySubList#set(int, long) */ public Long set(int index, Long value) { if (index < 0 || index >= size) { @@ -133,7 +132,7 @@ public class LongArrayList implements List { } /** - * @see ghidra.util.datastruct.LongArrayListIf#clear() + * @see LongArraySubList#clear() */ public void clear() { size = 0; @@ -141,14 +140,14 @@ public class LongArrayList implements List { } /** - * @see ghidra.util.datastruct.LongArrayListIf#size() + * @see LongArraySubList#size() */ public int size() { return size; } /** - * @see ghidra.util.datastruct.LongArrayListIf#toArray() + * @see LongArraySubList#toArray() */ public Long [] toArray() { Long[] values = new Long[size]; diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/RedBlackTree.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/RedBlackTree.java index a671007d7d..60786cf158 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/RedBlackTree.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/RedBlackTree.java @@ -38,7 +38,6 @@ public class RedBlackTree, V> implements Iterable implements Iterable { * Returns the element at the specified depth in this stack. * 0 indicates the bottom of the stack. * size()-1 indicates the top of the stack. - * @param index the depth in the stack. + * @param depth the depth in the stack. * @return the element at the specified depth in this stack */ public E get(int depth) { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/exception/MultipleCauses.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/exception/MultipleCauses.java index 862e965e07..0d2834a4f9 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/exception/MultipleCauses.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/exception/MultipleCauses.java @@ -36,7 +36,7 @@ public class MultipleCauses extends Throwable { /** * Constructs a new MultipleCauses wrapper with no causes - * @note it is rude to leave this empty + * NOTE: it is rude to leave this empty */ public MultipleCauses() { super("Multiple Causes"); @@ -64,7 +64,7 @@ public class MultipleCauses extends Throwable { /** * Returns the causes of the parent throwable (possibly an empty collection) * @return the collection of causes of the parent throwable - * @note it is rude to leave this empty. If the parent throwable has no cause, or the cause is + * NOTE: it is rude to leave this empty. If the parent throwable has no cause, or the cause is * unknown, leave its cause null. */ public synchronized Collection getCauses() { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/filechooser/ExtensionFileFilter.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/filechooser/ExtensionFileFilter.java index 170a693d60..a2e29ac282 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/filechooser/ExtensionFileFilter.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/filechooser/ExtensionFileFilter.java @@ -32,7 +32,7 @@ import java.util.Hashtable; *

        *     GhidraFileChooser chooser = new GhidraFileChooser();
        *     ExtensionFileFilter filter = new ExtensionFileFilter(
      - *                   new String{"gif", "jpg"}, "JPEG & GIF Images")
      + *                   new String{"gif", "jpg"}, "JPEG and GIF Images")
        *     chooser.addFileFilter(filter);
        *
      */ @@ -78,8 +78,8 @@ public class ExtensionFileFilter implements GhidraFileFilter { */ public ExtensionFileFilter(String[] filters, String description) { this.filters = new Hashtable(filters.length); - for (int i = 0; i < filters.length; i++) { - addExtension(filters[i]);//add filters one by one + for (String filter : filters) { + addExtension(filter);//add filters one by one } setDescription(description); } diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/DepthFirstSearch.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/DepthFirstSearch.java index 2386346cce..a5ecfe9319 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/DepthFirstSearch.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/DepthFirstSearch.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -389,7 +388,7 @@ public class DepthFirstSearch * portion of the graph with the following * property: *
        - *
      1. If the graph is acyclic then v[i] -> v[j] => i < j .
      2. + *
      3. {@literal If the graph is acyclic then v[i] -> v[j] => i < j .}
      4. *
      5. If the graph contains cycles, then the above is true except when * (v[i],v[j]) is a back edge.
      6. *
      diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/SimpleWeightedDigraph.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/SimpleWeightedDigraph.java index 514d86e082..64c04512ca 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/SimpleWeightedDigraph.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/SimpleWeightedDigraph.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +19,7 @@ package ghidra.util.graph; * * A simple graph is a graph with no parallel edges or loops. This class models * a simple digraph -- edges are directed and a single edge may go from any vertex - * to any other vertex. It is possible to have edges A-->B and B-->A however. + * to any other vertex. {@literal It is possible to have edges A-->B and B-->A however.} * Attempting to add an edge from A to B when an edge from A to B already exists * causes the edge weight to be increased by the defaultEdgeWeight or the weight * specified. diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/attributes/ObjectAttribute.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/attributes/ObjectAttribute.java index 6117a4af23..150fdb6c82 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/attributes/ObjectAttribute.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/attributes/ObjectAttribute.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,9 +59,8 @@ public class ObjectAttribute extends Attribute { return false; } - /** Return the value associated to the specified KeyedObject. - * @throws NoValueException if the value has not been set or - * the KeyedObject does not belong to the owningSet. + /** + * Return the value associated to the specified KeyedObject. */ public Object getValue(KeyedObject o) //throws NoValueException { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/attributes/StringAttribute.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/attributes/StringAttribute.java index bc2df77937..1478f8b404 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/attributes/StringAttribute.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/graph/attributes/StringAttribute.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,9 +60,8 @@ public class StringAttribute extends Attribute { return false; } - /** Return the value associated to the specied KeyedObject. - * @throws NoValueException if the value has not been set or - * the KeyedObject does not belong to the owningSet. + /** + * Return the value associated to the specied KeyedObject. */ public String getValue(KeyedObject o) //throws NoValueException { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/html/HtmlLineSplitter.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/html/HtmlLineSplitter.java index 18d549b96c..0c7a98bd5c 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/html/HtmlLineSplitter.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/html/HtmlLineSplitter.java @@ -47,7 +47,7 @@ public class HtmlLineSplitter { * @param maxLineLength the max desired length of each output line; 0 or less signals not * to wrap the line based upon length * @return the new lines - * @see #wrap(String, int) + * @see #wrap(String, int, WhitespaceHandler) * @see #split(String, int, boolean) */ public static List split(String text, int maxLineLength) { @@ -66,7 +66,7 @@ public class HtmlLineSplitter { * @param retainSpacing true signals to keep whitespace on line breaks; false discards * leading whitespace * @return the new lines - * @see #wrap(String, int) + * @see #wrap(String, int, WhitespaceHandler) */ public static List split(String text, int maxLineLength, boolean retainSpacing) { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/task/SwingRunnable.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/task/SwingRunnable.java index 9fa400a449..f92b94870e 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/task/SwingRunnable.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/task/SwingRunnable.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +21,8 @@ package ghidra.util.task; * Pass a SwingRunnable to the RunManager if follow on work needs to be done * after the run() method completes. * -* @see RunManager#run(MonitoredRunnable, String) -* @see ghidra.util.task.RunManager#run(MonitoredRunnable, String, int) +* @see RunManager#runNext(MonitoredRunnable, String) +* @see RunManager#runNext(MonitoredRunnable, String, int) * */ diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/task/SwingUpdateManager.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/task/SwingUpdateManager.java index ed49101ab1..4603df1ecf 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/task/SwingUpdateManager.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/task/SwingUpdateManager.java @@ -42,9 +42,9 @@ import utilities.util.reflection.ReflectionUtilities; *
    • Non-blocking update now - this is a conceptual use-case, where the client wishes to perform an * immediate update, but not during the current Swing event. To achieve * this, you could call something like: - *
      + *                          
      {@literal
        *                          	SwingUtilities.invokeLater(() -> updateManager.updateNow());
      - *                          
      + * }
      *
    • * * diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/worker/AbstractWorker.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/worker/AbstractWorker.java index fcb099f5e3..4c61e86d1b 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/worker/AbstractWorker.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/worker/AbstractWorker.java @@ -215,8 +215,8 @@ public abstract class AbstractWorker { * Warning: Calling this method may leave the program in a bad * state. Thus, it is recommended that you only do so when you known that any job that * could possibly be scheduled does not manipulate sensitive parts of the program; for - * example, opening file handles that should be closed before finishing. - *

      + * example, opening file handles that should be closed before finishing. + *

      * If you are unsure * about whether your jobs handle interrupt correctly, then don't use this method. * diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/XmlAttributes.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/XmlAttributes.java index 0cbb3608e2..f6009d197a 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/XmlAttributes.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/XmlAttributes.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +28,7 @@ import java.math.BigInteger; * attrs.add("BAR", "foo"); * attrs.add("PI", 3.14159); *
      - * The output would be: FIVE="0x20" BAR="foo" PI="3.14159". + * The output would be: FIVE="0x20" BAR="foo" PI="3.14159". * */ public class XmlAttributes { diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/XmlUtilities.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/XmlUtilities.java index 2f4727bc1b..485a919e87 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/XmlUtilities.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/xml/XmlUtilities.java @@ -652,7 +652,7 @@ public class XmlUtilities { * * @param ele the parent element * @param childName the name of the children elements to return - * @return List of elements + * @return {@literal List} of elements */ public static List getChildren(Element ele, String childName) { return CollectionUtils.asList(ele.getChildren(childName), Element.class); diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/xml/XmlPullParserFactory.java b/Ghidra/Framework/Generic/src/main/java/ghidra/xml/XmlPullParserFactory.java index 9802b98f9e..4c0421f880 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/xml/XmlPullParserFactory.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/xml/XmlPullParserFactory.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +33,7 @@ public class XmlPullParserFactory { * * @param input * the input XML stream - * @param name + * @param inputName * the name of the stream * @param errHandler * the XML error handler @@ -100,8 +99,6 @@ public class XmlPullParserFactory { * true if the parse should validate against the DTD * @throws SAXException * if an XML parse error occurs - * @throws IOException - * if an i/o error occurs */ public static XmlPullParser create(String input, String inputName, ErrorHandler errHandler, boolean validate) throws SAXException { diff --git a/Ghidra/Framework/Generic/src/main/java/log/Log4jDevelopmentPatternConverter.java b/Ghidra/Framework/Generic/src/main/java/log/Log4jDevelopmentPatternConverter.java index e000da5b93..4ce2381679 100644 --- a/Ghidra/Framework/Generic/src/main/java/log/Log4jDevelopmentPatternConverter.java +++ b/Ghidra/Framework/Generic/src/main/java/log/Log4jDevelopmentPatternConverter.java @@ -31,7 +31,7 @@ import utilities.util.reflection.ReflectionUtilities; * of the current log message. This is to be used in log4j configurations as part * of a pattern layout. eg: * - * + * {@literal } * * See generic.log4jdev.xml for a working example. */ diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GEdge.java b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GEdge.java index f25510feba..3bc790d49b 100644 --- a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GEdge.java +++ b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GEdge.java @@ -25,7 +25,7 @@ public interface GEdge { /** * Get the start, or tail, of the edge * - *

      In the edge x -> y, x is the start + *

      In the edge x -> y, x is the start * * @return the start */ @@ -34,7 +34,7 @@ public interface GEdge { /** * Get the end, or head, of the edge * - *

      In the edge x -> y, y is the end + *

      In the edge x -> y, y is the end * * @return the end */ diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GImplicitDirectedGraph.java b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GImplicitDirectedGraph.java index 29cbec3abd..0cae240425 100644 --- a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GImplicitDirectedGraph.java +++ b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GImplicitDirectedGraph.java @@ -35,8 +35,8 @@ public interface GImplicitDirectedGraph> { * * (Optional operation) * - * @note This method ought to return cached results if available - * @note As part of computing in-edges, this method will also provide predecessors + * NOTE: This method ought to return cached results if available + * NOTE: As part of computing in-edges, this method will also provide predecessors * * @param v the destination vertex * @return the in-edges to the given vertex @@ -46,8 +46,8 @@ public interface GImplicitDirectedGraph> { /** * Compute the incident edges that start at the given vertex * - * @note This method ought to return cached results if available - * @note As part of computing out-edges, this method will also provide successors + * NOTE: This method ought to return cached results if available + * NOTE: As part of computing out-edges, this method will also provide successors * * @param v the source vertex * @return the out-edges from the given vertex @@ -59,7 +59,7 @@ public interface GImplicitDirectedGraph> { * * The default implementation computes this from the in-edges * - * @note If a non-default implementation is provided, it ought to return cached results if + * NOTE: If a non-default implementation is provided, it ought to return cached results if * available * * @param v the destination vertex @@ -78,7 +78,7 @@ public interface GImplicitDirectedGraph> { * * The default implementation compute this from the out-edges * - * @note If a non-default implementation is provided, it ought to return cached results if + * NOTE: If a non-default implementation is provided, it ought to return cached results if * available * * @param v the source vertex diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GWeightedEdge.java b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GWeightedEdge.java index e89768ac29..48ddf3c280 100644 --- a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GWeightedEdge.java +++ b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/GWeightedEdge.java @@ -18,7 +18,7 @@ package ghidra.graph; /** * An edge having a natural weight * - * param the type of vertices + * @param the type of vertices */ public interface GWeightedEdge extends GEdge { /** diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/algo/DijkstraShortestPathsAlgorithm.java b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/algo/DijkstraShortestPathsAlgorithm.java index d1103f628d..c73f25e378 100644 --- a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/algo/DijkstraShortestPathsAlgorithm.java +++ b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/algo/DijkstraShortestPathsAlgorithm.java @@ -60,7 +60,6 @@ public class DijkstraShortestPathsAlgorithm> { * likely encounter a {@link ClassCastException}. * * @param graph the graph - * @param maxDistance the maximum distance, or null for no maximum */ public DijkstraShortestPathsAlgorithm(GImplicitDirectedGraph graph) { this.graph = graph; @@ -87,7 +86,6 @@ public class DijkstraShortestPathsAlgorithm> { * Use Dijstra's algorithm on the given graph with a custom edge weight metric * * @param graph the graph - * @param maxDistance the maximum distance, or null for no maximum * @param metric the function to compute the weight of an edge */ public DijkstraShortestPathsAlgorithm(GImplicitDirectedGraph graph, diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/event/VisualGraphChangeListener.java b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/event/VisualGraphChangeListener.java index 842a01ee07..00d4e56520 100644 --- a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/event/VisualGraphChangeListener.java +++ b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/event/VisualGraphChangeListener.java @@ -37,14 +37,14 @@ public interface VisualGraphChangeListener { /** * Called when the given edges have been added from the graph * - * @param vertices the added edges + * @param edges the added edges */ public void edgesAdded(Iterable edges); /** * Called when the given edges have been removed from the graph * - * @param vertices the removed edges + * @param edges the removed edges */ public void edgesRemoved(Iterable edges); } diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/featurette/VisualGraphFeaturette.java b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/featurette/VisualGraphFeaturette.java index 3d28f32f8f..8809b863f6 100644 --- a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/featurette/VisualGraphFeaturette.java +++ b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/featurette/VisualGraphFeaturette.java @@ -50,7 +50,7 @@ public interface VisualGraphFeaturette

      Implementation Notes
      + *

      Implementation Notes

      * - *

      Jung Vertex/Edge Rendering

      + *

      Jung Vertex/Edge Rendering

      *

      Jung creates shapes for vertices (see {@link VertexShapeFactory}) that are centered. They * do this by getting the width/height of the shape and then creating an x/y value that is * half of the width and height, respectively. This has the effect of the vertex appearing @@ -55,7 +55,7 @@ import ghidra.graph.viewer.vertex.VisualGraphVertexShapeTransformer; * Jung's. *

      If we ever decide instead to not center our shapes, then this renderer would have to be * updated to itself center the edge shape created herein, like this: - *

      + * 
      {@literal
        * 		Rectangle b1 = s1.getBounds();
        *		Rectangle b2 = s2.getBounds();
        *
      @@ -70,7 +70,7 @@ import ghidra.graph.viewer.vertex.VisualGraphVertexShapeTransformer;
        *		float tx2 = x2 + w2;
        *		float ty2 = y2 + h2;
        * 		Shape edgeShape = getEdgeShape(rc, graph, e, tx1, ty1, tx2, ty2, isLoop, xs1);
      - * 
      + * }
      *

      Also, there are other spots in the system where we account for this center that would * have to be changed, such as the {@link AbstractVisualGraphLayout}, which needs the centering * offsets to handle vertex clipping. diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/layout/GridLocationMap.java b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/layout/GridLocationMap.java index 91e7e1961e..65b0f74954 100644 --- a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/layout/GridLocationMap.java +++ b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/layout/GridLocationMap.java @@ -29,7 +29,7 @@ import org.apache.commons.collections4.map.LazyMap; * class are row, column grid values, starting at 0,0. * *

      Note: the Point2D values for the edge articulations use x,y values that are row and - * column index values, the same values as calling {@link #row(V)} and {@link #col(V)}. + * column index values, the same values as calling {@link #row(Object) row(V)} and {@link #col(Object) col(V)}. * *

      After building the grid using this class, clients can call {@link #rows()} to get * high-order object that represent rows. diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/layout/Row.java b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/layout/Row.java index 2c27a46509..527f9ffefa 100644 --- a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/layout/Row.java +++ b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/layout/Row.java @@ -29,7 +29,7 @@ import ghidra.graph.viewer.GraphViewerUtils; * of a grid. * *

      This class maintains a collection of vertices on this row, organized by column index. You - * can get the column of a vertex from {@link #getColumn(V)}. + * can get the column of a vertex from {@link #getColumn(Object) getColumn(V)}. */ public class Row { @@ -131,7 +131,7 @@ public class Row { * Returns all vertices in this row, sorted by column index (min to max). * *

      Note: the index of a vertex in the list does not match the column index. To get the - * column index for a vertex, call {@link #getColumn(V)}. + * column index for a vertex, call {@link #getColumn(Object) getColumn(V)}. * * @return all vertices in this row */ diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/layout/VisualGraphLayout.java b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/layout/VisualGraphLayout.java index 070f2dfb88..327061b03f 100644 --- a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/layout/VisualGraphLayout.java +++ b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/layout/VisualGraphLayout.java @@ -34,7 +34,6 @@ import ghidra.util.task.TaskMonitor; * * @param the vertex type * @param the edge type - * @param the graph type */ //@formatter:off public interface VisualGraphLayout{@link VisualEdge#articulations What are articulations?} + *

      What are articulations? * * @return true if this layout uses articulated edges. - * @see ArticulatedEdge */ public boolean usesEdgeArticulations(); diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/vertex/VertexFocusListener.java b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/vertex/VertexFocusListener.java index 8fa9c79526..11f5fc0f73 100644 --- a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/vertex/VertexFocusListener.java +++ b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/vertex/VertexFocusListener.java @@ -19,7 +19,6 @@ package ghidra.graph.viewer.vertex; * A listener called when a vertex is focused. * * @param the vertex type - * @param the edge type */ public interface VertexFocusListener { diff --git a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/vertex/VisualGraphVertexShapeTransformer.java b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/vertex/VisualGraphVertexShapeTransformer.java index 78e7cfdb37..60cd288665 100644 --- a/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/vertex/VisualGraphVertexShapeTransformer.java +++ b/Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/vertex/VisualGraphVertexShapeTransformer.java @@ -53,7 +53,7 @@ public class VisualGraphVertexShapeTransformer * Returns the full (the actual) shape of a vertex. This can be used to determine if a * mouse point intersects a vertex or to get the real bounding-box of a vertex. * - * @param the vertex + * @param v the vertex * @return the shape */ public Shape transformToFullShape(V v) { diff --git a/Ghidra/Framework/Help/src/main/java/help/validator/model/TOCItemDefinition.java b/Ghidra/Framework/Help/src/main/java/help/validator/model/TOCItemDefinition.java index 16921a8f89..c6e247c023 100644 --- a/Ghidra/Framework/Help/src/main/java/help/validator/model/TOCItemDefinition.java +++ b/Ghidra/Framework/Help/src/main/java/help/validator/model/TOCItemDefinition.java @@ -20,7 +20,7 @@ import java.nio.file.Path; import help.validator.LinkDatabase; /** - * A representation of the tag, which is a way to define a TOC item entry in + * A representation of the {@literal } tag, which is a way to define a TOC item entry in * a TOC_Source.xml file. */ public class TOCItemDefinition extends TOCItem { diff --git a/Ghidra/Framework/Help/src/main/java/help/validator/model/TOCItemReference.java b/Ghidra/Framework/Help/src/main/java/help/validator/model/TOCItemReference.java index 7d6ede88bf..e3f1cd1fa8 100644 --- a/Ghidra/Framework/Help/src/main/java/help/validator/model/TOCItemReference.java +++ b/Ghidra/Framework/Help/src/main/java/help/validator/model/TOCItemReference.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +20,7 @@ import help.validator.LinkDatabase; import java.nio.file.Path; /** - * A representation of the tag, which is a way to reference a TOC item entry in + * A representation of the {@literal } tag, which is a way to reference a TOC item entry in * a TOC_Source.xml file other than the one in which the reference lives. */ public class TOCItemReference extends TOCItem implements Comparable { diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/app/merge/MergeProgressModifier.java b/Ghidra/Framework/Project/src/main/java/ghidra/app/merge/MergeProgressModifier.java index 330ed701a7..8e7c17befe 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/app/merge/MergeProgressModifier.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/app/merge/MergeProgressModifier.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,12 +19,10 @@ public interface MergeProgressModifier { /** * Updates the current phase progress area in the default merge panel. - * @param currentProgressPercentage the progress percentage completed for the current phase. - * This should be a value from 0 to 100. * @param progressMessage a message indicating what is currently occurring in this phase. * Null indicates to use the default message. */ - public void updateProgress(final String description); + public void updateProgress(final String progressMessage); /** * Updates the current phase progress area in the default merge panel. diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/core/help/AboutDomainObjectUtils.java b/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/core/help/AboutDomainObjectUtils.java index 862966b8c4..03142d5c20 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/core/help/AboutDomainObjectUtils.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/core/help/AboutDomainObjectUtils.java @@ -44,13 +44,12 @@ public class AboutDomainObjectUtils { * Displays an informational dialog about the specified domain object * * @param tool plugin tool - * @param domainObject domain object to display information about + * @param domainFile domain file to display information about + * @param metadata the metadata for the domainFile * @param title title to use for the dialog * @param additionalInfo additional custom user information to append to * the bottom of the dialog - * @param shouldParent true means that about dialog will be parented - * to parent, false means that only - * the location will be set relative to parent + * @param helpLocation the help location */ public static void displayInformation(PluginTool tool, DomainFile domainFile, Map metadata, String title, String additionalInfo, diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/DomainObjectMergeManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/DomainObjectMergeManager.java index 10183ab41a..ca97a0adc6 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/DomainObjectMergeManager.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/DomainObjectMergeManager.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +39,8 @@ public interface DomainObjectMergeManager extends MergeProgressModifier { * @param infoType the string indicating the type of resolve information * @param infoObject the object for the named string. This information is * determined by the merge manager that creates it. - * @see getResolveInformation(String) + * @see ghidra.app.merge.MergeManager#getResolveInformation(String) + * MergeManager.getResolveInformation(String) */ public void setResolveInformation(String infoType, Object infoObject); diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/GhidraFolderData.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/GhidraFolderData.java index 5557deec20..609b16dc1a 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/GhidraFolderData.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/GhidraFolderData.java @@ -760,9 +760,8 @@ class GhidraFolderData { /** * Check for existence of file. If folder visited, rely on fileDataCache - * @param fileName - * @param doRealCheck if true do not rely on fileList - * @return + * @param fileName the name of the file to check for + * @return true if this folder contains the fileName * @throws IOException */ public boolean containsFile(String fileName) throws IOException { diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/ProjectFileManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/ProjectFileManager.java index d54fd41062..593dbd79a0 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/ProjectFileManager.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/ProjectFileManager.java @@ -89,7 +89,7 @@ public class ProjectFileManager implements ProjectData { * Constructor for existing projects. * @param localStorageLocator the location of the project * @param isInWritableProject true if project content is writable, false if project is read-only - * @param inProject true if this is the active project + * @param resetOwner true to reset the project owner * @throws IOException if an i/o error occurs * @throws NotOwnerException if inProject is true and user is not owner * @throws FileNotFoundException if project directory not found diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/ToolState.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/ToolState.java index bc3536f3ba..aaed6906e5 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/ToolState.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/data/ToolState.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +30,7 @@ public class ToolState { /** * Construct a new tool state. * @param tool tool's state to save - * @param element element containing tool state + * @param domainObject the object containing the tool state */ public ToolState(PluginTool tool, DomainObject domainObject) { this.tool = tool; diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/EditPluginPathDialog.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/EditPluginPathDialog.java index faa5686da7..f511419714 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/EditPluginPathDialog.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/EditPluginPathDialog.java @@ -109,7 +109,7 @@ class EditPluginPathDialog extends DialogComponentProvider { /** * Define the Main panel for the dialog here. - * @return JPanel the completed Main Panel<\CODE> + * @return JPanel the completed Main Panel */ protected JPanel buildMainPanel() { // give base class the panel it needs to complete its construction diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectAccessPanel.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectAccessPanel.java index 565f65ec7f..d26ecf2a8c 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectAccessPanel.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectAccessPanel.java @@ -40,9 +40,11 @@ import util.CollectionUtils; * Panel that shows the users for a given repository and the users associated with the current * shared project. There are 3 main sub-panels: *

      + *

        *
      • Known Users Panel: Displays all users in the repository
      • *
      • Button Panel: Provides buttons for adding/removing users from the project
      • *
      • User Access Panel: Displays all users on the project, and their access permissions
      • + *
      *

      * If the current user is an admin, he may change user permissions and add/remove them * from the project. If not, only the User Access Panel will be visible and it will @@ -70,7 +72,7 @@ public class ProjectAccessPanel extends AbstractWizardJPanel { /** * Construct a new panel from a {@link RepositoryAdapter} instance. * - * @param knownUser names of the users that are known to the remote server + * @param knownUsers names of the users that are known to the remote server * @param repository the repository adapter instance * @param tool the current tool * @throws IOException if there's an error processing the repository user list diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/CheckInTask.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/CheckInTask.java index 860a9c39ee..1f283a3a60 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/CheckInTask.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/CheckInTask.java @@ -45,7 +45,6 @@ public class CheckInTask extends VersionControlTask implements CheckinHandler { * Construct a new CheckInTask. * @param tool tool that has the files to be checked in * @param list list of domain files to be checked in - * @param taskListener listener that is notified when this task completes * @param parent parent of error dialog if an error occurs */ public CheckInTask(PluginTool tool, List list, Component parent) { diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/event/FVEvent.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/event/FVEvent.java index c3a14add0c..744e6aa4a5 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/event/FVEvent.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/event/FVEvent.java @@ -17,7 +17,7 @@ package ghidra.framework.main.logviewer.event; /** * Custom events to be used in conjunction with the {@link FVEventListener} module. Users should - * construct an event, then fire it using {@link FVEventListener#sendEvent(FVEvent)}. + * construct an event, then fire it using {@link FVEventListener#send(FVEvent)}. * * Two items are passed along with each event: * - The {@link #eventType} attribute specifies the event that is being fired. diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/FVSlider.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/FVSlider.java index c4d15a5c0a..0b3f22c95f 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/FVSlider.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/FVSlider.java @@ -29,21 +29,22 @@ import ghidra.framework.main.logviewer.model.*; import ghidra.util.Msg; /** - * Custom slider that acts as the scroll bar for the {@link FVTable}. This slider listens for + *

       Custom slider that acts as the scroll bar for the FVTable. This slider listens for
        * changes to the viewport and updates its position accordingly.
        * 
      - * Q. Why not just use the standard {@link JScrollbar} that comes with the {@link JScrollPane}?  
      + * Q. Why not just use the standard {@link javax.swing.JScrollBar JScrollBar} that comes with the {@link JScrollPane}?
        * 
      - * A. It's because we are viewing only a portion of the total file at any given time; if we used the
      - *    standard scroll mechanism, it would size itself and its viewport according to that subset
      - * 	  of the total file, while we want it to reflect the file in its entirety.
      + * A. It's because we are viewing only a portion of the total file at any given time.
      + *    If we used the standard scroll mechanism, it would size itself and its viewport
      + *    according to that subset of the total file, while we want it to reflect the file
      + *    in its entirety.
        * 
      - * Q. Why extend a JSlider for this custom scroll bar instead of a JScrollBar?  
      - * 
      - * A. The JSlider is much easier to customize, specifically when trying to adjust the size of the
      - *    slider thumb. Functionally they are both acceptable for our purposes, but the ease of using
      - *    the slider wins out.
      + * Q. Why extend a {@link JSlider} for this custom scroll bar instead of a {@link JScrollBar}?
        * 
      + * A. The {@link JSlider} is much easier to customize, specifically when trying to adjust
      + *    the size of the slider thumb. Functionally they are both acceptable for our
      + *    purposes, but the ease of using the slider wins out.
      + * 
      */ public class FVSlider extends JSlider implements ChangeListener, MouseMotionListener, MouseListener { diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/FileViewer.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/FileViewer.java index f070a96c88..8726422449 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/FileViewer.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/FileViewer.java @@ -39,7 +39,7 @@ import utilities.util.FileUtilities; * Notes: * 1. The viewer consists of a simple JTable and a custom JSlider. The table displays lines of * text described by {@link Chunk} objects. The number of chunks visible at any given time - * is restricted by the {@link Chunk#MAX_VISIBLE_CHUNKS} property. + * is restricted by the {@link ChunkModel#MAX_VISIBLE_CHUNKS} property. * * 2. Because only part of the file is loaded into the viewable table at any given time, the * built-in scrollbar associated with the scrollpane cannot be used. We want the scroll bar diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/ReloadDialog.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/ReloadDialog.java index ff2d6fc31a..d9031bbbea 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/ReloadDialog.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/ReloadDialog.java @@ -30,8 +30,9 @@ import ghidra.framework.main.logviewer.event.FVEventListener; * Simple warning dialog for letting the user know when the input file has been updated. This * includes an option allowing the user to opt-out of seeing subsequent pop-ups. * - * Note: The Ghidra {@link OptionPanel} is not sufficient for this as it doesn't allow for - * custom objects to be displayed (the opt-out checkbox). + * Note: The Ghidra {@link docking.options.editor.OptionsPanel OptionsPanel} + * is not sufficient for this as it doesn't allow for custom objects to be + * displayed (the opt-out checkbox). * */ public class ReloadDialog extends JDialog { diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/ViewportUtility.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/ViewportUtility.java index a49e83233f..9105e2f39a 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/ViewportUtility.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/ViewportUtility.java @@ -31,7 +31,7 @@ import ghidra.util.Msg; /** * Utility class for managing the viewport in the {@link FVTable}. This viewport must be * adjusted manually whenever {@link Chunk} objects are added to or removed from to the view, - * or whenever the {@link FVScrollBar} is moved. + * or whenever the {@link FVSlider} is moved. * */ public class ViewportUtility implements Observer { @@ -175,7 +175,6 @@ public class ViewportUtility implements Observer { * * @param rows * @param selection - * @return */ public void moveViewportUp(int rows, boolean selection) { @@ -254,7 +253,6 @@ public class ViewportUtility implements Observer { * * @param rows * @param selection - * @return */ public void moveViewportDown(int rows, boolean selection) { diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/projectdata/actions/VersionControlCheckInAction.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/projectdata/actions/VersionControlCheckInAction.java index d1a03a60bd..143a3d7edf 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/projectdata/actions/VersionControlCheckInAction.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/projectdata/actions/VersionControlCheckInAction.java @@ -105,7 +105,6 @@ public class VersionControlCheckInAction extends VersionControlAction { * Check in the list of domain files. * Domain files that cannot be closed are skipped in the list. * @param fileList list of DomainFile objects - * @param listener the task listener that is notified when task completes */ public void checkIn(List fileList) { diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/DomainFile.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/DomainFile.java index 65d9822b3b..a825f22190 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/DomainFile.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/DomainFile.java @@ -308,7 +308,6 @@ public interface DomainFile extends Comparable { /** * Return the latest version - * @throws IOException thrown if an IO or access error occurs. */ public int getLatestVersion(); diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/DomainFolder.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/DomainFolder.java index 566b3ccc09..4b2274ca18 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/DomainFolder.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/DomainFolder.java @@ -181,7 +181,7 @@ public interface DomainFolder extends Comparable { /** * Copy this folder into the newParent folder. * @param newParent new parent folder - * @param new folder + * @param monitor the task monitor * @throws DuplicateFileException if a folder or file by * this name already exists in the newParent folder * @throws IOException thrown if an IO or access error occurs. diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectData.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectData.java index a19305485d..affeb67057 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectData.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectData.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -88,12 +87,11 @@ public interface ProjectData { public DomainFile getFileByID(String fileID); /** - * Get a GhidraURL for a shared domain file which is available + * Get a URL for a shared domain file which is available * within a remote repository. * @param path the absolute path of domain file relative to the root folder. * @return URL object for accessing shared file from outside of a project, or * null if file does not exist or is not shared. - * @see ghidra.framework.data.URLGhidraRepository */ public URL getSharedFileURL(String path); @@ -177,7 +175,7 @@ public interface ProjectData { public void close(); /** - * @returns the maximum name length permitted for folders or items. + * @return the maximum name length permitted for folders or items. */ public int getMaxNameLength(); diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectDataUtils.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectDataUtils.java index 1c77c7e410..83fe922ec4 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectDataUtils.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ProjectDataUtils.java @@ -95,7 +95,7 @@ public class ProjectDataUtils { } /** - * Recursively traverse the {@link DomainFolders}s under a specific {@link DomainFolder}. + * Recursively traverse the {@link DomainFolder}s under a specific {@link DomainFolder}. * * @param startFolder */ @@ -140,7 +140,7 @@ public class ProjectDataUtils { } /** - * Returns a {@link Iterable} sequence of all the {@link DomainFolders}s that exist under + * Returns a {@link Iterable} sequence of all the {@link DomainFolder}s that exist under * the specified {@link DomainFolder folder}. * @param folder * @return diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ToolListener.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ToolListener.java index 8b197a4bc1..fdc017e78d 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ToolListener.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ToolListener.java @@ -18,16 +18,16 @@ package ghidra.framework.model; import ghidra.framework.plugintool.PluginEvent; /** - * Interface to be implemented by objects that want to receive ToolEvents. + * Interface to be implemented by objects that want to receive PluginEvents. * Tools must be registered for a particular event to actually receive it. * - * @see ToolEvent + * @see PluginEvent */ public interface ToolListener { /** - * This method is invoked when the registered ToolEvent event occurs. + * This method is invoked when the registered PluginEvent event occurs. * * @param toolEvent The cross-tool PluginEvent. */ diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ToolServices.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ToolServices.java index 76f82be5a8..bed0424e18 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ToolServices.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/model/ToolServices.java @@ -107,7 +107,6 @@ public interface ToolServices { * Launch the default tool; if domainFile is not null, this file will * be opened in the tool. * @param domainFile the file to open; may be null - * @see #setDefaultTool(ToolTemplate) */ public Tool launchDefaultTool(DomainFile domainFile); diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/ComponentProviderAdapter.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/ComponentProviderAdapter.java index 0bb35b5e55..98d7871407 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/ComponentProviderAdapter.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/ComponentProviderAdapter.java @@ -29,8 +29,9 @@ public abstract class ComponentProviderAdapter extends ComponentProvider { protected PluginTool tool; /** - * Creates a new component provider with a default location of {@link PluginTool#WINDOW}. - * @param windowMgr The window manager that will manage and show this provider. + * Creates a new component provider with a default location of + * {@link docking.WindowPosition#WINDOW WindowPosition.WINDOW}. + * @param tool the plugin tool. * @param name The providers name. This is used to group similar providers into a tab within * the same window. * @param owner The owner of this provider, usually a plugin name. @@ -40,8 +41,9 @@ public abstract class ComponentProviderAdapter extends ComponentProvider { } /** - * Creates a new component provider with a default location of {@link PluginTool#WINDOW}. - * @param windowMgr The window manager that will manage and show this provider. + * Creates a new component provider with a default location of + * {@link docking.WindowPosition#WINDOW WindowPosition.WINDOW}. + * @param tool the plugin tool. * @param name The providers name. This is used to group similar providers into a tab within * the same window. * @param owner The owner of this provider, usually a plugin name. diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/Plugin.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/Plugin.java index 447ba24d20..54ff0fd681 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/Plugin.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/Plugin.java @@ -67,7 +67,8 @@ import ghidra.util.classfinder.ExtensionPoint; * {@link Plugin#registerServiceProvided(Class, Object) registerServiceProvided()}. * (required) *
    • Create Actions (optional) - *
    • Register {@link Options} with the {@link PluginTool#getOptions(String)}. (optional)
      + *
    • Register {@link ghidra.framework.options.Options Options} with the + * {@link PluginTool#getOptions(String)}. (optional)
      * *
    • Other Plugins are constructed, dependencies evaluated, etc.
      * If your dependencies are not available (ie. not installed, threw an exception during their @@ -104,8 +105,7 @@ import ghidra.util.classfinder.ExtensionPoint; * All Plugins must be tagged with a {@link PluginInfo @PluginInfo(...)} annotation. *

      * The annotation gives you the ability to declare a dependency on another Plugin - * via the {@link PluginInfo#servicesRequired() servicesRequired} / - * {@link PluginInfo#servicesUsed() servicesUsed} + * via the {@link PluginInfo#servicesRequired() servicesRequired} *

      * Ghidra will ensure that your Plugin will not be {@link #init() initialized} until all * of its required services are loaded successfully and are available for use when your Plugin @@ -491,7 +491,7 @@ public abstract class Plugin implements ExtensionPoint, PluginEventListener, Ser * Plugins should override this method if they update their state * when a particular service is added. * - * @param interfaceClass The interface of the added service + * @param interfaceClass The interface of the added service * @param service service that is being added */ @Override @@ -505,7 +505,7 @@ public abstract class Plugin implements ExtensionPoint, PluginEventListener, Ser * Plugins should override this method if they update their state * when a particular service is removed. * - * @param interfaceClass The interface of the added service + * @param interfaceClass The interface of the added service * @param service that is being removed. */ @Override diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginInfo.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginInfo.java index 8a94225358..b16899b05c 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginInfo.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginInfo.java @@ -24,7 +24,7 @@ import ghidra.framework.plugintool.util.PluginStatus; *

      * Example: *

      - * @PluginInfo(
      + * @PluginInfo(
        * 	status = PluginStatus.RELEASED,
        * 	packageName = CorePluginPackage.NAME,
        * 	category = PluginCategoryNames.COMMON,
      @@ -32,7 +32,6 @@ import ghidra.framework.plugintool.util.PluginStatus;
        * 	description = "Longer description of plugin.",
        * 	servicesProvided = { ServiceInterfaceThisPluginProvides.class }
        * 	servicesRequired = { RequiredServiceInterface1.class, RequiredServiceInterface2.class },
      - * 	servicesUsed = { OptionalServiceInterface1.class, OptionalServiceInterface2.class },
        * 	eventsConsumed = { SomePluginEvent.class },
        * 	eventsProduced = { AnotherPluginEvent.class },
        * 	isSlowInstallation = false
      @@ -68,6 +67,7 @@ public @interface PluginInfo {
       	 * 
    • PluginCategoryNames.COMMON *
    • PluginCategoryNames.SUPPORT *
    • PluginCategoryNames.etc + * * @return String category */ String category(); diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/StandAloneApplication.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/StandAloneApplication.java index 096cc3b9a0..76e165929a 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/StandAloneApplication.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/StandAloneApplication.java @@ -58,7 +58,7 @@ public abstract class StandAloneApplication implements GenericStandAloneApplicat * The given properties file is expected to have the * {@link ApplicationProperties#APPLICATION_NAME_PROPERTY} and * {@link ApplicationProperties#APPLICATION_VERSION_PROPERTY} properties - * set. + * set. * * @param propertiesFilename the name of the properties file. */ diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/ExtensionUtils.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/ExtensionUtils.java index 7f1d367f94..f67c3c8744 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/ExtensionUtils.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/ExtensionUtils.java @@ -945,7 +945,7 @@ public class ExtensionUtils { * Attempts to delete any extension directories that do not contain a Module.manifest * file. This indicates that the extension was slated to be uninstalled by the user. * - * @see ExtensionTableModel#uninstallExtension + * @see #uninstall */ public static void cleanupUninstalledExtensions() { if (SystemUtilities.isInDevelopmentMode()) { diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/OptionsManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/OptionsManager.java index 33048e6625..909043b0b2 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/OptionsManager.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/OptionsManager.java @@ -132,7 +132,7 @@ public class OptionsManager implements OptionsService, OptionsChangeListener { /** * Deregister the owner from the options; if options are empty, then * remove the options from the map. - * @param owner owner name + * @param ownerPlugin the owner plugin */ //TODO anyone using this Or should they be? public void deregisterOwner(Plugin ownerPlugin) { diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/util/OptionsService.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/util/OptionsService.java index f8f6bb5e41..02de3a8681 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/util/OptionsService.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/util/OptionsService.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,8 +49,8 @@ public interface OptionsService { * expected to be the name of a node in the options tree, residing under the root node. You * may also provide the name of such a node, followed by the options delimiter, followed by * the name of a child node under that node. For example, suppose in the options tree exists - * a node
      Root->Foo
      You may pass the value "Foo" to get that node. Or, suppose - * in the options tree exists a node
      Root->Foo->childNode1
      In this case, you may + * a node {@literal Root->Foo} You may pass the value "Foo" to get that node. Or, suppose + * in the options tree exists a node {@literal Root->Foo->childNode1} In this case, you may * pass the value "Foo.childNode1", where the '.' character is the delimiter of the * {@link ToolOptions} class (this is the value at the time of writing this documentation). * diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/util/PluginDescription.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/util/PluginDescription.java index 8000c0e74a..df384a2694 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/util/PluginDescription.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/util/PluginDescription.java @@ -170,7 +170,7 @@ public class PluginDescription implements Comparable { /** * Return the description of the plugin. - * @return "" if no description was specified + * @return {@code ""} if no description was specified */ public String getDescription() { return description; @@ -284,9 +284,9 @@ public class PluginDescription implements Comparable { /** * Constructs a new PluginDescription for the given plugin class. *

      - * Deprecated, use {@link PluginInfo @PluginInfo} instead. + * @deprecated, use {@link PluginInfo @PluginInfo} instead. * - * @param pluginClass the class of the plugin + * @param pluginClassParam the class of the plugin * @param status the status, UNSTABLE, STABLE, RELEASED, DEBUG, or EXAMPLE * @param pluginPackage the package to which the plugin belongs (see {@link PluginPackage} * subclasses for examples) diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProject.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProject.java index 45799a8386..6e53c4e81f 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProject.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/project/DefaultProject.java @@ -323,7 +323,7 @@ public class DefaultProject implements Project { /** * Get the local tool chest for the user logged in. * - * @returns the tool chest + * @return the tool chest */ @Override public ToolChest getLocalToolChest() { diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraProtocolHandler.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraProtocolHandler.java index fdde01582a..aa961a3daf 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraProtocolHandler.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraProtocolHandler.java @@ -41,7 +41,7 @@ public abstract class GhidraProtocolHandler implements ExtensionPoint { /** * Get the Ghidra protocol connector for a Ghidra URL which requires this * extension. - * @param url Ghidra protocol URL + * @param ghidraUrl Ghidra protocol URL * @return Ghidra protocol connector * @throws MalformedURLException if URL is invalid */ diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraURL.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraURL.java index fda9bb7f95..cb7ab2d37a 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraURL.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/protocol/ghidra/GhidraURL.java @@ -174,7 +174,7 @@ public class GhidraURL { /** * Create a Ghidra URL from a string form of Ghidra URL or local project path. * This method can consume strings produced by the getDisplayString method. - * @param path project path (/) + * @param projectPathOrURL {@literal project path (/)} * @return local Ghidra project URL * @see #getDisplayString(URL) * @throws IllegalArgumentException invalid path or URL specified @@ -289,7 +289,7 @@ public class GhidraURL { * Create a URL which refers to Ghidra Server repository content. Path may correspond * to either a file or folder. * @param host server host name/address - * @param port optional server port (a value <= 0 refers to the default port) + * @param port optional server port (a value <= 0 refers to the default port) * @param repositoryName repository name * @param repositoryPath absolute folder or file path within repository. * Folder paths should end with a '/' character. @@ -303,7 +303,7 @@ public class GhidraURL { * Create a URL which refers to Ghidra Server repository content. Path may correspond * to either a file or folder. * @param host server host name/address - * @param port optional server port (a value <= 0 refers to the default port) + * @param port optional server port (a value <= 0 refers to the default port) * @param repositoryName repository name * @param repositoryPath absolute folder path within repository. * @param fileName name of a file contained within the specified repository/path @@ -352,7 +352,7 @@ public class GhidraURL { /** * Create a URL which refers to Ghidra Server repository and its root folder * @param host server host name/address - * @param port optional server port (a value <= 0 refers to the default port) + * @param port optional server port (a value <= 0 refers to the default port) * @param repositoryName repository name * @return Ghidra Server repository URL */ diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/task/GTaskManager.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/task/GTaskManager.java index 6c150722a8..ab10f97690 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/task/GTaskManager.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/task/GTaskManager.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,7 +44,7 @@ import java.util.concurrent.locks.ReentrantLock; * Suspending:
      * The GTaskManager can be suspended. When suspended, any currently running task will continue to * run, but no new or currently scheduled tasks will be executed until the GTaskManager is resumed. - * There is a special method, {@link #runNextTaskEvenIfSuspended()}, that will run the next scheduled task + * There is a special method, {@link #runNextTaskEvenWhenSuspended()}, that will run the next scheduled task * even if the GTaskManager is suspended. *

      * Yielding to Other Tasks:
      diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/emulator/EmulatorHelper.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/emulator/EmulatorHelper.java index d95396e973..e2cae89336 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/emulator/EmulatorHelper.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/emulator/EmulatorHelper.java @@ -318,7 +318,7 @@ public class EmulatorHelper implements MemoryFaultHandler, EmulatorConfiguration /** * Establish breakpoint - * @param address memory address for new breakpoint + * @param addr memory address for new breakpoint */ public void setBreakpoint(Address addr) { emulator.getBreakTable().registerAddressCallback(addr, addressBreak); @@ -326,7 +326,7 @@ public class EmulatorHelper implements MemoryFaultHandler, EmulatorConfiguration /** * Clear breakpoint - * @param address memory address for breakpoint to be cleared + * @param addr memory address for breakpoint to be cleared */ public void clearBreakpoint(Address addr) { emulator.getBreakTable().unregisterAddressCallback(addr); @@ -363,8 +363,8 @@ public class EmulatorHelper implements MemoryFaultHandler, EmulatorConfiguration * Register callback for language defined pcodeop (call other). * WARNING! Using this method may circumvent the default CALLOTHER emulation support * when supplied by the Processor module. - * @param pcodeOpName - * @param callback + * @param pcodeOpName the name of the pcode op + * @param callback the callback to register */ public void registerCallOtherCallback(String pcodeOpName, BreakCallBack callback) { emulator.getBreakTable().registerPcodeCallback(pcodeOpName, callback); @@ -374,8 +374,7 @@ public class EmulatorHelper implements MemoryFaultHandler, EmulatorConfiguration * Register default callback for language defined pcodeops (call other). * WARNING! Using this method may circumvent the default CALLOTHER emulation support * when supplied by the Processor module. - * @param pcodeOpName - * @param callback + * @param callback the default callback to register */ public void registerDefaultCallOtherCallback(BreakCallBack callback) { emulator.getBreakTable().registerPcodeCallback("*", callback); @@ -383,7 +382,7 @@ public class EmulatorHelper implements MemoryFaultHandler, EmulatorConfiguration /** * Unregister callback for language defined pcodeop (call other). - * @param pcodeOpName + * @param pcodeOpName the name of the pcode op */ public void unregisterCallOtherCallback(String pcodeOpName) { emulator.getBreakTable().unregisterPcodeCallback(pcodeOpName); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/Assembler.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/Assembler.java index 9b3c72ff96..a05df28c67 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/Assembler.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/Assembler.java @@ -39,7 +39,7 @@ public interface Assembler { * implement this method without a program binding. In that case, the returned instruction * block will refer to pseudo instructions. * - * @note There must be an active transaction on the bound program for this method to succeed. + * NOTE: There must be an active transaction on the bound program for this method to succeed. * * @param at the location where the resulting instructions should be placed * @param listing a new-line separated or array sequence of instructions @@ -136,7 +136,7 @@ public interface Assembler { /** * Assemble a line instruction at the given address. * - * This method works like {@link #resolveLine(Address, String, AssemblyPatternBlock), except + * This method works like {@link #resolveLine(Address, String, AssemblyPatternBlock)}, except * that it derives the context using {@link #getContextAt(Address)}. * @param at the location of the start of the instruction * @param line the textual assembly code @@ -149,7 +149,7 @@ public interface Assembler { /** * Assemble a line instruction at the given address, assuming the given context. * - * This method works like {@link #assembleLine(Address,String,AssemblyPatternBlock}, except + * This method works like {@link #assembleLine(Address, String, AssemblyPatternBlock)}, except * that it returns all possible resolutions for the parse trees that pass the * {@link AssemblySelector}. * @param at the location of the start of the instruction diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/Assemblers.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/Assemblers.java index b2b1ec0fb7..0780eb9936 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/Assemblers.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/Assemblers.java @@ -29,7 +29,7 @@ import ghidra.program.model.listing.Program; * The primary class for obtaining an {@link Assembler} for a Ghidra-supported language. * * The general flow is: First, obtain an assembler for a language or program. Second, call its - * {@link Assembler#assemble(Address, String)} and related methods to perform assembly. More + * {@link Assembler#assemble(Address, String...)} and related methods to perform assembly. More * advanced uses pass a {@link AssemblySelector} to control certain aspects of assembly instruction * selection, and to obtain advanced diagnostics, like detailed errors and code completion. * diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/SleighAssembler.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/SleighAssembler.java index 8e63e41d22..069a17c1b7 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/SleighAssembler.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/SleighAssembler.java @@ -60,7 +60,7 @@ public class SleighAssembler implements Assembler { * @param program the program to bind to (must have same language as parser) * @param parser the parser for the SLEIGH language * @param defaultContext the default context for the language - * @param recGraphs the map of recursion graphs (shared by assemblers of this language) + * @param ctxGraph the context graph */ protected SleighAssembler(AssemblySelector selector, Program program, AssemblyParser parser, AssemblyDefaultContext defaultContext, AssemblyContextGraph ctxGraph) { @@ -76,13 +76,13 @@ public class SleighAssembler implements Assembler { /** * Construct a SleighAssembler. * - * @note This variant does not permit {@link #assemble(Address, String)}. + * NOTE: This variant does not permit {@link #assemble(Address, String...)}. * * @param selector a method of selecting one result from many * @param lang the SLEIGH language (must be same as to create the parser) * @param parser the parser for the SLEIGH language - * @param ctxGraph - * @param recGraphs the map of recursion graphs (shared by assemblers of this language) + * @param defaultContext the default context for the language + * @param ctxGraph the context graph */ protected SleighAssembler(AssemblySelector selector, SleighLanguage lang, AssemblyParser parser, AssemblyDefaultContext defaultContext, AssemblyContextGraph ctxGraph) { @@ -224,7 +224,7 @@ public class SleighAssembler implements Assembler { * A convenience to obtain a map of program labels strings to long values * @return the map * - * @TODO Use a Map instead so that, if possible, symbol values can be checked + * {@literal TODO Use a Map instead so that, if possible, symbol values can be checked} * lest they be an invalid substitution for a given operand. */ protected Map getProgramLabels() { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/SleighAssemblerBuilder.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/SleighAssemblerBuilder.java index 2524963d51..b61f114907 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/SleighAssemblerBuilder.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/SleighAssemblerBuilder.java @@ -75,9 +75,9 @@ import ghidra.util.SystemUtilities; * semantic errors, then the overall result is an error. * * Some productions are "purely recursive," e.g., {@code :^instruction} lines in the SLEIGH. These - * are ignored during parser construction. Let such a production be given as I => I. When resolving + * are ignored during parser construction. Let such a production be given as I => I. When resolving * the parse tree to bytes, and we encounter a production with I on the left hand side, we then - * consider the possible application of the production I => I and its consequential constructors. + * consider the possible application of the production I => I and its consequential constructors. * Ideally, we could repeat this indefinitely, stopping when all further applications result in * semantic errors; however, there is no guarantee in the SLEIGH specification that such an * algorithm will actually halt, so a maximum number (default of 1) of applications are attempted. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/AbstractBinaryExpressionSolver.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/AbstractBinaryExpressionSolver.java index 2992055295..9c92585a26 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/AbstractBinaryExpressionSolver.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/AbstractBinaryExpressionSolver.java @@ -130,7 +130,7 @@ public abstract class AbstractBinaryExpressionSolver /** * Compute the right-hand-side value given that the result and the left are known * - * @note Assumes commutativity by default + * NOTE: Assumes commutativity by default * @param lval the left-hand-side value * @param goal the result * @return the right-hand-side value solution diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/AbstractUnaryExpressionSolver.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/AbstractUnaryExpressionSolver.java index 3765d88a84..c673ee10ea 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/AbstractUnaryExpressionSolver.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/AbstractUnaryExpressionSolver.java @@ -72,7 +72,7 @@ public abstract class AbstractUnaryExpressionSolver /** * Compute the input value given that the result is known * - * @note Assumes an involution by default + * NOTE: Assumes an involution by default * @param goal the result * @return the input value solution */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/AndExpressionSolver.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/AndExpressionSolver.java index 6bacdc76f8..3dfa161324 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/AndExpressionSolver.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/AndExpressionSolver.java @@ -18,7 +18,7 @@ package ghidra.app.plugin.assembler.sleigh.expr; import ghidra.app.plugin.processors.sleigh.expression.AndExpression; /** - * Solves expressions of the form A & B + * Solves expressions of the form {@code A & B} */ public class AndExpressionSolver extends AbstractBinaryExpressionSolver { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/EndInstructionValueSolver.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/EndInstructionValueSolver.java index 2894a42c84..f23f0238e2 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/EndInstructionValueSolver.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/EndInstructionValueSolver.java @@ -27,7 +27,7 @@ import ghidra.app.plugin.processors.sleigh.expression.EndInstructionValue; * Works like the constant solver, but takes the value of {@code inst_next}, which is given by the * assembly address and the resulting instruction length. * - * @note This solver requires backfill. + * NOTE: This solver requires backfill. */ public class EndInstructionValueSolver extends AbstractExpressionSolver { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/LeftShiftExpressionSolver.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/LeftShiftExpressionSolver.java index 6ce6a8f9a6..7db45517c0 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/LeftShiftExpressionSolver.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/LeftShiftExpressionSolver.java @@ -24,7 +24,7 @@ import ghidra.app.plugin.processors.sleigh.expression.LeftShiftExpression; import ghidra.util.Msg; /** - * Solves expressions of the form A << B + * {@literal Solves expressions of the form A << B} */ public class LeftShiftExpressionSolver extends AbstractBinaryExpressionSolver { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/MaskedLong.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/MaskedLong.java index ab84320295..5ea05ef447 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/MaskedLong.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/MaskedLong.java @@ -19,7 +19,7 @@ import ghidra.app.plugin.processors.sleigh.expression.TokenField; import ghidra.util.NumericUtilities; /** - * A 64-bit value where each bit is {@code 0}, {@code 1}, or {@code x} (undefined) + * A {@code 64}-bit value where each bit is {@code 0}, {@code 1}, or {@code x} (undefined) */ public class MaskedLong implements Comparable { public static final MaskedLong ZERO = new MaskedLong(-1, 0); @@ -129,7 +129,7 @@ public class MaskedLong implements Comparable { * Any {@code 0} bit in {@code msk} will result in an undefined bit in the result. {@code 1} * bits result in a copy of the corresponding bit in the result. * - * @param msk the mask to apply + * @param mask the mask to apply * @return the result. */ public MaskedLong mask(long mask) { @@ -519,14 +519,14 @@ public class MaskedLong implements Comparable { * * To handle unknown bits, the result is derived from the following truth table: * - *

      +	 * 
      {@literal
       	 *   0 x 1 <= A (this)
       	 * 0 0 0 0
       	 * x 0 x x
       	 * 1 0 x 1
       	 * ^
       	 * B (that)
      -	 * 
      + * }
      * * @param that the other masked long ({@code B}). * @return the result. @@ -546,19 +546,19 @@ public class MaskedLong implements Comparable { } /** - * Solves the expression A & B = C, for B, given C and A - * + * Solves the expression {@code A & B = C, for B, given C and A} + *

      * To handle unknown bits, the solution is derived from the following truth table, where * {@code *} indicates no solution: * - *

      +	 * 
      {@literal
       	 *   0 x 1 <= A (that)
       	 * 0 x x 0
       	 * x x x x
       	 * 1 * 1 1
       	 * ^
       	 * B (this)
      -	 * 
      + * }
      * * @param that the other masked long ({@code B}). * @return the result. @@ -589,14 +589,14 @@ public class MaskedLong implements Comparable { * * To handle unknown bits, the result is derived from the following truth table: * - *
      +	 * 
      {@literal
       	 *   0 x 1 <= A (this)
       	 * 0 0 x 1
       	 * x x x 1
       	 * 1 1 1 1
       	 * ^
       	 * B (that)
      -	 * 
      + * }
      * * @param that the other masked long ({@code B}). * @return the result. @@ -623,14 +623,14 @@ public class MaskedLong implements Comparable { * To handle unknown bits, the solution is derived from the following truth table, where * {@code *} indicates no solution: * - *
      +	 * 
      {@literal
       	 *   0 x 1 <= A (that)
       	 * 0 0 0 *
       	 * x x x x
       	 * 1 1 x x
       	 * ^
       	 * B (this)
      -	 * 
      + * }
      * * @param that the other masked long ({@code B}). * @return the result. @@ -660,14 +660,14 @@ public class MaskedLong implements Comparable { * * To handle unknown bits, the result is derived from the following truth table: * - *
      +	 * 
      {@literal
       	 *   0 x 1 <= A (this)
       	 * 0 0 x 1
       	 * x x x x
       	 * 1 1 x 0
       	 * ^
       	 * B (that)
      -	 * 
      + * }
      * * @param that the other masked long ({@code B}). * @return the result. @@ -698,10 +698,10 @@ public class MaskedLong implements Comparable { * * To handle unknown bits, the result is derived from the following truth table: * - *
      +	 * 
      {@literal
       	 * 0 x 1 <= A (this)
       	 * 1 x 0
      -	 * 
      + * }
      * * @return the result. */ @@ -959,7 +959,8 @@ public class MaskedLong implements Comparable { * Check if this and another object agree * * @param that a {@link MaskedLong} or {@link Long} to check. - * @see {@link #agrees(MaskedLong)} and {@link #agrees(long)}. + * @see #agrees(MaskedLong) + * @see #agrees(long) * @return true if this and that agree. */ public boolean agrees(Object that) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/RecursiveDescentSolver.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/RecursiveDescentSolver.java index e9d6951b45..32761ab058 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/RecursiveDescentSolver.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/RecursiveDescentSolver.java @@ -33,7 +33,7 @@ import ghidra.app.plugin.processors.sleigh.expression.PatternExpression; * the solution, positioned in the field. If the expression is constant, it checks that the goal * agrees. If not, an error is returned. * - * @TODO This whole mechanism ought to just be factored directly into {@link PatternExpression}. + * TODO This whole mechanism ought to just be factored directly into {@link PatternExpression}. */ public class RecursiveDescentSolver { protected static final DbgTimer dbg = DbgTimer.INACTIVE; @@ -110,7 +110,6 @@ public class RecursiveDescentSolver { * @param description a description to attached to the encoded solution * @return the encoded solution * @throws NeedsBackfillException a solution may exist, but a required symbol is missing - * @throws SolverException a solution does not exist */ protected AssemblyResolution solve(PatternExpression exp, MaskedLong goal, Map vals, Map res, AssemblyResolvedConstructor cur, @@ -141,7 +140,7 @@ public class RecursiveDescentSolver { * {@link NeedsBackfillException}. The symbols, when known, are provided to the solver via the * {@code vals} parameter. * - * Expressions involving {@link OperandValue}s are a little more complicated, because they + * Expressions involving {@link OperandValueSolver}s are a little more complicated, because they * specify an offset that affects its encoding in the instruction. To compute this offset, the * lengths of other surrounding operands must be known. Thus, when solving a context change for * a given constructor, its resolved subconstructors must be provided to the solver via the @@ -154,7 +153,6 @@ public class RecursiveDescentSolver { * @param description a description to attached to the encoded solution * @return the encoded solution * @throws NeedsBackfillException a solution may exist, but a required symbol is missing - * @throws SolverException a solution does not exist */ public AssemblyResolution solve(PatternExpression exp, MaskedLong goal, Map vals, Map res, AssemblyResolvedConstructor cur, String description) @@ -168,7 +166,7 @@ public class RecursiveDescentSolver { * @param exp the (sub-)expression to fold * @param vals any defined symbols (usually {@code inst_start}, and {@code inst_next}) * @param res resolved subconstructors, by operand index (see - * {@link #solve(PatternExpression, MaskedLong, Map, Map, String)}) + * {@link #solve(PatternExpression, MaskedLong, Map, Map, AssemblyResolvedConstructor, String)}) * @return the masked solution * @throws NeedsBackfillException it may be folded, but a required symbol is missing */ @@ -191,7 +189,7 @@ public class RecursiveDescentSolver { * * @param exp the expression, presumably containing a token field * @param res resolved subconstructors, by operand index (see - * {@link #solve(PatternExpression, MaskedLong, Map, Map, String)}) + * {@link #solve(PatternExpression, MaskedLong, Map, Map, AssemblyResolvedConstructor, String)}) * @return the anticipated length, in bytes, of the instruction encoding */ public int getInstructionLength(PatternExpression exp, Map res) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/RightShiftExpressionSolver.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/RightShiftExpressionSolver.java index 90bffa6236..2d17254bea 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/RightShiftExpressionSolver.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/expr/RightShiftExpressionSolver.java @@ -24,7 +24,7 @@ import ghidra.app.plugin.processors.sleigh.expression.RightShiftExpression; import ghidra.util.Msg; /** - * Solves expressions of the form A >> B + * {@literal Solves expressions of the form A >> B} */ public class RightShiftExpressionSolver extends AbstractBinaryExpressionSolver { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AbstractAssemblyGrammar.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AbstractAssemblyGrammar.java index 763b9f7f9d..2fd4bfa150 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AbstractAssemblyGrammar.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AbstractAssemblyGrammar.java @@ -41,14 +41,13 @@ import ghidra.generic.util.datastruct.TreeSetValuedTreeMap; * * To define a grammar, simply construct an appropriate subclass (probably {@link AssemblyGrammar}) * and call {@link #addProduction(AbstractAssemblyProduction)} or - * {@link #addProduction(AssemblyNonTerminal, AssemblySentential). The grammar object will collect + * {@link #addProduction(AssemblyNonTerminal, AssemblySentential)}. The grammar object will collect * the non-terminals and terminals. * * By default, the start symbol is taken from the left-hand side of the first production added to * the grammar. * * @param the type of non-terminals - * @param the type of terminals * @param

      the type of productions, which must have the same types of (non-)terminals. */ public abstract class AbstractAssemblyGrammar> @@ -115,7 +114,7 @@ public abstract class AbstractAssemblyGrammar I + * Check if the given production is purely recursive, i.e., of the form I => I * @param prod the production to check * @return true iff the production is purely recursive */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AbstractAssemblyProduction.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AbstractAssemblyProduction.java index fc081c8901..e9a72420b7 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AbstractAssemblyProduction.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AbstractAssemblyProduction.java @@ -27,7 +27,6 @@ import ghidra.app.plugin.assembler.sleigh.symbol.AssemblySymbol; * * @see AbstractAssemblyGrammar * @param the type of non-terminals - * @param the type of terminals */ public abstract class AbstractAssemblyProduction extends AbstractListDecorator diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AssemblyGrammar.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AssemblyGrammar.java index 054fde2ce7..1d765d774c 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AssemblyGrammar.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AssemblyGrammar.java @@ -28,7 +28,7 @@ import ghidra.app.plugin.processors.sleigh.pattern.DisjointPattern; * Defines a context free grammar, used to parse mnemonic assembly instructions * * This stores the CFG and the associated semantics for each production. It also has mechanisms for - * tracking "purely recursive" productions. These are productions of the form I => I, and they + * tracking "purely recursive" productions. These are productions of the form I => I, and they * necessarily create ambiguity. Thus, when constructing a parser, it is useful to identify them * early. */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AssemblySentential.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AssemblySentential.java index c735546238..b9a75abe7b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AssemblySentential.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/grammars/AssemblySentential.java @@ -30,7 +30,6 @@ import ghidra.app.plugin.assembler.sleigh.tree.AssemblyParseToken; * in the grammar starting with the start symbol. We ignore that if only for the sake of naming. * * @param the type of non-terminals - * @param the type of terminals */ public class AssemblySentential extends AbstractListDecorator implements Comparable> { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/parse/AssemblyParseAcceptResult.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/parse/AssemblyParseAcceptResult.java index 678b38dbb4..6bf4f3c5ae 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/parse/AssemblyParseAcceptResult.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/parse/AssemblyParseAcceptResult.java @@ -27,7 +27,7 @@ public class AssemblyParseAcceptResult extends AssemblyParseResult { private final AssemblyParseBranch tree; /** - * @see {@link AssemblyParseResult#accept(AssemblyParseBranch)} + * @see AssemblyParseResult#accept(AssemblyParseBranch) */ protected AssemblyParseAcceptResult(AssemblyParseBranch tree) { this.tree = tree; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/parse/AssemblyParseErrorResult.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/parse/AssemblyParseErrorResult.java index 75125a7cd5..7b483fbcdf 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/parse/AssemblyParseErrorResult.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/parse/AssemblyParseErrorResult.java @@ -26,7 +26,7 @@ public class AssemblyParseErrorResult extends AssemblyParseResult { private final Set suggestions; /** - * @see {@link AssemblyParseResult#error(String, Set)} + * @see AssemblyParseResult#error(String, Set) */ protected AssemblyParseErrorResult(String got, Set suggestions) { this.buffer = got; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/parse/AssemblyParseTransitionTable.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/parse/AssemblyParseTransitionTable.java index 37ba088fec..8bab30699d 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/parse/AssemblyParseTransitionTable.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/parse/AssemblyParseTransitionTable.java @@ -37,7 +37,7 @@ public class AssemblyParseTransitionTable { * @param newState the destination state * @return the previous value for newState * - * @note Generally, if this return non-null, something is probably wrong with your LR(0) + * NOTE: Generally, if this return non-null, something is probably wrong with your LR(0) * machine generator */ public Integer put(int fromState, AssemblySymbol next, int newState) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyConstructorSemantic.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyConstructorSemantic.java index 87c8068809..4c37c2e4ba 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyConstructorSemantic.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyConstructorSemantic.java @@ -49,7 +49,6 @@ public class AssemblyConstructorSemantic implements Comparable vals, Map opvals) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyContextGraph.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyContextGraph.java index 0875469cf5..7a3ee47be5 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyContextGraph.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyContextGraph.java @@ -34,7 +34,7 @@ import ghidra.graph.algo.DijkstraShortestPathsAlgorithm; * A graph of possible context changes via the application of various constructors * * This is used primarily to find optimal paths for the application of recursive rules, i.e., those - * of the form I => I. These cannot be resolved without some form of semantic analysis. The most + * of the form I => I. These cannot be resolved without some form of semantic analysis. The most * notable disadvantage to all of this is that you no longer get all of the possible assemblies, * but only those with the fewest rule applications. * @@ -99,7 +99,7 @@ public class AssemblyContextGraph implements GImplicitDirectedGraph> computeOptimalApplications( AssemblyPatternBlock src, String srcTable, AssemblyPatternBlock dst, String dstTable) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyPatternBlock.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyPatternBlock.java index 37dcfb7e5e..50006cb542 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyPatternBlock.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyPatternBlock.java @@ -39,7 +39,7 @@ import ghidra.util.StringUtilities; * It is suitable for the assembler because it is represented byte-by-byte, and it offers a number * of useful conversions and operations. * - * @TODO A lot of this could probably be factored into the {@link PatternBlock} class, but it was + * TODO A lot of this could probably be factored into the {@link PatternBlock} class, but it was * best to experiment in another class altogether to avoid breaking things. */ public class AssemblyPatternBlock implements Comparable { @@ -100,7 +100,7 @@ public class AssemblyPatternBlock implements Comparable { /** * Convert the given long to a pattern block (having offset 0 and a full mask) - * @note The result will be 8 bytes in length + * NOTE: The result will be 8 bytes in length * @param value the value to convert * @return the pattern block containing the big-endian representation of the value */ @@ -118,7 +118,7 @@ public class AssemblyPatternBlock implements Comparable { /** * Convert the given masked long to a pattern block (having offset 0) - * @note The result will be 8 bytes in length + * NOTE: The result will be 8 bytes in length * @param ml the masked long, whose values and mask to convert * @return the pattern block containing the big-endian representation of the value */ @@ -139,7 +139,7 @@ public class AssemblyPatternBlock implements Comparable { /** * Convert a string representation to a pattern block - * @see StringUtilities#convertHexStringToMaskedValue(AtomicLong, AtomicLong, String, int, int, String) + * @see NumericUtilities#convertHexStringToMaskedValue(AtomicLong, AtomicLong, String, int, int, String) * @param str the string to convert * @return the resulting pattern block */ @@ -517,7 +517,7 @@ public class AssemblyPatternBlock implements Comparable { /** * Encode the given value into a copy of this pattern block as specified by a context operation * - * @note this method is given as a special operation, instead of a conversion factory method, + * NOTE: this method is given as a special operation, instead of a conversion factory method, * because this is a write operation, not a combine operation. As such, the bits (including * undefined bits) replace the bits in the existing pattern block. Were this a conversion * method, we would lose the distinction between unknown bits being written, and bits whose @@ -795,7 +795,7 @@ public class AssemblyPatternBlock implements Comparable { * } *

    • * - * @note A single byte array is instantiated with the call to {@link Iterable#iterator()}. Each + * NOTE: A single byte array is instantiated with the call to {@link Iterable#iterator()}. Each * call to {@link Iterator#next()} modifies the one byte array and returns it. As such, if you * intend to preserve the value in the array for later use, you must make a copy. * @return the iterable. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyResolution.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyResolution.java index e72976a669..86c171c0f8 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyResolution.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/sem/AssemblyResolution.java @@ -67,7 +67,7 @@ public abstract class AssemblyResolution implements Comparable)}. + * Please use {@link #match(String, int, AssemblyGrammar, Map) match(String, int, AssemblyGrammar, Map<String, Long>)}. * @param buffer the input buffer * @return the parsed token */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/symbol/AssemblyStringMapTerminal.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/symbol/AssemblyStringMapTerminal.java index d0e1296686..bf06ce98f7 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/symbol/AssemblyStringMapTerminal.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/assembler/sleigh/symbol/AssemblyStringMapTerminal.java @@ -27,7 +27,7 @@ import ghidra.app.plugin.processors.sleigh.symbol.VarnodeListSymbol; /** * A terminal that accepts only a particular set of strings, mapping each to a numeric value * - * @see NameSymbol + * @see ghidra.app.plugin.processors.sleigh.symbol.NameSymbol NameSymbol * @see VarnodeListSymbol */ public class AssemblyStringMapTerminal extends AssemblyTerminal { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/languages/sleigh/SleighPcodeTraversal.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/languages/sleigh/SleighPcodeTraversal.java index 0dcd864c2c..7cf1ba631f 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/languages/sleigh/SleighPcodeTraversal.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/languages/sleigh/SleighPcodeTraversal.java @@ -53,7 +53,7 @@ class SleighPcodeTraversal implements VisitorResults { * An interface for visiting Pcode operations in a constructor * * @see SleighPcodeTraversal#traverse(OnlyPcodeOpEntryVisitor) - * @note This is meant for internal use only + * NOTE: This is meant for internal use only */ static interface OnlyPcodeOpEntryVisitor extends VisitorResults { public int visit(OpTpl op); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/ConstantTemplate.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/ConstantTemplate.java index e395fc4a2f..4a79e04d4b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/ConstantTemplate.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/ConstantTemplate.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,8 +59,8 @@ public class ConstantTemplate implements Serializable { /** * Constructor ConstantTemplate. - * @param o - * @param i + * @param o the operand + * @param sel1 the first selection */ public ConstantTemplate(Operand o, int sel1) throws SledException { this(o,sel1,0); @@ -84,9 +83,8 @@ public class ConstantTemplate implements Serializable { /** * Method resolve. - * @param handles - * @param position - * @param off + * @param position the position of the constant to resolve + * @param off the offset of the constant * @return long */ public long resolve(Position position, int off) throws Exception { @@ -111,9 +109,8 @@ public class ConstantTemplate implements Serializable { } /** - * @param handles - * @param position - * @param off + * @param handles optional map of handles to be used for resolving + * @see #resolve(Position, int) * @return long */ public long resolve(HashMap handles, Position position, int off) throws Exception { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/ExpressionTerm.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/ExpressionTerm.java index 49b6b72bf6..ea24292f49 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/ExpressionTerm.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/ExpressionTerm.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +21,7 @@ import ghidra.program.model.mem.MemBuffer; import java.io.Serializable; import java.util.Hashtable; +// TODO needs documentation /** * */ @@ -58,8 +58,8 @@ public class ExpressionTerm implements Serializable { public ExpressionValue getValue() { return val; } /** - * Method addSpace. - * @param id + * Sets the address space of the expression value + * @param space the address space to set */ public void setSpace(AddressSpace space) throws SledException { if (val.getClass() != BinaryExpression.class) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Label.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Label.java index 15f54fc0f6..a696f7169c 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Label.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Label.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,9 +21,9 @@ import ghidra.program.model.mem.MemBuffer; * * * To change this generated comment edit the template variable "typecomment": - * Window>Preferences>Java>Templates. + * {@literal Window>Preferences>Java>Templates.} * To enable and disable the creation of type comments go to - * Window>Preferences>Java>Code Generation. + * {@literal Window>Preferences>Java>Code Generation.} */ public class Label implements ExpressionValue { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Operand.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Operand.java index 524e0bcaf1..bf90aedd55 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Operand.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Operand.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -130,11 +129,7 @@ public class Operand implements Serializable { } /** - * Return l - * @param list - * @param buf - * @param i - * @return + * @see OperandValue#toList(ArrayList, Position, int) */ public void toList(ArrayList list, Position position, int off) throws Exception { op.toList(list, position, offset.getOffset(position.buffer(),off)); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/OperandValue.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/OperandValue.java index 6c6d86cdb0..b83eafb897 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/OperandValue.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/OperandValue.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,9 +50,9 @@ public interface OperandValue extends Serializable { /** * Construct operand representation as a list of objects * - * @param list - * @param buf - * @param i + * @param list the list to fill + * @param position the operand position + * @param off the offset */ public void toList(ArrayList list, Position position, int off) throws Exception; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Position.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Position.java index 864ec38d5d..627a741a48 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Position.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/Position.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,9 +23,9 @@ import ghidra.program.model.mem.MemBuffer; * * * To change this generated comment edit the template variable "typecomment": - * Window>Preferences>Java>Templates. + * {@literal Window>Preferences>Java>Templates.} * To enable and disable the creation of type comments go to - * Window>Preferences>Java>Code Generation. + * {@literal Window>Preferences>Java>Code Generation.} */ public class Position { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/VarnodeTemplate.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/VarnodeTemplate.java index d03e7b7bfb..39b3f9cdd9 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/VarnodeTemplate.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/generic/VarnodeTemplate.java @@ -25,9 +25,9 @@ import ghidra.program.model.pcode.Varnode; * * * To change this generated comment edit the template variable "typecomment": - * Window>Preferences>Java>Templates. + * {@literal Window>Preferences>Java>Templates.} * To enable and disable the creation of type comments go to - * Window>Preferences>Java>Code Generation. + * {@literal Window>Preferences>Java>Code Generation.} */ public class VarnodeTemplate implements Serializable { @@ -92,9 +92,11 @@ public class VarnodeTemplate implements Serializable { } /** - * @param position - * @param off - * @return Varnode + * Resolves a varnode at the given position and buffer offset + * @param position the position + * @param bufoff the buffer offset + * @return the resolved {@link Varnode raw varnode}. (Only contains an address and size) + * @throws Exception if an error occurs resolving the varnode */ public Varnode resolve(Position position, int bufoff) throws Exception { int spaceID = (int) space.resolve(position, bufoff); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/Constructor.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/Constructor.java index 147279ae05..eb2eaa4a26 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/Constructor.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/Constructor.java @@ -283,8 +283,9 @@ public class Constructor implements Comparable { /** * Apply any operations on context for this Constructor to a * particular InstructionContext - * @param pos - * @throws MemoryAccessException + * @param walker the parser walker + * @param debug the debug logger + * @throws MemoryAccessException if the context failed to be applied. */ public void applyContext(ParserWalker walker, SleighDebugLogger debug) throws MemoryAccessException { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/ParserWalker.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/ParserWalker.java index 565eca6f4a..a1331c21ca 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/ParserWalker.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/ParserWalker.java @@ -50,8 +50,8 @@ public class ParserWalker { /** * For use with pcode cross-build - * @param c - * @param nextAddr + * @param c context + * @param cross cross context */ public ParserWalker(SleighParserContext c, SleighParserContext cross) { this(c); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/PcodeEmitPacked.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/PcodeEmitPacked.java index 28b6e01ea9..2bbe7b66d3 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/PcodeEmitPacked.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/PcodeEmitPacked.java @@ -59,7 +59,8 @@ public class PcodeEmitPacked extends PcodeEmit { /** * Pcode emitter constructor for producing a packed binary representation. - * @param delayContexts delay slotted instruction contexts + * @param walk parser walker + * @param ictx instruction contexts * @param fallOffset default instruction fall offset (i.e., instruction length including delay slotted instructions) * @param override required if pcode overrides are to be utilized * @param uniqueFactory required when override specified or if overlay normalization is required diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighDebugLogger.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighDebugLogger.java index 602bb4b8ad..53f70a3ef6 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighDebugLogger.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighDebugLogger.java @@ -67,9 +67,10 @@ public class SleighDebugLogger { /** * Performs a parse debug at the specified memory location within program. - * @param buf - * @param programContext - * @param verbose if true extended debug information may be provided + * @param buf the memory buffer + * @param context the processor context + * @param language the sleigh language + * @param mode the sleigh debug mode * @throws IllegalArgumentException if program language provider is not Sleigh */ public SleighDebugLogger(MemBuffer buf, ProcessorContextView context, Language language, @@ -141,9 +142,9 @@ public class SleighDebugLogger { /** * Performs a parse debug at the specified memory location within program. - * @param program - * @param start - * @param verbose if true extended debug information may be provided + * @param program the program the memory location is found in + * @param start the start address of the memory location + * @param mode the sleigh debug mode * @throws IllegalArgumentException if program language provider is not Sleigh */ public SleighDebugLogger(Program program, Address start, SleighDebugMode mode) { @@ -199,7 +200,7 @@ public class SleighDebugLogger { /** * @return true if a parse error was detected, otherwise false is returned. - * The methods getMaskedInstructionBytes() and getInstructionBitMask() should + * The methods getMaskedBytes() and getInstructionMask() should * only be invoked if this method returns false. */ public boolean parseFailed() { @@ -297,7 +298,7 @@ public class SleighDebugLogger { * NOTE: Method has no affect unless constructed with VERBOSE logging mode. * @param value integer array * @param startbit identifies the first most-significant bit within the - * bracketed range (left-most value[0] bit is bit-0, right-most value[n] bit is bit-<32(n+1)-1> ). + * {@literal bracketed range (left-most value[0] bit is bit-0, right-most value[n] bit is bit-<32(n+1)-1> ).} * @param bitcount number of bits included within range */ public void append(int[] value, int startbit, int bitcount) { @@ -323,7 +324,7 @@ public class SleighDebugLogger { * NOTE: Method has no affect unless constructed with VERBOSE logging mode. * @param value byte array * @param startbit identifies the first most-significant bit within the - * bracketed range (left-most value[0] bit is bit-0, right-most value[n] bit is bit-<8(n+1)-1> ). + * {@literal bracketed range (left-most value[0] bit is bit-0, right-most value[n] bit is bit-<8(n+1)-1> ).} * @param bitcount number of bits included within range */ public void append(byte[] value, int startbit, int bitcount) { @@ -914,7 +915,7 @@ public class SleighDebugLogger { * the instruction (includes addressing modes, generally excludes register selector bits * associated with attaches or immediate values used in for semantic values only). * @throws IllegalStateException if prototype parse failed - * @see SleighDebugLogger#getMaskedInstructionBytes() + * @see #getFormattedInstructionMask(int) getFormattedInstructionMask(-1) */ public byte[] getInstructionMask() { buildMasks(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighInstructionPrototype.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighInstructionPrototype.java index 5307a6b36e..8069421e3a 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighInstructionPrototype.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/SleighInstructionPrototype.java @@ -190,7 +190,7 @@ public class SleighInstructionPrototype implements InstructionPrototype { /** * Walk the pcode templates in the order they would be emitted. * Collect flowFlags FlowRecords - * @param sectionnum is the named section to walk + * @param walker the pcode template walker */ public static FlowSummary walkTemplates(OpTplWalker walker) { FlowSummary res = new FlowSummary(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/template/ConstTpl.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/template/ConstTpl.java index 6ad4e7af87..43db79e900 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/template/ConstTpl.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/template/ConstTpl.java @@ -209,9 +209,8 @@ public class ConstTpl { /** * Fill in the space portion of a FixedHandle, based * on this const. - * @param hand = handle to fillin - * @param pos = current context - * @param treeLoc + * @param hand handle to fillin + * @param walker current parser walker */ public void fillinSpace(FixedHandle hand, ParserWalker walker) { switch (type) { @@ -243,9 +242,8 @@ public class ConstTpl { * appropriately. We don't just fill in the temporary * variable offset, like "fix". Assume that hand.space is * already filled in - * @param hand = the handle to fillin - * @param pos = current context - * @param treeLoc + * @param hand handle to fillin + * @param walker current parser walker */ public void fillinOffset(FixedHandle hand, ParserWalker walker) { if (type == HANDLE) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/NamespaceUtils.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/NamespaceUtils.java index 15b59f8eb2..3d4d0f5ccf 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/NamespaceUtils.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/NamespaceUtils.java @@ -29,7 +29,7 @@ import ghidra.util.exception.*; * * Example string format: *
        - *
      • global{@link Namespace#NAMESPACE_DELIMITER <delimiter>}child1{@link Namespace#NAMESPACE_DELIMITER <delimiter>}child2 + *
      • global{@link Namespace#NAMESPACE_DELIMITER ::}child1{@link Namespace#NAMESPACE_DELIMITER ::}child2 *
      • child1 *
      * diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoCodeUnit.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoCodeUnit.java index 85460aea22..ebc704af63 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoCodeUnit.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoCodeUnit.java @@ -148,9 +148,6 @@ abstract class PseudoCodeUnit implements CodeUnit { return isValid; } - /** - * @see ghidra.program.model.listing.CodeUnit#getAddressString(boolean, boolean) - */ @Override public String getAddressString(boolean showBlockName, boolean pad) { Address cuAddress = address; @@ -400,9 +397,6 @@ abstract class PseudoCodeUnit implements CodeUnit { throw new UnsupportedOperationException(); } - /** - * @see ghidra.program.model.listing.CodeUnit#propertyNames() - */ @Override public Iterator propertyNames() { throw new UnsupportedOperationException(); @@ -539,9 +533,6 @@ abstract class PseudoCodeUnit implements CodeUnit { return this.getMaxAddress().isSuccessor(min); } - /** - * @see ghidra.program.model.listing.CodeUnit#getComment(int) - */ @Override public String getComment(int commentType) { return comments.get(commentType); @@ -763,7 +754,7 @@ abstract class PseudoCodeUnit implements CodeUnit { /** * Add a user defined reference to the operand at the given index. - * @see ghidra.program.model.listing.CodeUnit#addOperandReference(int, ghidra.program.model.address.Address, ghidra.program.model.symbol.RefType, SourceType) + * @see CodeUnit#addOperandReference(int, Address, RefType, SourceType) */ @Override public void addOperandReference(int opIndex, Address refAddr, RefType type, @@ -853,11 +844,6 @@ abstract class PseudoCodeUnit implements CodeUnit { return refMgr.getPrimaryReferenceFrom(address, index); } - /* - * (non-Javadoc) - * - * @see ghidra.program.model.listing.CodeUnit#setPrimaryMemoryReference(ghidra.program.model.symbol.Reference) - */ @Override public void setPrimaryMemoryReference(Reference ref) { if (refMgr == null) @@ -865,23 +851,14 @@ abstract class PseudoCodeUnit implements CodeUnit { refMgr.setPrimary(ref, true); } - /** - * @see ghidra.program.model.listing.CodeUnit#getStackReference(int) - */ public StackReference getStackReference(int opIndex) { return null; } - /** - * @see ghidra.program.model.listing.CodeUnit#removeStackReference(int) - */ public void removeStackReference(int opIndex) { throw new UnsupportedOperationException(); } - /** - * @see ghidra.program.model.listing.CodeUnit#getExternalReference(int) - */ @Override public ExternalReference getExternalReference(int opIndex) { if (refMgr == null) @@ -895,17 +872,11 @@ abstract class PseudoCodeUnit implements CodeUnit { return null; } - /** - * @see ghidra.program.model.listing.CodeUnit#removeExternalReference(int) - */ @Override public void removeExternalReference(int opIndex) { throw new UnsupportedOperationException(); } - /** - * @see ghidra.program.model.listing.CodeUnit#getReferenceIteratorTo() - */ @Override public ReferenceIterator getReferenceIteratorTo() { if (refMgr == null) @@ -915,17 +886,11 @@ abstract class PseudoCodeUnit implements CodeUnit { // /////////////////////////////////////////////////////////////////// - /** - * @see ghidra.program.model.listing.CodeUnit#getProgram() - */ @Override public Program getProgram() { return program; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public abstract boolean equals(Object obj); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoData.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoData.java index 48a50c9704..45cc848b28 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoData.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoData.java @@ -86,26 +86,17 @@ public class PseudoData extends PseudoCodeUnit implements Data { return length; } - /** - * @see ghidra.program.model.listing.Data#addValueReference(ghidra.program.model.address.Address, ghidra.program.model.symbol.RefType) - */ @Override public void addValueReference(Address refAddr, RefType type) { throw new UnsupportedOperationException(); } - /** - * @see ghidra.program.model.listing.Data#removeValueReference(ghidra.program.model.address.Address) - */ @Override public void removeValueReference(Address refAddr) { throw new UnsupportedOperationException(); } - /** - * @see ghidra.program.model.listing.Data#getComponent(int) - */ @Override public Data getComponent(int index) { if (index < 0 || index >= getNumComponents()) { @@ -142,9 +133,6 @@ public class PseudoData extends PseudoCodeUnit implements Data { return data; } - /** - * @see ghidra.program.model.listing.CodeUnit#getAddress(int) - */ @Override public Address getAddress(int opIndex) { if (opIndex == 0) { @@ -156,9 +144,6 @@ public class PseudoData extends PseudoCodeUnit implements Data { return null; } - /** - * @see ghidra.program.model.listing.CodeUnit#getByteCodeString() - */ public String getByteCodeString() { StringBuffer bytesStr = new StringBuffer(); @@ -186,10 +171,6 @@ public class PseudoData extends PseudoCodeUnit implements Data { return bytesStr.toString(); } - /** - * - * @see ghidra.program.model.listing.CodeUnit#toString() - */ @Override public String toString() { String valueRepresentation = getDefaultValueRepresentation(); @@ -200,9 +181,6 @@ public class PseudoData extends PseudoCodeUnit implements Data { return mnemonicString + " " + valueRepresentation; } - /** - * @see ghidra.program.model.listing.Data#getDefaultValueRepresentation() - */ @Override public String getDefaultValueRepresentation() { if (getLength() < dataType.getLength()) { @@ -212,25 +190,16 @@ public class PseudoData extends PseudoCodeUnit implements Data { return dataType.getRepresentation(this, this, getLength()); } - /** - * @see ghidra.program.model.listing.CodeUnit#getMnemonicString() - */ @Override public String getMnemonicString() { return dataType.getMnemonic(this); } - /** - * @see ghidra.program.model.listing.CodeUnit#getNumOperands() - */ @Override public int getNumOperands() { return 1; } - /** - * @see ghidra.program.model.listing.CodeUnit#getScalar(int) - */ @Override public Scalar getScalar(int opIndex) { if (opIndex == 0) { @@ -247,58 +216,36 @@ public class PseudoData extends PseudoCodeUnit implements Data { return null; } - /** - * @see ghidra.program.model.listing.Data#getBaseDataType() - */ @Override public DataType getBaseDataType() { return baseDataType; } - /* - * (non-Javadoc) - * @see ghidra.program.model.data.Settings#clearSetting(java.lang.String) - */ @Override public void clearSetting(String name) { throw new UnsupportedOperationException(); } - /** - * @see ghidra.docking.settings.Settings#getByteArray(java.lang.String) - */ @Override public byte[] getByteArray(String name) { return null; } - /** - * @see ghidra.docking.settings.Settings#getLong(java.lang.String) - */ @Override public Long getLong(String name) { return null; } - /** - * @see ghidra.docking.settings.Settings#getNames() - */ @Override public String[] getNames() { return new String[0]; } - /** - * @see ghidra.docking.settings.Settings#getString(java.lang.String) - */ @Override public String getString(String name) { return null; } - /** - * @see ghidra.docking.settings.Settings#getValue(java.lang.String) - */ @Override public Object getValue(String name) { if (baseDataType != null) { @@ -307,41 +254,26 @@ public class PseudoData extends PseudoCodeUnit implements Data { return null; } - /** - * @see ghidra.docking.settings.Settings#setByteArray(java.lang.String, byte[]) - */ @Override public void setByteArray(String name, byte[] value) { throw new UnsupportedOperationException(); } - /** - * @see ghidra.docking.settings.Settings#setLong(java.lang.String, long) - */ @Override public void setLong(String name, long value) { throw new UnsupportedOperationException(); } - /** - * @see ghidra.docking.settings.Settings#setString(java.lang.String, java.lang.String) - */ @Override public void setString(String name, String value) { throw new UnsupportedOperationException(); } - /** - * @see ghidra.docking.settings.Settings#setValue(java.lang.String, java.lang.Object) - */ @Override public void setValue(String name, Object value) { throw new UnsupportedOperationException(); } - /** - * @see ghidra.program.model.listing.Data#getComponent(int[]) - */ @Override public Data getComponent(int[] componentPath) { if (componentPath == null || componentPath.length <= level) { @@ -351,9 +283,6 @@ public class PseudoData extends PseudoCodeUnit implements Data { return (component == null ? null : component.getComponent(componentPath)); } - /** - * @see ghidra.program.model.listing.Data#getComponentAt(int) - */ @Override public Data getComponentAt(int offset) { if (offset < 0 || offset >= length) { @@ -424,33 +353,21 @@ public class PseudoData extends PseudoCodeUnit implements Data { return list; } - /** - * @see ghidra.program.model.listing.Data#getComponentIndex() - */ @Override public int getComponentIndex() { return -1; } - /** - * @see ghidra.program.model.listing.Data#getComponentLevel() - */ @Override public int getComponentLevel() { return level; } - /** - * @see ghidra.program.model.listing.Data#getComponentPath() - */ @Override public int[] getComponentPath() { return EMPTY_PATH; } - /** - * @see ghidra.program.model.listing.Data#getComponentPathName() - */ @Override public String getComponentPathName() { return null; @@ -491,25 +408,16 @@ public class PseudoData extends PseudoCodeUnit implements Data { // return retData; // } - /** - * @see ghidra.program.model.listing.Data#getDataType() - */ @Override public DataType getDataType() { return dataType; } - /** - * @see ghidra.program.model.listing.Data#getFieldName() - */ @Override public String getFieldName() { return null; } - /** - * @see ghidra.program.model.listing.Data#getNumComponents() - */ @Override public int getNumComponents() { if (length < dataType.getLength()) { @@ -527,25 +435,16 @@ public class PseudoData extends PseudoCodeUnit implements Data { return 0; } - /** - * @see ghidra.program.model.listing.Data#getParent() - */ @Override public Data getParent() { return null; } - /** - * @see ghidra.program.model.listing.Data#getParentOffset() - */ @Override public int getParentOffset() { return 0; } - /** - * @see ghidra.program.model.listing.Data#getPathName() - */ @Override public String getPathName() { if (program != null) { @@ -558,9 +457,6 @@ public class PseudoData extends PseudoCodeUnit implements Data { return "DAT" + address.toString(); } - /** - * @see ghidra.program.model.listing.Data#getPrimitiveAt(int) - */ @Override public Data getPrimitiveAt(int offset) { if (offset < 0 || offset >= length) { @@ -573,25 +469,16 @@ public class PseudoData extends PseudoCodeUnit implements Data { return dc.getPrimitiveAt(offset - dc.getParentOffset()); } - /** - * @see ghidra.program.model.listing.Data#getRoot() - */ @Override public Data getRoot() { return this; } - /** - * @see ghidra.program.model.listing.Data#getRootOffset() - */ @Override public int getRootOffset() { return 0; } - /** - * @see ghidra.program.model.listing.Data#getValue() - */ @Override public Object getValue() { return baseDataType.getValue(this, this, length); @@ -611,9 +498,6 @@ public class PseudoData extends PseudoCodeUnit implements Data { return String.class.equals(getValueClass()); } - /** - * @see ghidra.program.model.listing.Data#getValueReferences() - */ @Override public Reference[] getValueReferences() { if (refMgr == null) { @@ -622,65 +506,41 @@ public class PseudoData extends PseudoCodeUnit implements Data { return refMgr.getReferencesFrom(address, OP_INDEX); } - /** - * @see ghidra.program.model.listing.Data#isArray() - */ @Override public boolean isArray() { return baseDataType instanceof Array; } - /** - * @see ghidra.program.model.listing.Data#isDefined() - */ @Override public boolean isDefined() { return !(dataType instanceof DefaultDataType); } - /** - * @see ghidra.program.model.listing.Data#isPointer() - */ @Override public boolean isPointer() { return baseDataType instanceof Pointer; } - /** - * @see ghidra.program.model.listing.Data#isStructure() - */ @Override public boolean isStructure() { return baseDataType instanceof Structure; } - /** - * @see ghidra.program.model.listing.Data#isDynamic() - */ @Override public boolean isDynamic() { return baseDataType instanceof DynamicDataType; } - /** - * @see ghidra.program.model.listing.Data#isUnion() - */ @Override public boolean isUnion() { return baseDataType instanceof Union; } - /** - * @see ghidra.docking.settings.Settings#clearAllSettings() - */ @Override public void clearAllSettings() { throw new UnsupportedOperationException(); } - /** - * @see ghidra.docking.settings.Settings#isEmpty() - */ @Override public boolean isEmpty() { if (dataMgr == null) { @@ -725,9 +585,6 @@ public class PseudoData extends PseudoCodeUnit implements Data { return false; } - /** - * @see ghidra.docking.settings.Settings#getDefaultSettings() - */ @Override public Settings getDefaultSettings() { return dataType.getDefaultSettings(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoDisassembler.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoDisassembler.java index eecef33e33..30f0988dfb 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoDisassembler.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/PseudoDisassembler.java @@ -227,7 +227,7 @@ public class PseudoDisassembler { * * @param addr address to disassemble * @param bytes bytes to use instead of those currently defined in program - * @param PseudoDisassemblerContext the disassembler context to use. + * @param disassemblerContext the disassembler context to use. * @return PseudoInstruction. * * @throws InsufficientBytesException @@ -277,9 +277,6 @@ public class PseudoDisassembler { * @param addr location to get a PseudoData item for * @param dt the data type to be applied * @return PsuedoData that acts like Data - * - * @throws InsufficientBytesException - * @throws UnknownContextException */ public PseudoData applyDataType(Address addr, DataType dt) { @@ -326,10 +323,12 @@ public class PseudoDisassembler { /** * Check that this entry point leads to a well behaved subroutine: + *
        *
      • It should return.
      • *
      • Hit no bad instructions.
      • *
      • Have only one entry point.
      • *
      • Not overlap any existing data or instructions.
      • + *
      * @param entryPoint entry point to check * @return true if entry point leads to a well behaved subroutine */ @@ -340,10 +339,12 @@ public class PseudoDisassembler { /** * Check that this entry point leads to a well behaved subroutine, allow it * to fall into existing code. + *
        *
      • It should return.
      • *
      • Hit no bad instructions.
      • *
      • Have only one entry point.
      • *
      • Not overlap any existing data or cause offcut references.
      • + *
      * @param entryPoint entry point to check * @param allowExistingCode true allows this subroutine to flow into existing instructions. * @return true if entry point leads to a well behaved subroutine @@ -355,11 +356,11 @@ public class PseudoDisassembler { /** * Check that this entry point leads to a well behaved subroutine, allow it * to fall into existing code. - * + *
        *
      • Hit no bad instructions.
      • *
      • Have only one entry point.
      • *
      • Not overlap any existing data or cause offcut references.
      • - * + *
      * @param entryPoint entry point to check * @param allowExistingCode true allows this subroutine to flow into existing instructions. * @param mustTerminate true if the subroutine must terminate @@ -373,11 +374,12 @@ public class PseudoDisassembler { /** * Check that this entry point leads to valid code: + *
        *
      • May have multiple entries into the body of the code. *
      • The intent is that it be valid code, not nice code. *
      • Hit no bad instructions. *
      • It should return. - *
      • + *
      * @param entryPoint * @return true if the entry point leads to valid code */ @@ -388,11 +390,12 @@ public class PseudoDisassembler { /** * Check that this entry point leads to valid code: + *
        *
      • May have multiple entries into the body of the code. *
      • The intent is that it be valid code, not nice code. *
      • Hit no bad instructions. *
      • It should return. - *
      • + *
      * * @param entryPoint location to test for valid code * @param context disassembly context for program diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/SymbolPath.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/SymbolPath.java index 175f2cf7aa..9b498d7441 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/SymbolPath.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/SymbolPath.java @@ -28,9 +28,11 @@ import ghidra.util.SystemUtilities; * For example, if a SymbolPath is constructed with "foo::bar::baz", then "baz" is the * name of a symbol in the "bar" namespace, which is in the "foo" namespace. *

      + *

        *
      • {@link #getName()} will return "baz". *
      • {@link #getParentPath()} will return "foo:bar". *
      • {@link #getPath()} will return "foo::bar::baz". + *
      * */ public class SymbolPath implements Comparable { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/SymbolPathParser.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/SymbolPathParser.java index 98eabe7f46..9e5a310af5 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/SymbolPathParser.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/util/SymbolPathParser.java @@ -38,7 +38,7 @@ public class SymbolPathParser { * has each more deeply nested namespace contained in order in the list, followed * by the trailing name. * @param name The input String to be parsed. - * @return List containing the sequence of namespaces and trailing name. + * @return {@literal List} containing the sequence of namespaces and trailing name. */ public static List parse(String name) { if (StringUtils.isBlank(name)) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/Emulate.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/Emulate.java index 30a3414e87..7c62a54663 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/Emulate.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/emulate/Emulate.java @@ -145,7 +145,7 @@ public class Emulate { } /** - * @returns the current emulator execution state + * @return the current emulator execution state */ public EmulateExecutionState getExecutionState() { return executionState; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/loadimage/LoadImage.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/loadimage/LoadImage.java index 1487cabb89..4c5160e8ae 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/loadimage/LoadImage.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcode/loadimage/LoadImage.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,18 +22,19 @@ import ghidra.program.model.address.Address; // using 1 of possibly many different methods behind the scenes public interface LoadImage { - /** - * - * @param ptr - * @param size - * @param addr - * @param bufOffset - * @param generateInitializedMask if true the function should return an initialized bit mask - * or null if all loaded bytes were known. If true, uninitialized memory reads should only be - * reflected in the mask and should not be reported via the memory fault handler. - * @return initialized bit mask or null (see generateInitializedMask parameter) - * @see MemoryPage - */ +// TODO this doesn't appear to be used. +// /** +// * +// * @param ptr +// * @param size +// * @param addr +// * @param bufOffset +// * @param generateInitializedMask if true the function should return an initialized bit mask +// * or null if all loaded bytes were known. If true, uninitialized memory reads should only be +// * reflected in the mask and should not be reported via the memory fault handler. +// * @return initialized bit mask or null (see generateInitializedMask parameter) +// * @see MemoryPage +// */ public byte[] loadFill( byte[] buf, int size, Address addr, int bufOffset, boolean generateInitializedMask ); } diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DBObjectCache.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DBObjectCache.java index 39340f9999..1b2c667f79 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DBObjectCache.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DBObjectCache.java @@ -79,7 +79,7 @@ public class DBObjectCache { * record query during a possible object refresh. To benefit from the record the cached * object must implement the {@link DatabaseObject#refresh(Record)} method which by default * ignores the record and simply calls {@link DatabaseObject#refresh()}. - * @param record the valid record corresponding to the object to be retrieved and possibly + * @param objectRecord the valid record corresponding to the object to be retrieved and possibly * used to refresh the associated object if found in cache * @return the cached object or null if the object with that key is not currently cached. */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DataTypeArchiveDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DataTypeArchiveDB.java index afe06e058d..1d9acbbe2e 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DataTypeArchiveDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DataTypeArchiveDB.java @@ -52,7 +52,7 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB * UPGRADE_REQUIRED_BEFORE_VERSION should be changed to DB_VERSION any time the * latest version requires a forced upgrade (i.e., Read-only mode not supported * until upgrade is performed). It is assumed that read-only mode is supported - * if the data's version is >= UPGRADE_REQUIRED_BEFORE_VERSION and <= DB_VERSION. + * if the data's version is >= UPGRADE_REQUIRED_BEFORE_VERSION and <= DB_VERSION. */ private static final int UPGRADE_REQUIRED_BEFORE_VERSION = 1; @@ -195,9 +195,6 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB } - /** - * @see ghidra.framework.data.DomainObjectAdapter#setDomainFile(ghidra.framework.model.DomainFile) - */ @Override protected void setDomainFile(DomainFile df) { super.setDomainFile(df); @@ -223,9 +220,6 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB changed = origChangeState; } - /** - * @see ghidra.framework.data.DomainObjectAdapterDB#propertyChanged(java.lang.String, java.lang.Object, java.lang.Object) - */ @Override protected boolean propertyChanged(String propertyName, Object oldValue, Object newValue) { if (propertyName.endsWith(DEFAULT_POINTER_SIZE) && (newValue instanceof Integer)) { @@ -258,7 +252,7 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB } /** - * @see ghidra.program.model.listing.Program#getDefaultStoredPointerSize() + * @see ghidra.program.model.listing.Program#getDefaultPointerSize() */ @Override public int getDefaultPointerSize() { @@ -369,16 +363,10 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB fireEvent(new DataTypeArchiveChangeRecord(type, affectedObj, oldValue, newValue)); } - /** - * @see ghidra.framework.model.DomainObject#setName(java.lang.String) - */ @Override public void setName(String newName) { } - /** - * @see ghidra.framework.model.DomainObject#getDescription() - */ @Override public String getDescription() { return "Data Type Archive"; @@ -506,9 +494,6 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB dataTypeManager.archiveReady(openMode, monitor); } - /** - * @see ghidra.framework.data.DomainObjectAdapterDB#clearCache() - */ @Override protected void clearCache(boolean all) { lock.acquire(); @@ -530,9 +515,6 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB fireEvent(new DomainObjectChangeRecord(DomainObject.DO_OBJECT_RESTORED)); } - /** - * @see ghidra.framework.model.DomainObject#isChangeable() - */ @Override public boolean isChangeable() { return changeable; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramDB.java index 992e326e2e..b053069471 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramDB.java @@ -100,7 +100,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM * UPGRADE_REQUIRED_BFORE_VERSION should be changed to DB_VERSION anytime the * latest version requires a forced upgrade (i.e., Read-only mode not supported * until upgrade is performed). It is assumed that read-only mode is supported - * if the data's version is >= UPGRADE_REQUIRED_BEFORE_VERSION and <= DB_VERSION. + * if the data's version is >= UPGRADE_REQUIRED_BEFORE_VERSION and <= DB_VERSION. */ private static final int UPGRADE_REQUIRED_BEFORE_VERSION = 19; @@ -206,7 +206,8 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM /** * Constructs a new ProgramDB * @param name the name of the program - * @param languageSuperFacade the Language used by this program + * @param language the Language used by this program + * @param compilerSpec compiler specification * @param consumer the object that is using this program. * @throws IOException if there is an error accessing the database. */ @@ -262,9 +263,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM /** * Constructs a new ProgramDB * @param dbh a handle to an open program database. - * @param userDbh a handle to the associated user data - * @param service the LanguageService that will provide that language object once - * the name of the language is retrieved from the database. * @param openMode one of: * READ_ONLY: the original database will not be modified * UPDATE: the database can be written to. @@ -402,7 +400,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM * UPDATE: the database can be written to. * UPGRADE: the database is upgraded to the lastest schema as it is opened. * @throws LanguageNotFoundException - * @returns VersionException if language upgrade required + * @return VersionException if language upgrade required */ private VersionException checkLanguageVersion(int openMode) throws LanguageNotFoundException { @@ -458,7 +456,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM * READ_ONLY: the original database will not be modified * UPDATE: the database can be written to. * UPGRADE: the database is upgraded to the lastest schema as it is opened. - * @returns true if language upgrade required + * @return true if language upgrade required * @throws LanguageNotFoundException if a suitable replacement language not found */ private VersionException checkForLanguageChange(LanguageNotFoundException e, int openMode) @@ -488,9 +486,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM return ve; } - /** - * @see ghidra.framework.data.DomainObjectAdapter#setDomainFile(ghidra.framework.model.DomainFile) - */ + @Override protected void setDomainFile(DomainFile df) { super.setDomainFile(df); @@ -526,9 +522,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM this.programUserData = programUserData; } - /** - * @see ghidra.program.model.listing.Program#getProgramUserData() - */ @Override public ProgramUserData getProgramUserData() { if (programUserData == null) { @@ -553,41 +546,26 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM return programUserData; } - /** - * @see ghidra.program.model.listing.Program#getListing() - */ @Override public Listing getListing() { return listing; } - /** - * @see ghidra.program.model.listing.Program#getSymbolTable() - */ @Override public SymbolTable getSymbolTable() { return (SymbolTable) managers[SYMBOL_MGR]; } - /** - * @see ghidra.program.model.listing.Program#getExternalManager() - */ @Override public ExternalManager getExternalManager() { return (ExternalManager) managers[EXTERNAL_MGR]; } - /** - * @see ghidra.program.model.listing.Program#getEquateTable() - */ @Override public EquateTable getEquateTable() { return (EquateTable) managers[EQUATE_MGR]; } - /** - * @see ghidra.program.model.listing.Program#getMemory() - */ @Override public Memory getMemory() { return memoryManager; @@ -600,9 +578,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM return (NamespaceManager) managers[NAMESPACE_MGR]; } - /** - * @see ghidra.program.model.listing.Program#getReferenceManager() - */ @Override public ReferenceManager getReferenceManager() { return (ReferenceManager) managers[REF_MGR]; @@ -622,41 +597,26 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM return (TreeManager) managers[TREE_MGR]; } - /** - * @see ghidra.program.model.listing.Program#getDataTypeManager() - */ @Override public ProgramDataTypeManager getDataTypeManager() { return (ProgramDataTypeManager) managers[DATA_MGR]; } - /** - * Returns the FunctionManager - */ @Override public FunctionManager getFunctionManager() { return (FunctionManagerDB) managers[FUNCTION_MGR]; } - /** - * @see ghidra.program.model.listing.Program#getBookmarkManager() - */ @Override public BookmarkManager getBookmarkManager() { return (BookmarkManager) managers[BOOKMARK_MGR]; } - /** - * @see ghidra.program.model.listing.Program#getRelocationTable() - */ @Override public RelocationTable getRelocationTable() { return (RelocationManager) managers[RELOC_MGR]; } - /** - * @see ghidra.program.model.listing.Program#getCompiler() - */ @Override public String getCompiler() { String compiler = null; @@ -665,9 +625,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM return compiler == null ? UNKNOWN : compiler; } - /* - * @see ghidra.program.model.listing.Program#setCompiler(java.lang.String) - */ @Override public void setCompiler(String compiler) { Options pl = getOptions(PROGRAM_INFO); @@ -675,9 +632,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM changed = true; } - /** - * @see ghidra.program.model.listing.Program#getExecutablePath() - */ @Override public String getExecutablePath() { String path = null; @@ -686,9 +640,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM return path == null ? UNKNOWN : path; } - /** - * @see ghidra.program.model.listing.Program#setExecutablePath(java.lang.String) - */ @Override public void setExecutablePath(String path) { Options pl = getOptions(PROGRAM_INFO); @@ -696,9 +647,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM changed = true; } - /** - * @see ghidra.program.model.listing.Program#getExecutableFormat() - */ @Override public String getExecutableFormat() { String format = null; @@ -711,9 +659,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM return format == null ? UNKNOWN : format; } - /** - * @see ghidra.program.model.listing.Program#setExecutableFormat(java.lang.String) - */ @Override public void setExecutableFormat(String format) { Options pl = getOptions(PROGRAM_INFO); @@ -721,9 +666,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM changed = true; } - /** - * @see ghidra.program.model.listing.Program#getExecutableMD5() - */ @Override public String getExecutableMD5() { String format = null; @@ -736,9 +678,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM return format == null ? UNKNOWN : format; } - /** - * @see ghidra.program.model.listing.Program#setExecutableMD5(java.lang.String) - */ @Override public void setExecutableMD5(String md5) { Options pl = getOptions(PROGRAM_INFO); @@ -746,9 +685,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM changed = true; } - /** - * @see ghidra.program.model.listing.Program#getExecutableSHA256() - */ @Override public String getExecutableSHA256() { String format = null; @@ -761,9 +697,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM return format == null ? UNKNOWN : format; } - /** - * @see ghidra.program.model.listing.Program#setExecutableSHA256(java.lang.String) - */ @Override public void setExecutableSHA256(String sha256) { Options pl = getOptions(PROGRAM_INFO); @@ -771,90 +704,57 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM changed = true; } - /** - * @see ghidra.program.model.listing.Program#getCreationDate() - */ @Override public Date getCreationDate() { Options pl = getOptions(PROGRAM_INFO); return pl.getDate(Program.DATE_CREATED, new Date(0)); } - /** - * @see ghidra.program.model.listing.Program#getDefaultStoredPointerSize() - */ @Override public int getDefaultPointerSize() { return compilerSpec.getDataOrganization().getPointerSize(); } - /** - * @see ghidra.program.model.listing.Program#getLanguageID() - */ @Override public LanguageID getLanguageID() { return languageID; } - /** - * @see ghidra.program.model.listing.Program#getLanguage() - */ @Override public Language getLanguage() { return language; } - /** - * @see ghidra.program.model.listing.Program#getCompilerSpec() - */ @Override public CompilerSpec getCompilerSpec() { return compilerSpec; } - /** - * @see ghidra.program.model.listing.Program#getUsrPropertyManager() - */ @Override public PropertyMapManager getUsrPropertyManager() { return (PropertyMapManager) managers[PROPERTY_MGR]; } - /** - * @see ghidra.program.model.listing.Program#getProgramContext() - */ @Override public ProgramContext getProgramContext() { return (ProgramContext) managers[CONTEXT_MGR]; } - /** - * @see ghidra.program.model.listing.Program#getMinAddress() - */ @Override public Address getMinAddress() { return memoryManager.getMinAddress(); } - /** - * @see ghidra.program.model.listing.Program#getMaxAddress() - */ @Override public Address getMaxAddress() { return memoryManager.getMaxAddress(); } - /** - * @see ghidra.program.model.listing.Program#getChanges() - */ @Override public ProgramChangeSet getChanges() { return (ProgramChangeSet) changeSet; } - /** - * @see ghidra.program.model.listing.Program#getAddressFactory() - */ @Override public AddressFactory getAddressFactory() { return addressFactory; @@ -872,9 +772,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM return addrMap; } - /** - * @see ghidra.program.model.listing.Program#parseAddress(java.lang.String) - */ @Override public Address[] parseAddress(String addrStr) { return parseAddress(addrStr, true); @@ -1365,15 +1262,11 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM * @param propertyName * @param oldValue * @param newValue - * @return true if change is OK, false value should be reverted */ protected void userDataChanged(String propertyName, Object oldValue, Object newValue) { fireEvent(new UserDataChangeRecord(propertyName, name, name)); } - /** - * @see ghidra.framework.model.DomainObject#setName(java.lang.String) - */ @Override public void setName(String newName) { lock.acquire(); @@ -1486,17 +1379,11 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM return 0; } - /** - * @see ghidra.program.model.listing.Program#getImageBase() - */ @Override public Address getImageBase() { return addrMap.getImageBase(); } - /** - * @see ghidra.program.model.listing.Program#setImageBase(ghidra.program.model.address.Address, boolean) - */ @Override public void setImageBase(Address base, boolean commit) throws AddressOverflowException, LockException, IllegalStateException { @@ -1578,9 +1465,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM flushEvents(); } - /** - * @see ghidra.program.model.listing.Program#restoreImageBase() - */ @Override public void restoreImageBase() { if (!imageBaseOverride) { @@ -1600,9 +1484,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM flushEvents(); } - /** - * @see ghidra.framework.model.DomainObject#getDescription() - */ @Override public String getDescription() { return "Program"; @@ -2056,9 +1937,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM } - /** - * @see ghidra.framework.data.DomainObjectAdapterDB#clearCache() - */ @Override protected void clearCache(boolean all) { lock.acquire(); @@ -2082,42 +1960,27 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM } } - /** - * @see ghidra.program.model.listing.Program#invalidate() - */ @Override public void invalidate() { clearCache(false); fireEvent(new DomainObjectChangeRecord(DomainObject.DO_OBJECT_RESTORED)); } - /** - * @see ghidra.framework.model.DomainObject#isChangeable() - */ @Override public boolean isChangeable() { return changeable; } - /** - * @see ghidra.program.model.listing.Program#getRegister(int, int) - */ @Override public Register getRegister(Address addr) { return language.getRegister(getGlobalAddress(addr), 0); } - /** - * @see ghidra.program.model.listing.Program#getRegisters(ghidra.program.model.address.Address) - */ @Override public Register[] getRegisters(Address addr) { return language.getRegisters(getGlobalAddress(addr)); } - /** - * @see ghidra.program.model.listing.Program#getRegister(ghidra.program.model.address.Address, int) - */ @Override public Register getRegister(Address addr, int size) { return language.getRegister(getGlobalAddress(addr), size); @@ -2141,9 +2004,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM return addr; } - /** - * @see ghidra.program.model.listing.Program#getRegister(java.lang.String) - */ @Override public Register getRegister(String regName) { return language.getRegister(regName); @@ -2238,9 +2098,6 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM } } - /** - * @see ghidra.program.model.listing.Program#getGlobalNamespace() - */ @Override public Namespace getGlobalNamespace() { return globalNamespace; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramUserDataDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramUserDataDB.java index 5502f61039..b7d8e853f9 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramUserDataDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramUserDataDB.java @@ -57,7 +57,7 @@ class ProgramUserDataDB extends DomainObjectAdapterDB implements ProgramUserData * UPGRADE_REQUIRED_BFORE_VERSION should be changed to DB_VERSION any time the * latest version requires a forced upgrade (i.e., Read-only mode not supported * until upgrade is performed). It is assumed that read-only mode is supported - * if the data's version is >= UPGRADE_REQUIRED_BEFORE_VERSION and <= DB_VERSION. + * if the data's version is >= UPGRADE_REQUIRED_BEFORE_VERSION and <= DB_VERSION. */ private static final int UPGRADE_REQUIRED_BEFORE_VERSION = 1; @@ -231,7 +231,7 @@ class ProgramUserDataDB extends DomainObjectAdapterDB implements ProgramUserData * Language corresponding to languageId was found. Check language version * for language upgrade situation. * @throws LanguageNotFoundException - * @returns VersionException if language upgrade required + * @return VersionException if language upgrade required */ private VersionException checkLanguageVersion() throws LanguageNotFoundException { @@ -275,7 +275,7 @@ class ProgramUserDataDB extends DomainObjectAdapterDB implements ProgramUserData * READ_ONLY: the original database will not be modified * UPDATE: the database can be written to. * UPGRADE: the database is upgraded to the lastest schema as it is opened. - * @returns true if language upgrade required + * @return true if language upgrade required * @throws LanguageNotFoundException if a suitable replacement language not found */ private VersionException checkForLanguageChange(LanguageNotFoundException e) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/bookmark/BookmarkDBManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/bookmark/BookmarkDBManager.java index f3bc18dea0..f475577905 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/bookmark/BookmarkDBManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/bookmark/BookmarkDBManager.java @@ -257,7 +257,6 @@ public class BookmarkDBManager implements BookmarkManager, ErrorHandler, Manager * @param icon marker icon which may get scaled * @param color marker color * @return bookmark type object - * @throws IOException if a database error occurs while adding the new type. */ @Override public BookmarkType defineType(String type, ImageIcon icon, Color color, int priority) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/bookmark/BookmarkTypeDBAdapterNoTable.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/bookmark/BookmarkTypeDBAdapterNoTable.java index 8f4893ee2a..2472d4f7f7 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/bookmark/BookmarkTypeDBAdapterNoTable.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/bookmark/BookmarkTypeDBAdapterNoTable.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,8 +28,7 @@ public class BookmarkTypeDBAdapterNoTable extends BookmarkTypeDBAdapter { private Record[] records = new Record[0]; /** - * @param dbHandle - * @param openMode + * @param dbHandle the database handle */ public BookmarkTypeDBAdapterNoTable(DBHandle dbHandle) { } @@ -45,9 +43,6 @@ public class BookmarkTypeDBAdapterNoTable extends BookmarkTypeDBAdapter { records = oldMgr.getTypeRecords(); } - /* (non-Javadoc) - * @see ghidra.program.database.bookmark.BookmarkTypeDBAdapter#getRecords() - */ @Override Record[] getRecords() throws IOException { return records; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CodeManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CodeManager.java index c176346152..5a863d10fd 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CodeManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CodeManager.java @@ -397,8 +397,6 @@ public class CodeManager implements ErrorHandler, ManagerDB { * marked within the instructionSet causing dependent blocks to get pruned. * @param instructionSet the set of instructions to be added. All code unit conflicts * will be marked within the instructionSet and associated blocks. - * @throws CodeUnitInsertionException if the instruction set is incompatible - * with the program memory */ public AddressSetView addInstructions(InstructionSet instructionSet, boolean overwrite) { AddressSet set = new AddressSet(); @@ -695,7 +693,7 @@ public class CodeManager implements ErrorHandler, ManagerDB { * @param end the last address in the range. * @param monitor the TaskMonitor that tracks progress and is used to tell * if the user cancels the operation. - * @throws CancelledExeption if the user cancels the operation. + * @throws CancelledException if the user cancels the operation. */ @Override public void deleteAddressRange(Address start, Address end, TaskMonitor monitor) @@ -720,7 +718,7 @@ public class CodeManager implements ErrorHandler, ManagerDB { * @param keepComments if true comment and comment history will be retained * @param monitor the TaskMonitor that tracks progress and is used to tell * if the user cancels the operation. - * @throws CancelledExeption if the user cancels the operation. + * @throws CancelledException if the user cancels the operation. */ private void deleteAddressRange(Address start, Address end, boolean keepComments, TaskMonitor monitor) throws CancelledException { @@ -765,7 +763,7 @@ public class CodeManager implements ErrorHandler, ManagerDB { * @param length the number of addresses to move. * @param monitor the TaskMonitor that tracks progress and is used to tell * if the user cancels the operation. - * @throws CancelledExeption if the user cancels the operation. + * @throws CancelledException if the user cancels the operation. */ @Override public void moveAddressRange(Address fromAddr, Address toAddr, long length, TaskMonitor monitor) @@ -996,9 +994,9 @@ public class CodeManager implements ErrorHandler, ManagerDB { * Returns the code unit whose min address is less than * or equal to the specified address and whose max address * is greater than or equal to the specified address. - *
      +	 * 
      {@literal
       	 * codeunit.minAddress() <= addr <= codeunit.maxAddress()
      -	 * 
      + * }
      * * @param address the address for which to find the code containing it. * @@ -1249,8 +1247,9 @@ public class CodeManager implements ErrorHandler, ManagerDB { } /** - * Get a forward iterator over addresses that have comments of any type. - * @param set address set + * Get an iterator over addresses that have comments of any type. + * @param addrSet address set containing the comment addresses to iterate over. + * @param forward true to iterate in the direction of increasing addresses. */ public AddressIterator getCommentAddressIterator(AddressSetView addrSet, boolean forward) { try { @@ -1392,9 +1391,9 @@ public class CodeManager implements ErrorHandler, ManagerDB { * Returns the instruction whose min address is less than * or equal to the specified address and whose max address * is greater than or equal to the specified address. - *
      +	 * 
      {@literal
       	 * instruction.minAddress() <= addr <= instruction.maxAddress()
      -	 * 
      + * }
      * * @param address the address to be contained * @@ -1520,9 +1519,9 @@ public class CodeManager implements ErrorHandler, ManagerDB { * Returns the data whose min address is less than * or equal to the specified address and whose max address * is greater than or equal to the specified address. - *
      +	 * 
      {@literal
       	 * data.minAddress() <= addr <= data.maxAddress()
      -	 * 
      + * }
      * * @param addr the address to be contained * @@ -1591,9 +1590,9 @@ public class CodeManager implements ErrorHandler, ManagerDB { * Returns the defined data whose min address is less than * or equal to the specified address and whose max address * is greater than or equal to the specified address. - *
      +	 * 
      {@literal
       	 * data.minAddress() <= addr <= data.maxAddress()
      -	 * 
      + * }
      * * @param addr the address to be contained * @@ -1855,10 +1854,10 @@ public class CodeManager implements ErrorHandler, ManagerDB { /** * Returns the next undefined data whose min address falls within the address set - * searching in the forward direction (e.g., 0 -> 0xfff). - * - * @param addrSet the address Set to look within + * searching in the forward direction {@code (e.g., 0 -> 0xfff).} * + * @param set the address set to look within. + * @param monitor the current monitor. * @return Data the first undefined data within the address set, or null if there is none. */ public Data getFirstUndefinedData(AddressSetView set, TaskMonitor monitor) { @@ -2561,7 +2560,6 @@ public class CodeManager implements ErrorHandler, ManagerDB { * Check if any instruction intersects the specified address range * @param start start of range * @param end end of range - * @return true if instruction intersected with range */ public void checkContextWrite(Address start, Address end) throws ContextChangeException { lock.acquire(); @@ -3529,12 +3527,10 @@ public class CodeManager implements ErrorHandler, ManagerDB { * Instructions which fail to redisassemble will be marked - since only one byte will be skipped, such bad * instruction disassembly may cause subsequent errors due to possible instruction shift. * This method is only intended for use by the ProgramDB setLanguage method. - * @param lang new language * @param bookmarkLimit maximum number of errors to bookmark * @param monitor task monitor * @throws IOException - * @throws CancelledException - * @throws LockException + * @throws CancelledException if the operation is canceled. */ public void reDisassembleAllInstructions(int bookmarkLimit, TaskMonitor monitor) throws IOException, CancelledException { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentTypeFilterAddressIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentTypeFilterAddressIterator.java index da2da7a345..e219dcf44c 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentTypeFilterAddressIterator.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentTypeFilterAddressIterator.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,17 +42,11 @@ public class CommentTypeFilterAddressIterator implements AddressIterator { this.commentType = commentType; } - /** - * @see java.util.Iterator#remove() - */ @Override public void remove() { throw new UnsupportedOperationException(); } - /** - * @see ghidra.program.model.listing.AddressIterator#hasNext() - */ @Override public boolean hasNext() { if (nextAddr == null) { @@ -62,9 +55,6 @@ public class CommentTypeFilterAddressIterator implements AddressIterator { return nextAddr != null; } - /** - * @see ghidra.program.model.listing.AddressIterator#next() - */ @Override public Address next() { if (hasNext()) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentsDBAdapter.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentsDBAdapter.java index 25151068af..e442439936 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentsDBAdapter.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentsDBAdapter.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +15,9 @@ */ package ghidra.program.database.code; +import java.io.IOException; + +import db.*; import ghidra.program.database.map.AddressKeyIterator; import ghidra.program.database.map.AddressMap; import ghidra.program.model.address.Address; @@ -25,14 +27,10 @@ import ghidra.util.exception.CancelledException; import ghidra.util.exception.VersionException; import ghidra.util.task.TaskMonitor; -import java.io.IOException; - -import db.*; - /** * Adapter to access the comments table for code units. The primary key * for the table is the address. The record contains all of the comment - * types: Pre, Post, EOL, Plate, & Repeatable. + * types: Pre, Post, EOL, Plate, and Repeatable. */ abstract class CommentsDBAdapter { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstructionDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstructionDB.java index 5f24d242d5..653b732cfd 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstructionDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstructionDB.java @@ -59,7 +59,7 @@ public class InstructionDB extends CodeUnitDB implements Instruction, Instructio * @param address min address of this instruction * @param addr database key * @param proto instruction prototype - * @param protoID ID for the prototype + * @param flags flow override flags */ public InstructionDB(CodeManager codeMgr, DBObjectCache cache, Address address, long addr, InstructionPrototype proto, byte flags) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/ArrayDBAdapterV1.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/ArrayDBAdapterV1.java index 422e2d62bf..9902077db6 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/ArrayDBAdapterV1.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/ArrayDBAdapterV1.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +24,7 @@ import db.*; /** * * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments + * {@literal Window>Preferences>Java>Code Generation>Code and Comments} * * */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeManagerDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeManagerDB.java index e6fc6db105..837e9f65e2 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeManagerDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeManagerDB.java @@ -249,8 +249,10 @@ abstract public class DataTypeManagerDB implements DataTypeManager { * Constructor * @param handle database handle * @param addrMap map to convert addresses to longs and longs to addresses - * @param createTables true if tables should be created - * @param rootCategoryName name of the root category + * @param openMode mode to open the DataTypeManager in + * @param errHandler the error handler + * @param lock database lock + * @param monitor the current task monitor */ protected DataTypeManagerDB(DBHandle handle, AddressMap addrMap, int openMode, ErrorHandler errHandler, Lock lock, TaskMonitor monitor) @@ -883,7 +885,6 @@ abstract public class DataTypeManagerDB implements DataTypeManager { /** * This method gets a ".conflict" name that is not currently used by any data types * in the indicated category of the data type manager. - * @param dtm the data type manager. * @param path the category path of the category where the new data type live in the data type manager. * @param name The name of the data type. This name may or may not contain ".conflict" as part of it. * If the name contains ".conflict", only the part of the name that comes prior to the ".conflict" @@ -1167,9 +1168,9 @@ abstract public class DataTypeManagerDB implements DataTypeManager { * Replace one source archive (oldDTM) with another (newDTM). Any data types whose source * was the oldDTM will be changed to have a source that is the newDTM. The oldDTM will no * longer be referenced as a source by this data type manager. - * @param oldDTM data type manager for the old source archive - * @param newDTM data type manager for the new source archive - * @throws InvalidInputException if the oldDTM isn't currently a source archive for this + * @param oldSourceArchive data type manager for the old source archive + * @param newSourceArchive data type manager for the new source archive + * @throws IllegalArgumentException if the oldDTM isn't currently a source archive for this * data type manager or if the old and new source archives already have the same unique ID. */ public void replaceSourceArchive(SourceArchive oldSourceArchive, diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeUtilities.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeUtilities.java index c01cca3b50..3cb8015117 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeUtilities.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeUtilities.java @@ -242,7 +242,7 @@ public class DataTypeUtilities { * away pointers and arrays only. A null will be returned for a * default pointer. * - * @param baseDataType the data type whose base data type is to be determined. + * @param dt the data type whose base data type is to be determined. * @return the base data type. */ public static DataType getBaseDataType(DataType dt) { @@ -376,7 +376,6 @@ public class DataTypeUtilities { * NOTE: name parsing assumes :: delimiter and can be thrown off if name include template * information which could contain namespaces. * @param dataTypeManager data type manager - * @param namespace namespace associated with dtName (null indicates no namespace constraint) * @param dtNameWithNamespace name of data type qualified with namespace (e.g., ns1::ns2::dtname) * @param classConstraint optional data type interface constraint (e.g., Structure), or null * @return best matching data type diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SettingsDBAdapterV0.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SettingsDBAdapterV0.java index 6552621db9..e6a89ed9dd 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SettingsDBAdapterV0.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SettingsDBAdapterV0.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +24,7 @@ import db.*; /** * * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments + * {@literal Window>Preferences>Java>Code Generation>Code and Comments} * * */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionManagerDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionManagerDB.java index 5056bc7d60..bf113c1246 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionManagerDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionManagerDB.java @@ -275,7 +275,7 @@ public class FunctionManagerDB implements ManagerDB, FunctionManager { * @param name * @param nameSpace * @param extData3 internal symbol-data-3 string (see {@link ExternalLocationDB}) - * @param sourceType the source of this external. + * @param source the source of this external. * @return external function * @throws InvalidInputException * @throws DuplicateNameException diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionTagManagerDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionTagManagerDB.java index 931a285500..022140ce6a 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionTagManagerDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionTagManagerDB.java @@ -182,12 +182,10 @@ public class FunctionTagManagerDB implements FunctionTagManager, ErrorHandler { invalidateFunctions(); } - /** + /* (non-Javadoc) * TODO: Be a bit smarter about this - if the cache contains all the tags in * the db we can just return the cache itself. If not, then go to the * db to get the remainder. - * @return - * @throws IOException */ @Override public List getAllFunctionTags() { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/ReturnParameterDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/ReturnParameterDB.java index fcd70e1483..d7d035ba0a 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/ReturnParameterDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/ReturnParameterDB.java @@ -59,9 +59,6 @@ public class ReturnParameterDB extends ParameterDB { throw new UnsupportedOperationException(); } - /** - * @see ghidra.program.database.function.model.Parameter#getOrdinal() - */ @Override public final int getOrdinal() { return RETURN_ORIDINAL; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/map/AddressMapDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/map/AddressMapDB.java index 868f430107..d4ef092158 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/map/AddressMapDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/map/AddressMapDB.java @@ -215,7 +215,7 @@ public class AddressMapDB implements AddressMap { /** * Notification when the memory map changes. If we are segemented, we need to update our * list of address ranges used for address normalization. - * @param memory + * @param mem the changed memory map. */ public synchronized void memoryMapChanged(MemoryMapDB mem) { if (!(addrFactory.getDefaultAddressSpace() instanceof SegmentedAddressSpace)) { @@ -269,17 +269,11 @@ public class AddressMapDB implements AddressMap { return useOldAddrMap ? this : oldAddrMap; } - /** - * @see ghidra.program.database.map.AddressMap#isUpgraded() - */ @Override public boolean isUpgraded() { return getOldAddressMap() != this; } - /** - * @see ghidra.program.database.map.AddressMap#getKey(ghidra.program.model.address.Address, boolean) - */ @Override public synchronized long getKey(Address addr, boolean create) { if (useOldAddrMap) { @@ -308,9 +302,6 @@ public class AddressMapDB implements AddressMap { return offset; } - /** - * @see ghidra.program.database.map.AddressMap#getAbsoluteEncoding(ghidra.program.model.address.Address, boolean) - */ @Override public synchronized long getAbsoluteEncoding(Address addr, boolean create) { if (useOldAddrMap) { @@ -479,9 +470,6 @@ public class AddressMapDB implements AddressMap { } } - /** - * @see ghidra.program.model.address.AddressMap#decodeAddress(long) - */ @Override public synchronized Address decodeAddress(long value) { return decodeAddress(value, true); @@ -708,17 +696,11 @@ public class AddressMapDB implements AddressMap { throw new IllegalArgumentException("Address can not be encoded"); } - /** - * @see ghidra.program.model.address.AddressMap#getAddressFactory() - */ @Override public AddressFactory getAddressFactory() { return addrFactory; } - /** - * @see ghidra.program.database.map.AddressMap#setImageBase(ghidra.program.model.address.Address) - */ @Override public void setImageBase(Address base) { if (useOldAddrMap) { @@ -733,18 +715,11 @@ public class AddressMapDB implements AddressMap { baseImageOffset = base.getOffset(); } - /** - * @see ghidra.program.database.map.AddressMap#getModCount() - */ @Override public synchronized int getModCount() { return baseAddrs.length; } - /** - * - * @see ghidra.program.model.address.AddressMap#findKeyRange(java.util.List, ghidra.program.model.address.Address) - */ @Override public int findKeyRange(List keyRangeList, Address addr) { // TODO: Will not handle mixed list of relative and absolute key ranges @@ -754,25 +729,16 @@ public class AddressMapDB implements AddressMap { return Collections.binarySearch(keyRangeList, addr, addressInsertionKeyRangeComparator); } - /** - * @see ghidra.program.database.map.AddressMap#getKeyRanges(ghidra.program.model.address.Address, ghidra.program.model.address.Address, boolean) - */ @Override public List getKeyRanges(Address start, Address end, boolean create) { return getKeyRanges(start, end, false, create); } - /** - * @see ghidra.program.database.map.AddressMap#getKeyRanges(ghidra.program.model.address.AddressSetView, boolean) - */ @Override public List getKeyRanges(AddressSetView set, boolean create) { return getKeyRanges(set, false, create); } - /** - * @see ghidra.program.database.map.AddressMap#getKeyRanges(ghidra.program.model.address.Address, ghidra.program.model.address.Address, boolean, boolean) - */ @Override public synchronized List getKeyRanges(Address start, Address end, boolean absolute, boolean create) { @@ -797,9 +763,6 @@ public class AddressMapDB implements AddressMap { return fullSet; } - /** - * @see ghidra.program.database.map.AddressMap#getKeyRanges(ghidra.program.model.address.AddressSetView, boolean, boolean) - */ @Override public synchronized List getKeyRanges(AddressSetView set, boolean absolute, boolean create) { @@ -953,9 +916,6 @@ public class AddressMapDB implements AddressMap { return addr; } - /** - * @see ghidra.program.database.map.AddressMap#getImageBase() - */ @Override public Address getImageBase() { if (defaultAddrSpace instanceof SegmentedAddressSpace) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/mem/MemoryMapDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/mem/MemoryMapDB.java index 638cd9d2e7..f6f0e6741b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/mem/MemoryMapDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/mem/MemoryMapDB.java @@ -111,17 +111,11 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener { this.fileBytesAdapter = bytesAdapter; } - /** - * @see ghidra.program.model.mem.Memory#getProgram() - */ @Override public Program getProgram() { return program; } - /** - * @see ghidra.program.database.ManagerDB#invalidateCache(boolean) - */ @Override public void invalidateCache(boolean all) throws IOException { lock.acquire(); @@ -210,9 +204,6 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener { } } - /** - * @see ghidra.program.database.ManagerDB#programReady(int, int, ghidra.util.task.TaskMonitor) - */ @Override public void programReady(int openMode, int currentRevision, TaskMonitor monitor) throws IOException, CancelledException { @@ -254,9 +245,6 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener { return new AddressSetViewAdapter(allInitializedAddrSet); } - /** - * @see ghidra.program.model.mem.Memory#getLoadedAndInitializedAddressSet() - */ @Override public AddressSetView getLoadedAndInitializedAddressSet() { if (liveMemory != null) { @@ -297,17 +285,11 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener { return potentialOverlappingBlocks; } - /** - * @see ghidra.program.model.mem.Memory#getBlock(ghidra.program.model.address.Address) - */ @Override public MemoryBlock getBlock(Address addr) { return getBlockDB(addr); } - /** - * @see ghidra.program.model.mem.Memory#getBlock(java.lang.String) - */ @Override public synchronized MemoryBlock getBlock(String blockName) { // find block that might have been cached from previous call @@ -445,9 +427,6 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener { } } - /** - * @see ghidra.program.model.mem.Memory#getLiveMemoryHandler() - */ @Override public LiveMemoryHandler getLiveMemoryHandler() { return liveMemory; @@ -721,17 +700,11 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener { } } - /** - * @see ghidra.program.model.mem.Memory#getSize() - */ @Override public long getSize() { return addrSet.getNumAddresses(); } - /** - * @see ghidra.program.model.mem.Memory#getBlocks() - */ @Override public MemoryBlock[] getBlocks() { lock.acquire(); @@ -1119,7 +1092,7 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener { * The test will be something like * * for(int i=0;i getObjectClass() { return saveableObjectClass; } - /** - * @see ghidra.program.model.util.ObjectPropertyMap#getObject(ghidra.program.model.address.Address) - */ @Override public Object getObject(Address addr) { if (propertyTable == null) { @@ -381,9 +372,6 @@ public class ObjectPropertyMapDB extends PropertyMapDB implements ObjectProperty return obj; } - /** - * @see ghidra.program.model.util.PropertyMap#applyValue(ghidra.util.prop.PropertyVisitor, ghidra.program.model.address.Address) - */ @Override public void applyValue(PropertyVisitor visitor, Address addr) { Saveable obj = (Saveable) getObject(addr); @@ -392,9 +380,9 @@ public class ObjectPropertyMapDB extends PropertyMapDB implements ObjectProperty } } + // @see PropertyMapDB#getPropertyFieldClass() <- doesn't exist /** * NOTE: Custom schema is utilized. - * @see ghidra.program.database.properties.PropertyMapDB#getPropertyFieldClass() */ protected Class getPropertyFieldClass() { throw new AssertException(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ReferenceDBManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ReferenceDBManager.java index 9366cc454e..5b12bc7168 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ReferenceDBManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ReferenceDBManager.java @@ -474,9 +474,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan } } - /** - * @see ghidra.program.model.symbol.ReferenceManager#addRegisterReference(ghidra.program.model.address.Address, int, ghidra.program.model.lang.Register, ghidra.program.model.symbol.RefType, int) - */ @Override public Reference addRegisterReference(Address fromAddr, int opIndex, Register register, RefType type, SourceType sourceType) { @@ -494,9 +491,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return null; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#addOffsetMemReference(ghidra.program.model.address.Address, ghidra.program.model.address.Address, long, ghidra.program.model.symbol.RefType, int, int) - */ @Override public Reference addOffsetMemReference(Address fromAddr, Address toAddr, long offset, RefType type, SourceType sourceType, int opIndex) { @@ -513,9 +507,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return null; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#addShiftedMemReference(ghidra.program.model.address.Address, ghidra.program.model.address.Address, int, ghidra.program.model.symbol.RefType, int, int) - */ @Override public Reference addShiftedMemReference(Address fromAddr, Address toAddr, int shiftValue, RefType type, SourceType sourceType, int opIndex) { @@ -764,9 +755,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#setPrimary(ghidra.program.model.symbol.Reference, boolean) - */ @Override public void setPrimary(Reference ref, boolean isPrimary) { lock.acquire(); @@ -803,9 +791,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan } } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getReferencesFrom(ghidra.program.model.address.Address) - */ @Override public Reference[] getReferencesFrom(Address addr) { lock.acquire(); @@ -825,9 +810,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return null; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getFlowReferencesFrom(ghidra.program.model.address.Address) - */ @Override public Reference[] getFlowReferencesFrom(Address addr) { Reference[] refs = getReferencesFrom(addr); @@ -841,9 +823,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return list.toArray(refs); } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getReference(ghidra.program.model.address.Address, ghidra.program.model.address.Address, int) - */ @Override public Reference getReference(Address fromAddr, Address toAddr, int opIndex) { lock.acquire(); @@ -870,9 +849,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return null; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getReferenceCountFrom(ghidra.program.model.address.Address) - */ @Override public int getReferenceCountFrom(Address fromAddr) { RefList fromRefs = getFromRefs(fromAddr); @@ -882,9 +858,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return 0; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getReferenceCountTo(ghidra.program.model.address.Address) - */ @Override public int getReferenceCountTo(Address toAddr) { if (toAddr.isStackAddress() || toAddr.isRegisterAddress()) { @@ -898,17 +871,11 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return 0; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getReferenceDestinationCount() - */ @Override public int getReferenceDestinationCount() { return toAdapter.getRecordCount(); } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getReferenceSourceCount() - */ @Override public int getReferenceSourceCount() { return fromAdapter.getRecordCount(); @@ -944,9 +911,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return null; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getPrimaryReferenceFrom(ghidra.program.model.address.Address, int) - */ @Override public Reference getPrimaryReferenceFrom(Address addr, int opIndex) { lock.acquire(); @@ -965,9 +929,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return null; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getReferenceDestinationIterator(ghidra.program.model.address.Address, boolean) - */ @Override public AddressIterator getReferenceDestinationIterator(Address startAddr, boolean forward) { try { @@ -979,9 +940,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return null; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getReferenceDestinationIterator(ghidra.program.model.address.AddressSetView, boolean) - */ @Override public AddressIterator getReferenceDestinationIterator(AddressSetView addrSet, boolean forward) { @@ -994,9 +952,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return null; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getReferenceSourceIterator(ghidra.program.model.address.Address, boolean) - */ @Override public AddressIterator getReferenceSourceIterator(Address startAddr, boolean forward) { try { @@ -1008,17 +963,11 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return null; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getReferenceIterator(ghidra.program.model.address.Address) - */ @Override public ReferenceIterator getReferenceIterator(Address startAddr) { return new FromRefIterator(startAddr); } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getReferenceSourceIterator(ghidra.program.model.address.AddressSetView, boolean) - */ @Override public AddressIterator getReferenceSourceIterator(AddressSetView addrSet, boolean forward) { try { @@ -1030,9 +979,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return new EmptyAddressIterator(); } - /** - * @see ghidra.program.model.symbol.ReferenceManager#hasFlowReferencesFrom(ghidra.program.model.address.Address) - */ @Override public boolean hasFlowReferencesFrom(Address addr) { lock.acquire(); @@ -1058,9 +1004,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return false; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#hasReferencesFrom(ghidra.program.model.address.Address) - */ @Override public boolean hasReferencesFrom(Address fromAddr) { lock.acquire(); @@ -1084,9 +1027,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return false; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#hasReferencesFrom(ghidra.program.model.address.Address, int) - */ @Override public boolean hasReferencesFrom(Address fromAddr, int opIndex) { lock.acquire(); @@ -1112,9 +1052,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return false; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#hasReferencesTo(ghidra.program.model.address.Address) - */ @Override public boolean hasReferencesTo(Address toAddr) { if (toAddr.isStackAddress() || toAddr.isRegisterAddress()) { @@ -1142,9 +1079,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return false; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#removeAllReferencesFrom(ghidra.program.model.address.Address, ghidra.program.model.address.Address) - */ @Override public void removeAllReferencesFrom(Address beginAddr, Address endAddr) { try { @@ -1161,9 +1095,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan } } - /** - * @see ghidra.program.model.symbol.ReferenceManager#removeAllReferencesFrom(ghidra.program.model.address.Address) - */ @Override public void removeAllReferencesFrom(Address fromAddr) { try { @@ -1263,9 +1194,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan } } - /** - * @see ghidra.program.model.symbol.ReferenceManager#setAssociation(ghidra.program.model.symbol.Symbol, ghidra.program.model.symbol.Reference) - */ @Override public void setAssociation(Symbol s, Reference ref) { if (s.getSymbolType() != SymbolType.LABEL || s.isDynamic()) { @@ -1304,9 +1232,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan } } - /** - * @see ghidra.program.model.symbol.ReferenceManager#removeAssociation(ghidra.program.model.symbol.Reference) - */ @Override public void removeAssociation(Reference ref) { lock.acquire(); @@ -1323,9 +1248,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan } } - /** - * @see ghidra.program.model.symbol.ReferenceManager#updateRefType(ghidra.program.model.symbol.Reference, ghidra.program.model.symbol.RefType) - */ @Override public Reference updateRefType(Reference ref, RefType refType) { lock.acquire(); @@ -1360,9 +1282,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return null; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getReferencesTo(ghidra.program.model.address.Address) - */ @Override public ReferenceIterator getReferencesTo(Address addr) { lock.acquire(); @@ -1385,9 +1304,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return new EmptyMemReferenceIterator(); } - /** - * @see ghidra.program.database.ManagerDB#invalidateCache(boolean) - */ @Override public void invalidateCache(boolean all) { lock.acquire(); @@ -1457,17 +1373,11 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return refs.length; } - /** - * @see ghidra.program.database.ManagerDB#deleteAddressRange(ghidra.program.model.address.Address, ghidra.program.model.address.Address, ghidra.util.task.TaskMonitor) - */ @Override public void deleteAddressRange(Address startAddr, Address endAddr, TaskMonitor monitor) { removeAllReferencesFrom(startAddr, endAddr); } - /** - * @see ghidra.program.database.ManagerDB#moveAddressRange(ghidra.program.model.address.Address, ghidra.program.model.address.Address, long, ghidra.util.task.TaskMonitor) - */ @Override public void moveAddressRange(Address fromAddr, Address toAddr, long length, TaskMonitor monitor) throws CancelledException { @@ -1826,17 +1736,11 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan fromIter = getReferenceSourceIterator(set, true); } - /** - * @see java.util.Iterator#remove() - */ @Override public void remove() { throw new UnsupportedOperationException(); } - /** - * @see ghidra.program.model.symbol.ReferenceIterator#hasNext() - */ @Override public boolean hasNext() { try { @@ -1862,9 +1766,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return (refIter != null); } - /** - * @see ghidra.program.model.symbol.ReferenceIterator#next() - */ @Override public Reference next() { if (hasNext()) { @@ -1888,30 +1789,17 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan this.iter = iter; } - /** - * @see java.util.Iterator#remove() - */ @Override public void remove() { throw new UnsupportedOperationException(); } - /* - * (non-Javadoc) - * - * @see ghidra.program.model.address.AddressIterator#hasNext() - */ @Override public boolean hasNext() { findNext(); return currentAddress != null; } - /* - * (non-Javadoc) - * - * @see ghidra.program.model.address.AddressIterator#next() - */ @Override public Address next() { findNext(); @@ -1943,17 +1831,11 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan } } - /** - * @see db.util.ErrorHandler#dbError(java.io.IOException) - */ @Override public void dbError(IOException e) { program.dbError(e); } - /** - * @see ghidra.program.model.symbol.ReferenceManager#delete(ghidra.program.model.symbol.Reference) - */ @Override public void delete(Reference ref) { removeReference(ref.getFromAddress(), ref.getToAddress(), ref.getOperandIndex()); @@ -1969,9 +1851,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan // } } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getExternalReferences() - */ @Override public ReferenceIterator getExternalReferences() { AddressSet set = new AddressSet(AddressSpace.EXTERNAL_SPACE.getMinAddress(), @@ -1980,9 +1859,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return new ExternalReferenceIterator(it); } - /** - * @see ghidra.program.model.symbol.ReferenceManager#addReference(ghidra.program.model.symbol.Reference) - */ @Override public Reference addReference(Reference ref) { Address from = ref.getFromAddress(); @@ -2029,9 +1905,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return memRef; } - /** - * @see ghidra.program.model.symbol.ReferenceManager#getReferencesFrom(ghidra.program.model.address.Address, int) - */ @Override public Reference[] getReferencesFrom(Address fromAddr, int opIndex) { Reference[] retRefs = null; @@ -2072,17 +1945,11 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan this.it = it; } - /** - * @see ghidra.program.model.symbol.ReferenceIterator#hasNext() - */ @Override public boolean hasNext() { return (refIt != null && refIt.hasNext()) || it.hasNext(); } - /** - * @see ghidra.program.model.symbol.ReferenceIterator#next() - */ @Override public Reference next() { if (refIt == null || !refIt.hasNext()) { @@ -2098,9 +1965,6 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan return null; } - /** - * @see java.util.Iterator#remove() - */ @Override public void remove() { throw new UnsupportedOperationException(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/AddressRangeObjectMap.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/AddressRangeObjectMap.java index 8497b586fc..35b82e9991 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/AddressRangeObjectMap.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/AddressRangeObjectMap.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,7 +64,6 @@ public class AddressRangeObjectMap { * @param length the number of addresses to move. * @param monitor the task monitor. * @throws CancelledException if the user canceled the operation via the task monitor. - * @throws AddressOverflowException if the length is such that a address wrap occurs */ public void moveAddressRange(Address fromAddr, Address toAddr, long length, TaskMonitor monitor) throws CancelledException { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/OldProgramContextDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/OldProgramContextDB.java index 8acb7aaa8a..c5ca9c777f 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/OldProgramContextDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/OldProgramContextDB.java @@ -72,15 +72,10 @@ public class OldProgramContextDB implements ProgramContext, DefaultProgramContex /** * Constructs a new ProgramContextDB object * @param dbHandle the handle to the database. - * @param openMode the mode that the program is opened. * @param errHandler the error handler * @param language the processor language * @param addrMap the address map. * @param lock the program synchronization lock - * @param monitor the taskmonitor used if upgrading. - * @throws VersionException thrown if the database is the save version as this class. - * @throws CancelledException thrown if the user cancels the upgrade. - * @throws IOException thrown if a database io error occurs. */ public OldProgramContextDB(DBHandle dbHandle, ErrorHandler errHandler, Language language, AddressMap addrMap, Lock lock) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/reloc/RelocationManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/reloc/RelocationManager.java index adfb97b3f0..752795612a 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/reloc/RelocationManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/reloc/RelocationManager.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,7 +55,6 @@ public class RelocationManager implements RelocationTable, ManagerDB { * @param monitor the task monitor * @throws VersionException * @throws IOException - * @throws CancelledException */ public RelocationManager(DBHandle handle, AddressMap addrMap, int openMode, Lock lock, TaskMonitor monitor) throws VersionException, IOException { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/LibrarySymbol.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/LibrarySymbol.java index 5ce672563a..be48274022 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/LibrarySymbol.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/LibrarySymbol.java @@ -82,9 +82,6 @@ public class LibrarySymbol extends SymbolDB { } } - /** - * @see ghidra.program.model.symbol.Symbol#setSymbolData3(java.lang.String) - */ @Override public void setSymbolData3(String newPath) { String oldPath = getSymbolData3(); @@ -95,9 +92,6 @@ public class LibrarySymbol extends SymbolDB { oldPath, newPath); } - /** - * @see ghidra.program.model.symbol.Symbol#getSymbolType() - */ public SymbolType getSymbolType() { return SymbolType.LIBRARY; } @@ -107,9 +101,7 @@ public class LibrarySymbol extends SymbolDB { return true; } - /** - * @see ghidra.program.model.symbol.Symbol#getObject() - */ + @Override public Object getObject() { if (library == null) { library = new LibraryDB(this, symbolMgr.getProgram().getNamespaceManager()); @@ -117,9 +109,6 @@ public class LibrarySymbol extends SymbolDB { return library; } - /** - * @see ghidra.program.model.symbol.Symbol#isPrimary() - */ @Override public boolean isPrimary() { return true; @@ -133,9 +122,6 @@ public class LibrarySymbol extends SymbolDB { return null; } - /** - * @see ghidra.program.model.symbol.Symbol#isValidParent(ghidra.program.model.symbol.Namespace) - */ @Override public boolean isValidParent(Namespace parent) { return SymbolType.LIBRARY.isValidParent(symbolMgr.getProgram(), parent, address, diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/NamespaceManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/NamespaceManager.java index 4087b4e90b..5f734fca56 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/NamespaceManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/NamespaceManager.java @@ -54,9 +54,7 @@ public class NamespaceManager implements ManagerDB { * @param openMode the open mode * @param lock the program synchronization lock * @param monitor the task monitor. - * @throws IOException if a database error occurs. * @throws VersionException if the table version is different from this adapter. - * @throws CancelledException if the user cancels the upgrade. */ public NamespaceManager(DBHandle handle, ErrorHandler errHandler, AddressMap addrMap, int openMode, Lock lock, TaskMonitor monitor) throws VersionException { @@ -74,9 +72,6 @@ public class NamespaceManager implements ManagerDB { } - /** - * @see ghidra.program.database.ManagerDB#deleteAddressRange(ghidra.program.model.address.Address, ghidra.program.model.address.Address, ghidra.util.task.TaskMonitor) - */ @Override public void deleteAddressRange(Address startAddr, Address endAddr, TaskMonitor monitor) throws CancelledException { @@ -95,26 +90,17 @@ public class NamespaceManager implements ManagerDB { lastBody = null; } - /** - * @see ghidra.program.database.ManagerDB#invalidateCache(boolean) - */ @Override public void invalidateCache(boolean all) throws IOException { clearCache(); } - /** - * @see ghidra.program.database.ManagerDB#setProgram(ghidra.program.database.ProgramDB) - */ @Override public void setProgram(ProgramDB program) { this.symbolMgr = (SymbolManager) program.getSymbolTable(); globalNamespace = program.getGlobalNamespace(); } - /** - * @see ghidra.program.database.ManagerDB#programReady(int, int, ghidra.util.task.TaskMonitor) - */ @Override public void programReady(int openMode, int currentRevision, TaskMonitor monitor) throws IOException, CancelledException { @@ -215,7 +201,7 @@ public class NamespaceManager implements ManagerDB { /** * Checks if an existing namespace's address set intersects with * the given set. If so, then it throws an OverlappingNamespaceException. - * @throws if the address set to test overlaps a namespace body. + * @throws OverlappingNamespaceException if the address set to test overlaps a namespace body. */ public void overlapsNamespace(AddressSetView set) throws OverlappingNamespaceException { AddressRangeIterator iter = @@ -312,9 +298,6 @@ public class NamespaceManager implements ManagerDB { } } - /** - * @see ghidra.program.database.ManagerDB#moveAddressRange(ghidra.program.model.address.Address, ghidra.program.model.address.Address, long, ghidra.util.task.TaskMonitor) - */ @Override public void moveAddressRange(Address fromAddr, Address toAddr, long length, TaskMonitor monitor) throws AddressOverflowException, CancelledException { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/SymbolManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/SymbolManager.java index 7096df0382..48db66164a 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/SymbolManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/SymbolManager.java @@ -1325,8 +1325,8 @@ public class SymbolManager implements SymbolTable, ManagerDB { /** * Move symbol. Only symbol address is changed. * References must be moved separately. - * @param fromAddr - * @param toAddr + * @param oldAddr the old symbol address + * @param newAddr the new symbol address */ public void moveSymbolsAt(Address oldAddr, Address newAddr) { lock.acquire(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressRangeMapDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressRangeMapDB.java index 28bcbb8912..a238abff14 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressRangeMapDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressRangeMapDB.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -160,8 +159,8 @@ public class AddressRangeMapDB implements DBListener { } /** - * Returns the value associated with the given index. - * @param index + * Returns the value associated with the given address. + * @param addr the address of the value * @return value or null no value exists */ public Field getValue(Address addr) { @@ -202,10 +201,9 @@ public class AddressRangeMapDB implements DBListener { /** * Associates the given value with every index from start to end (inclusive) * Any previous associates are overwritten. - * @param start - * @param end + * @param startAddr the start address. + * @param endAddr the end address. * @param value value to be painted, or null for value removal. - * @throws IOException */ public void paintRange(Address startAddr, Address endAddr, Field value) { lock.acquire(); @@ -235,7 +233,6 @@ public class AddressRangeMapDB implements DBListener { * @param length the number of addresses to move. * @param monitor the task monitor. * @throws CancelledException if the user canceled the operation via the task monitor. - * @throws AddressOverflowException if the length is such that a address wrap occurs */ public void moveAddressRange(Address fromAddr, Address toAddr, long length, TaskMonitor monitor) throws CancelledException { @@ -383,8 +380,8 @@ public class AddressRangeMapDB implements DBListener { /** * Remove values from the given range. - * @param start - * @param end + * @param startAddr the start address. + * @param endAddr the end address. */ public void clearRange(Address startAddr, Address endAddr) { lock.acquire(); @@ -510,8 +507,7 @@ public class AddressRangeMapDB implements DBListener { /** * Returns the bounding address-range containing addr and the the same value throughout. - * @param register - * @param addr + * @param addr the contained address * @return single value address-range containing addr */ public AddressRange getAddressRangeContaining(Address addr) { @@ -911,9 +907,6 @@ public class AddressRangeMapDB implements DBListener { } - /** - * @see ghidra.framework.store.db.DBListener#dbRestored(db.DBHandle) - */ @Override public void dbRestored(DBHandle dbh) { lastStart = null; @@ -923,16 +916,10 @@ public class AddressRangeMapDB implements DBListener { findTable(); } - /** - * @see db.DBListener#dbClosed(db.DBHandle) - */ @Override public void dbClosed(DBHandle dbh) { } - /** - * @see ghidra.framework.store.db.DBListener#tableDeleted(db.DBHandle, ghidra.framework.store.db.Table) - */ @Override public void tableDeleted(DBHandle dbh, Table table) { if (table == rangeMapTable) { @@ -944,9 +931,6 @@ public class AddressRangeMapDB implements DBListener { } } - /** - * @see ghidra.framework.store.db.DBListener#tableAdded(db.DBHandle, ghidra.framework.store.db.Table) - */ @Override public void tableAdded(DBHandle dbh, Table table) { if (tableName.equals(table.getName())) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/SharedRangeMapDB.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/SharedRangeMapDB.java index ed6888297e..ef86e026cd 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/SharedRangeMapDB.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/SharedRangeMapDB.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +30,7 @@ import db.util.ErrorHandler; * This map allows values to share a given range with other values. * @deprecated This map class should not be used except by the OldFunctionMapDB class */ +@Deprecated public class SharedRangeMapDB { private DBHandle dbHandle; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java index cf7ba7be7c..2acc0fbccf 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/Disassembler.java @@ -181,7 +181,6 @@ public class Disassembler implements DisassemblerConflictHandler { /** * Get a suitable disassembler instance. * @param program the program to be disassembled. - * @param language the language module that "understands" the bytes. * @param markBadInstructions if true bad instructions will be marked * @param markUnimplementedPcode if true instructions with unimplemented pcode will be marked * @param restrictToExecuteMemory if true disassembly will only be permitted with executable memory blocks @@ -243,7 +242,6 @@ public class Disassembler implements DisassemblerConflictHandler { /** * Disassembler constructor * @param program the program to be disassembled. - * @param language the language module that "understands" the bytes. * @param markBadInstructions if true bad instructions will be marked * @param markUnimplementedPcode if true instructions with unimplemented pcode will be marked * @param restrictToExecuteMemory if true disassembly will only be permitted with executable memory blocks diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerContextImpl.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerContextImpl.java index c66736e438..fd139c2a54 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerContextImpl.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/disassemble/DisassemblerContextImpl.java @@ -259,7 +259,7 @@ public class DisassemblerContextImpl implements DisassemblerContext { * * @param destAddr * @param isFallThrough - * @return + * @return the flowed context value */ public RegisterValue getFlowContextValue(Address destAddr, boolean isFallThrough) { return getFlowContextValue(Address.NO_ADDRESS, destAddr, isFallThrough); @@ -269,7 +269,7 @@ public class DisassemblerContextImpl implements DisassemblerContext { * Get flowed context value at a destination address, that has been flowed from the fromAddr, without affecting state. * * @param fromAddr address that this flow is flowing from. - * @param toAddr the starting address of a new instruction flow. + * @param destAddr the starting address of a new instruction flow. * @throws IllegalStateException if a previous flow was not ended. */ public RegisterValue getFlowContextValue(Address fromAddr, Address destAddr, boolean isFallThrough) { @@ -337,7 +337,7 @@ public class DisassemblerContextImpl implements DisassemblerContext { * The future flow state values are then loaded into the current context. * * @param fromAddr address that this flow is flowing from. - * @param toAddr the starting address of a new instruction flow. + * @param destAddr the starting address of a new instruction flow. * @throws IllegalStateException if a previous flow was not ended. */ public void flowToAddress(Address fromAddr, Address destAddr) { @@ -565,25 +565,16 @@ public class DisassemblerContextImpl implements DisassemblerContext { currentAddress = null; } - /** - * @see ghidra.program.model.lang.ProcessorContext#getRegisters() - */ @Override public Register[] getRegisters() { return programContext.getRegisters(); } - /** - * @see ghidra.program.model.lang.ProcessorContext#getRegister(java.lang.String) - */ @Override public Register getRegister(String name) { return programContext.getRegister(name); } - /** - * @see ghidra.program.model.lang.ProcessorContext#getRegisterValue(ghidra.program.model.lang.Register) - */ @Override public RegisterValue getRegisterValue(Register register) { if (register == null) { @@ -618,9 +609,6 @@ public class DisassemblerContextImpl implements DisassemblerContext { return programValue.combineValues(value); } - /** - * @see ghidra.program.model.lang.ProcessorContext#getValue(ghidra.program.model.lang.Register, boolean) - */ @Override public BigInteger getValue(Register register, boolean signed) { RegisterValue value = getRegisterValue(register); @@ -659,17 +647,11 @@ public class DisassemblerContextImpl implements DisassemblerContext { setRegisterValue(fromAddr, toAddr, new RegisterValue(register, newValue), true); } - /* (non-Javadoc) - * @see ghidra.program.disassemble.DisassemblerConextIfc#setFutureRegisterValue(ghidra.program.model.address.Address, ghidra.program.model.lang.RegisterValue) - */ @Override public void setFutureRegisterValue(Address address, RegisterValue value) { setFutureRegisterValue(Address.NO_ADDRESS, address, value); } - /* (non-Javadoc) - * @see ghidra.program.disassemble.DisassemblerConextIfc#setFutureRegisterValue(ghidra.program.model.address.Address, ghidra.program.model.address.Address, ghidra.program.model.lang.RegisterValue) - */ @Override public void setFutureRegisterValue(Address fromAddr, Address toAddr, RegisterValue value) { setRegisterValue(fromAddr, toAddr, value, true); @@ -771,26 +753,17 @@ public class DisassemblerContextImpl implements DisassemblerContext { } } - /** - * @see ghidra.program.model.lang.ProcessorContext#hasValue(ghidra.program.model.lang.Register) - */ @Override public boolean hasValue(Register register) { BigInteger value = getValue(register, true); return value != null; } - /** - * @see ghidra.program.model.lang.ProcessorContext#setValue(ghidra.program.model.lang.Register, java.math.BigInteger) - */ @Override public void setValue(Register register, BigInteger value) { setRegisterValue(new RegisterValue(register, value)); } - /** - * @see ghidra.program.model.lang.ProcessorContext#clearRegister(ghidra.program.model.lang.Register) - */ @Override public void clearRegister(Register register) { if (!isFlowActive()) { @@ -841,7 +814,6 @@ public class DisassemblerContextImpl implements DisassemblerContext { * affect the current context state at the current address in a non-delayed fashion. * * @param value register value - * @param address disassembly address * @param fromAddr the address from which this flow originated * @param toAddr the future flow address to save the value. */ @@ -860,9 +832,6 @@ public class DisassemblerContextImpl implements DisassemblerContext { setRegisterValue(fromAddr, toAddr, value, true); } - /** - * @see ghidra.program.model.lang.ProcessorContext#setRegisterValue(ghidra.program.model.lang.RegisterValue) - */ @Override public void setRegisterValue(RegisterValue value) { if (value == null) { @@ -913,8 +882,8 @@ public class DisassemblerContextImpl implements DisassemblerContext { * Returns the future register value at the specified address that occured because of a flow * from the fromAddr. If no future value is stored, it will return the value stored in the program. * - * @param value register value - * @param fromAddr the address from which this flow originated + * @param register the register to get a value for. + * @param fromAddr the address from which this flow originated. * @param toAddr the future flow address to save the value. * @param signed if true, interpret the value as signed. * @return the value of the register at the location, or null if a full value is not established. @@ -936,7 +905,6 @@ public class DisassemblerContextImpl implements DisassemblerContext { * * @param register the register to get a value for. * @param address the address at which to get a value. - * @param signed if true, interpret the value as signed. * @return a RegisterValue object if one has been stored in the future flow or the program. * The RegisterValue object may have a "no value" state for the bits specified by the given register. * Also, null may be returned if no value have been stored. @@ -953,7 +921,6 @@ public class DisassemblerContextImpl implements DisassemblerContext { * @param register the register to get a value for. * @param fromAddr the address from which the flow originated * @param destAddr the address at which to get a value. - * @param signed if true, interpret the value as signed. * * @return a RegisterValue object if one has been stored in the future flow or the program. * The RegisterValue object may have a "no value" state for the bits specified by the given register. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AbstractAddressSpace.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AbstractAddressSpace.java index 5f71b03f6a..3e4cb2a390 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AbstractAddressSpace.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AbstractAddressSpace.java @@ -129,35 +129,21 @@ abstract class AbstractAddressSpace implements AddressSpace { return cnt; } - /** - * @see ghidra.program.model.address.AddressSpace#hasSignedOffset() - */ @Override public boolean hasSignedOffset() { return signed; } - /** - * - * @see ghidra.program.model.address.AddressSpace#getName() - */ @Override public String getName() { return name; } - /** - * - * @see ghidra.program.model.address.AddressSpace#getSize() - */ @Override public int getSize() { return size; } - /** - * @see ghidra.program.model.address.AddressSpace#getAddressableUnitSize() - */ @Override public int getAddressableUnitSize() { return unitSize; @@ -200,9 +186,6 @@ abstract class AbstractAddressSpace implements AddressSpace { return MathUtilities.unsignedDivide(byteOffset, wordSize); } - /** - * @see ghidra.program.model.address.AddressSpace#getPointerSize() - */ @Override public int getPointerSize() { int ptrSize = size / 8; @@ -212,10 +195,6 @@ abstract class AbstractAddressSpace implements AddressSpace { return ptrSize; } - /** - * - * @see ghidra.program.model.address.AddressSpace#getType() - */ @Override public int getType() { return type; @@ -229,10 +208,6 @@ abstract class AbstractAddressSpace implements AddressSpace { return spaceID >> ID_UNIQUE_SHIFT; } - /** - * - * @see ghidra.program.model.address.AddressSpace#getAddress(java.lang.String) - */ @Override public Address getAddress(String addrString) throws AddressFormatException { return getAddress(addrString, true); @@ -303,10 +278,6 @@ abstract class AbstractAddressSpace implements AddressSpace { } } - /** - * - * @see ghidra.program.model.address.AddressSpace#subtract(ghidra.program.model.address.Address, ghidra.program.model.address.Address) - */ @Override public long subtract(Address addr1, Address addr2) { AddressSpace space1 = addr1.getAddressSpace(); @@ -321,28 +292,17 @@ abstract class AbstractAddressSpace implements AddressSpace { return addr1.getOffset() - addr2.getOffset(); } - /** - * - * @see ghidra.program.model.address.AddressSpace#subtractWrap(ghidra.program.model.address.Address, long) - */ @Override public Address subtractWrap(Address addr, long displacement) { testAddressSpace(addr); return getUncheckedAddress(truncateOffset(addr.getOffset() - displacement)); } - /** - * @see ghidra.program.model.address.AddressSpace#subtractWrapSpace(ghidra.program.model.address.Address, long) - */ @Override public Address subtractWrapSpace(Address addr, long displacement) { return subtractWrap(addr, displacement); } - /** - * - * @see ghidra.program.model.address.AddressSpace#subtractNoWrap(ghidra.program.model.address.Address, long) - */ @Override public Address subtractNoWrap(Address addr, long displacement) throws AddressOverflowException { if (displacement < 0) { @@ -383,10 +343,6 @@ abstract class AbstractAddressSpace implements AddressSpace { return getUncheckedAddress(result); } - /** - * - * @see ghidra.program.model.address.AddressSpace#subtract(ghidra.program.model.address.Address, long) - */ @Override public Address subtract(Address addr, long displacement) { try { @@ -397,28 +353,17 @@ abstract class AbstractAddressSpace implements AddressSpace { } } - /** - * - * @see ghidra.program.model.address.AddressSpace#addWrap(ghidra.program.model.address.Address, long) - */ @Override public Address addWrap(Address addr, long displacement) { testAddressSpace(addr); return getUncheckedAddress(truncateOffset(addr.getOffset() + displacement)); } - /** - * @see ghidra.program.model.address.AddressSpace#addWrapSpace(ghidra.program.model.address.Address, long) - */ @Override public Address addWrapSpace(Address addr, long displacement) { return addWrap(addr, displacement); } - /** - * - * @see ghidra.program.model.address.AddressSpace#addNoWrap(ghidra.program.model.address.Address, long) - */ @Override public Address addNoWrap(Address addr, long displacement) throws AddressOverflowException { @@ -480,10 +425,6 @@ abstract class AbstractAddressSpace implements AddressSpace { return getUncheckedAddress(resultOffset); } - /** - * - * @see ghidra.program.model.address.AddressSpace#add(ghidra.program.model.address.Address, long) - */ @Override public Address add(Address addr, long displacement) throws AddressOutOfBoundsException { try { @@ -515,10 +456,6 @@ abstract class AbstractAddressSpace implements AddressSpace { return true; } - /** - * - * @see ghidra.program.model.address.AddressSpace#isSuccessor(ghidra.program.model.address.Address, ghidra.program.model.address.Address) - */ @Override public boolean isSuccessor(Address addr1, Address addr2) { if (!addr1.getAddressSpace().equals(addr2.getAddressSpace())) { @@ -531,17 +468,11 @@ abstract class AbstractAddressSpace implements AddressSpace { return addr1.getOffset() == addr2.getOffset() - 1; } - /** - * @see ghidra.program.model.address.AddressSpace#getMaxAddress() - */ @Override public Address getMaxAddress() { return maxAddress; } - /** - * @see ghidra.program.model.address.AddressSpace#getMinAddress() - */ @Override public Address getMinAddress() { return minAddress; @@ -559,10 +490,6 @@ abstract class AbstractAddressSpace implements AddressSpace { return baseCompare; } - /** - * - * @see java.lang.Comparable#compareTo(java.lang.Object) - */ @Override public int compareTo(AddressSpace space) { if (space == this) { @@ -599,10 +526,6 @@ abstract class AbstractAddressSpace implements AddressSpace { return c; } - /** - * - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (obj == this) { @@ -628,19 +551,11 @@ abstract class AbstractAddressSpace implements AddressSpace { return type == s.getType() && name.equals(s.getName()) && size == s.getSize(); } - /** - * - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return hashcode; } - /** - * - * @see ghidra.program.model.address.AddressSpace#getBaseSpaceID() - */ @Override public int getBaseSpaceID() { return spaceID; @@ -658,17 +573,11 @@ abstract class AbstractAddressSpace implements AddressSpace { } } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { return name + ":"; } - /** - * @see ghidra.program.model.address.AddressSpace#showSpaceName() - */ @Override public boolean showSpaceName() { return showSpaceName; @@ -692,9 +601,6 @@ abstract class AbstractAddressSpace implements AddressSpace { return addr; } - /** - * @see ghidra.program.model.address.AddressSpace#makeValidOffset(long) - */ @Override public long makeValidOffset(long offset) throws AddressOutOfBoundsException { // TODO: Verify that this handle all cases - seems like it would not @@ -725,9 +631,6 @@ abstract class AbstractAddressSpace implements AddressSpace { UnsignedDataUtils.unsignedLessThanOrEqual(offset, maxOffset); } - /** - * @see ghidra.program.model.address.AddressSpace#truncateOffset(long) - */ @Override public long truncateOffset(long offset) { if ((offset >= minOffset && offset <= maxOffset) || spaceSize == 0) { @@ -748,17 +651,11 @@ abstract class AbstractAddressSpace implements AddressSpace { return offset; } - /** - * @see ghidra.program.model.address.AddressSpace#truncateOffset(long) - */ @Override public long truncateAddressableWordOffset(long wordOffset) { return wordOffset & wordAddressMask; } - /** - * @see ghidra.program.model.address.AddressSpace#isMemorySpace() - */ @Override public boolean isMemorySpace() { return type == TYPE_RAM || type == TYPE_CODE || type == TYPE_OTHER; @@ -774,65 +671,41 @@ abstract class AbstractAddressSpace implements AddressSpace { return type == TYPE_OTHER; } - /** - * @see ghidra.program.model.address.AddressSpace#isHashSpace() - */ @Override public boolean isHashSpace() { return this == HASH_SPACE; } - /** - * @see ghidra.program.model.address.AddressSpace#isRegisterSpace() - */ @Override public boolean isRegisterSpace() { return type == TYPE_REGISTER; } - /** - * @see ghidra.program.model.address.AddressSpace#isStackSpace() - */ @Override public boolean isStackSpace() { return type == TYPE_STACK; } - /** - * @see ghidra.program.model.address.AddressSpace#isUniqueSpace() - */ @Override public boolean isUniqueSpace() { return type == TYPE_UNIQUE; } - /** - * @see ghidra.program.model.address.AddressSpace#isConstantSpace() - */ @Override public boolean isConstantSpace() { return type == TYPE_CONSTANT; } - /** - * @see ghidra.program.model.address.AddressSpace#isVariableSpace() - */ @Override public boolean isVariableSpace() { return type == TYPE_VARIABLE; } - /** - * @see ghidra.program.model.address.AddressSpace#isExternalSpace() - */ @Override public boolean isExternalSpace() { return type == TYPE_EXTERNAL; } - /** - * @see ghidra.program.model.address.AddressSpace#isOverlaySpace() - */ @Override public boolean isOverlaySpace() { return false; @@ -842,9 +715,6 @@ abstract class AbstractAddressSpace implements AddressSpace { showSpaceName = b; } - /** - * @see ghidra.program.model.address.AddressSpace#hasMappedRegisters() - */ @Override public boolean hasMappedRegisters() { return hasMemoryMappedRegisters; @@ -859,9 +729,6 @@ abstract class AbstractAddressSpace implements AddressSpace { hasMemoryMappedRegisters = hasRegisters; } - /** - * @see ghidra.program.model.address.AddressSpace#getPhysicalSpace() - */ @Override public AddressSpace getPhysicalSpace() { return this; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/Address.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/Address.java index 86aa76494c..5b6aa846a7 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/Address.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/Address.java @@ -73,8 +73,9 @@ public interface Address extends Comparable
      { * is specified. * @param offset the offset for the new address. * @param isAddressableWordOffset if true the specified offset is an addressable unit/word offset, - * otherwise offset is a byte offset. See {@link #getAddressableUnitSize()} - * to understand the distinction (i.e., wordOffset = byteOffset * addressableUnitSize). + * otherwise offset is a byte offset. See {@link ghidra.program.model.address.AddressSpace#getAddressableUnitSize() + * AddressSpace#getAddressableUnitSize()} to understand the distinction + * (i.e., wordOffset = byteOffset * addressableUnitSize). * @return address with given offset * @throws AddressOutOfBoundsException if the offset is less than 0 or greater * than the max offset allowed for this space. @@ -90,8 +91,9 @@ public interface Address extends Comparable
      { * is specified. * @param offset the offset for the new address. * @param isAddressableWordOffset if true the specified offset is an addressable unit/word offset, - * otherwise offset is a byte offset. See {@link #getAddressableUnitSize()} - * to understand the distinction (i.e., wordOffset = byteOffset * addressableUnitSize). + * otherwise offset is a byte offset. See {@link ghidra.program.model.address.AddressSpace#getAddressableUnitSize() + * AddressSpace#getAddressableUnitSize()} to understand the distinction + * (i.e., wordOffset = byteOffset * addressableUnitSize). * @return address with given byte offset truncated to the physical space size */ Address getNewTruncatedAddress(long offset, boolean isAddressableWordOffset); @@ -387,10 +389,11 @@ public interface Address extends Comparable
      { /** * Returns true if this address represents a location in register space. - * @depricate use of this method is highly discouraged since since registers + * @deprecated use of this method is highly discouraged since since registers * may also exist in a memory space. The address for such registers * would return false from this method. */ + @Deprecated public boolean isRegisterAddress(); /** diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressMapImpl.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressMapImpl.java index d0fbd3975b..fa68939881 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressMapImpl.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressMapImpl.java @@ -21,7 +21,7 @@ import java.util.*; /** * AddressMapImpl provides a stand-alone AddressMap. - * An AddressMapimpl instance should only be used to decode keys which it has generated. + * An AddressMapImpl instance should only be used to decode keys which it has generated. * If this map is used for a specific program instance, the map should be discard if any changes * are made to that programs address map (e.g., removing or renaming overlay spaces). */ @@ -169,7 +169,7 @@ public class AddressMapImpl { } /** - * @see ghidra.program.model.address.AddressMap#decodeAddress(long) + * @see ghidra.program.database.map.AddressMap#decodeAddress(long) */ public synchronized Address decodeAddress(long value) { if ((value & MAP_ID_MASK) != mapIdBits) { @@ -192,7 +192,7 @@ public class AddressMapImpl { * single program should be passed to this method. Only limited checking is not performed in order to * improve performance. * @param addr address - * @see ghidra.program.model.address.AddressMap#getKey(ghidra.program.model.address.Address) + * @see ghidra.program.database.map.AddressMap#getKey(Address, boolean) */ public synchronized long getKey(Address addr) { return mapIdBits | ((long) getBaseAddressIndex(addr) << ADDR_OFFSET_SIZE) | @@ -200,7 +200,7 @@ public class AddressMapImpl { } /** - * @see ghidra.program.model.address.AddressMap#findKeyRange(java.util.List, ghidra.program.model.address.Address) + * @see ghidra.program.database.map.AddressMap#findKeyRange(List, Address) */ public int findKeyRange(List keyRangeList, Address addr) { if (addr == null) { @@ -210,7 +210,7 @@ public class AddressMapImpl { } /** - * @see ghidra.program.model.address.AddressMap#getKeyRanges(ghidra.program.model.address.Address, ghidra.program.model.address.Address) + * @see ghidra.program.database.map.AddressMap#getKeyRanges(Address, Address, boolean) */ public List getKeyRanges(Address start, Address end) { if (start.getAddressSpace() != end.getAddressSpace() || start.getOffset() > end.getOffset()) { @@ -222,7 +222,7 @@ public class AddressMapImpl { } /** - * @see ghidra.program.model.address.AddressMap#getKeyRanges(ghidra.program.model.address.AddressSetView) + * @see ghidra.program.database.map.AddressMap#getKeyRanges(AddressSetView, boolean) */ public synchronized List getKeyRanges(AddressSetView set) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSet.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSet.java index 178aa2bdf8..b3d4ae237d 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSet.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressSet.java @@ -83,7 +83,7 @@ public class AddressSet implements AddressSetView { * Creates a new Address set containing a single range * @param start the start address of the range * @param end the end address of the range - * @param addressFactory NOT USED. + * @param factory NOT USED. * @deprecated use {@link #AddressSet(Address, Address)} (will be kept until at least Ghidra 6.2) */ @Deprecated @@ -106,8 +106,8 @@ public class AddressSet implements AddressSetView { /** * Create a new Address Set from an existing Address Set. - * @param addrSet Existing Address Set to clone. - * @param addressFactory NOT USED. + * @param set Existing Address Set to clone. + * @param factory NOT USED. * @deprecated use {@link #AddressSet(AddressSetView)} (will be kept until at least Ghidra 6.2) */ @Deprecated @@ -117,7 +117,7 @@ public class AddressSet implements AddressSetView { /** * Create a new Address Set from an existing Address Set. - * @param addrSet Existing Address Set to clone. + * @param set Existing Address Set to clone. */ public AddressSet(AddressSetView set) { add(set); @@ -126,7 +126,7 @@ public class AddressSet implements AddressSetView { /** * Create a new Address containing a single address. * @param addr the address to be included in this address set. - * @param addressFactory NOT USED. + * @param factory NOT USED. * @deprecated use {@link #AddressSet(Address)} (will be kept until at least Ghidra 6.2) */ @Deprecated diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/OverlayAddressSpace.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/OverlayAddressSpace.java index e50682a9b4..29ffc40214 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/OverlayAddressSpace.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/OverlayAddressSpace.java @@ -113,9 +113,6 @@ public class OverlayAddressSpace extends AbstractAddressSpace { // return translateAddress(super.subtractWrap(addr, displacement)); // } - /** - * @see ghidra.program.model.address.GenericAddressSpace#isOverlaySpace() - */ @Override public boolean isOverlaySpace() { return originalSpace != null; @@ -125,17 +122,11 @@ public class OverlayAddressSpace extends AbstractAddressSpace { return originalSpace; } - /** - * @see ghidra.program.model.address.AddressSpace#getPhysicalSpace() - */ @Override public AddressSpace getPhysicalSpace() { return originalSpace.getPhysicalSpace(); } - /** - * @see ghidra.program.model.address.AddressSpace#hasMappedRegisters() - */ @Override public boolean hasMappedRegisters() { return originalSpace.hasMappedRegisters(); @@ -157,9 +148,6 @@ public class OverlayAddressSpace extends AbstractAddressSpace { return new GenericAddress(offset, this); } - /** - * @see ghidra.program.model.address.AddressSpace#getAddress(long) - */ @Override public Address getAddress(long offset) { if (contains(offset)) { @@ -168,9 +156,6 @@ public class OverlayAddressSpace extends AbstractAddressSpace { return originalSpace.getAddress(offset); } - /** - * @see ghidra.program.model.address.AbstractAddressSpace#getUncheckedAddress(long, long) - */ @Override protected Address getUncheckedAddress(long offset) { return new GenericAddress(offset, this); @@ -239,10 +224,6 @@ public class OverlayAddressSpace extends AbstractAddressSpace { return databaseKey; } - /** - * - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (obj == this) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleDestReferenceIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleDestReferenceIterator.java index 6ca0e8cea0..a02dff7586 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleDestReferenceIterator.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleDestReferenceIterator.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -78,6 +77,7 @@ public class SimpleDestReferenceIterator implements CodeBlockReferenceIterator { * @throws CancelledException if the monitor cancels the operation. * @deprecated this method should be avoided since it repeats the work of the iterator */ + @Deprecated public static int getNumDestinations(CodeBlock block, boolean followIndirectFlows, TaskMonitor monitor) throws CancelledException { return getDestinations(block, null, followIndirectFlows, monitor); } diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleSourceReferenceIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleSourceReferenceIterator.java index debd597ff3..67495f7b0f 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleSourceReferenceIterator.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleSourceReferenceIterator.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -78,6 +77,7 @@ public class SimpleSourceReferenceIterator implements CodeBlockReferenceIterator * @throws CancelledException if the monitor cancels the operation. * @deprecated this method should be avoided since it repeats the work of the iterator */ + @Deprecated public static int getNumSources(CodeBlock block, boolean followIndirectFlows, TaskMonitor monitor) throws CancelledException { return getSources(block, null, followIndirectFlows, monitor); } diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SingleEntSubIterator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SingleEntSubIterator.java index 8b6934d83a..a03ab0ee6b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SingleEntSubIterator.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SingleEntSubIterator.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +39,7 @@ import java.util.LinkedList; * by B (due to a cycle), then this iterator will include it twice rather than * skipping over the identical address set. This is because the iterator works by * iterating through M-model subroutines, and wherever M-model subroutines have - * n > 1 multiple entry points, the iterator produces an O-model subroutine + * n > 1 multiple entry points, the iterator produces an O-model subroutine * for every one of the entry points. */ public class SingleEntSubIterator implements CodeBlockIterator { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/correlate/DisambiguateStrategy.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/correlate/DisambiguateStrategy.java index a7915195c1..338f3f961d 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/correlate/DisambiguateStrategy.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/correlate/DisambiguateStrategy.java @@ -24,7 +24,8 @@ public interface DisambiguateStrategy { /** * Generate (possibly multiple) hashes that can be used to disambiguate an n-gram and its block from other * blocks with similar instructions. Hashes are attached to the block's disambigHash list. - * @param block is the Block to generate specific disambiguating hashes for + * @param instHash the instruction hash + * @param matchSize the number of instructions to match * @param store is the HashStore used to store the disambiguating hashes * @return the list of disambiguating hashes * @throws CancelledException diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/correlate/HashStore.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/correlate/HashStore.java index 3c7eaad7e6..0189ed8586 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/correlate/HashStore.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/correlate/HashStore.java @@ -253,7 +253,7 @@ public class HashStore { * @param minLength is the minimum length of an n-gram for these passes * @param maxLength is the maximum length of an n-gram for these passes * @param wholeBlock if true, allows blocks that are smaller than the minimum length to be considered as 1 n-gram. - * @param matchBlock if true, only generates n-grams for sequences in previously matched blocks + * @param matchOnly if true, only generates n-grams for sequences in previously matched blocks * @param hashCalc is the hash function * @throws MemoryAccessException */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/correlate/HashedFunctionAddressCorrelation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/correlate/HashedFunctionAddressCorrelation.java index 93b598ab6f..6ddad466b6 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/correlate/HashedFunctionAddressCorrelation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/correlate/HashedFunctionAddressCorrelation.java @@ -400,7 +400,7 @@ public class HashedFunctionAddressCorrelation implements FunctionAddressCorrelat } /** - * Given the src -> dest map, build the dest -> src map + * {@literal Given the src -> dest map, build the dest -> src map} */ private void buildFinalMaps() { for(Entry entry : srcToDest.entrySet()) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractStringDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractStringDataType.java index e30d32a5f2..6c8fdee453 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractStringDataType.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/AbstractStringDataType.java @@ -28,7 +28,7 @@ import ghidra.program.model.mem.MemBuffer; * See {@link StringDataType} for information about string variations and configuration details. *

      * Sub-classes generally only need to implement a constructor that calls the mega-constructor - * {@link #StringDataTypeBase(String, String, String, String, String, String, String, DataType, StringLayoutEnum, DataTypeManager) StringDataTypeBase.StringDataTypeBase(lots,of,params)} + * {@link #AbstractStringDataType(String, String, String, String, String, String, String, DataType, StringLayoutEnum, DataTypeManager) AbstractStringDataType.SAbstractStringDataType(lots,of,params)} * and the {@link DataType#clone(DataTypeManager) } method. *

      * diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Array.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Array.java index 40c3047b3f..5c47bba1bb 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Array.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Array.java @@ -51,7 +51,7 @@ public interface Array extends DataType { * * @param buf memory buffer containing the bytes. * @param settings the Settings object - * @param length the length of the data. + * @param len the length of the data. * @param options options for how to format the default label prefix. * @return the label prefix or null if not applicable */ @@ -72,7 +72,7 @@ public interface Array extends DataType { * * @param buf memory buffer containing the bytes. * @param settings the Settings object - * @param length the length of the data. + * @param len the length of the data. * @param options options for how to format the default label prefix. * @param offcutLength offcut offset from start of buf * @return the offcut label prefix or null if not applicable @@ -148,7 +148,7 @@ public interface Array extends DataType { /** * Get the value Class of a specific arrayDt with settings - * ( see {@link #getArrayValueClass(Array, Settings)} ). + * ( see {@link #getArrayValueClass(Settings)} ). * * @param settings the relevant settings to use or null for default. * @return Class of the value to be returned by the array or null if it can vary diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ArrayStringable.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ArrayStringable.java index 622854e304..ed8ff2aa7c 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ArrayStringable.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ArrayStringable.java @@ -57,7 +57,7 @@ public interface ArrayStringable extends DataType { * default label prefix for the array. * @param buf memory buffer containing the bytes. * @param settings the Settings object - * @param length the length of the data. + * @param len the length of the data. * @param options options for how to format the default label prefix. * @return the default label prefix or null if none specified. */ @@ -70,10 +70,10 @@ public interface ArrayStringable extends DataType { * data that references offcutLength bytes into this type * * @param buf memory buffer containing the bytes. - * @param settings the Settings object - * @param length the length of the data. + * @param settings the Settings object. + * @param len the length of the data. * @param options options for how to format the default label prefix. - * @param offcutOffset + * @param offcutLength the length of the offcut label prefix. * @return the default label prefix or null if none specified. */ public String getArrayDefaultOffcutLabelPrefix(MemBuffer buf, Settings settings, int len, diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/BitFieldDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/BitFieldDataType.java index 45c928a614..bc900798aa 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/BitFieldDataType.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/BitFieldDataType.java @@ -151,7 +151,7 @@ public class BitFieldDataType extends AbstractDataType { /** * Check if a specified baseDataType is valid for use with a bitfield * @param baseDataType bitfield base data type (Enum, AbstractIntegerDataType and derived TypeDefs permitted) - * @returns true if baseDataType is valid else false + * @return true if baseDataType is valid else false */ public static boolean isValidBaseDataType(DataType baseDataType) { if (baseDataType instanceof TypeDef) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/BitFieldPacking.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/BitFieldPacking.java index 5d5a94bf34..df8490beb1 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/BitFieldPacking.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/BitFieldPacking.java @@ -37,8 +37,7 @@ public interface BitFieldPacking { * A non-zero value indicates the fixed alignment size for bit-fields which follow * a zero-length bitfield if greater than a bitfields base type normal alignment. * Corresponds to EMPTY_FIELD_BOUNDARY in GCC. - * This value is only used when {@link #isTypeAlignmentEnabled()} returns false - * and {@link #isZeroLengthAlignmentEnabled()} returns true. + * This value is only used when {@link #isTypeAlignmentEnabled()} returns false. * @return fixed alignment size as number of bytes for a bit-field which follows * a zero-length bit-field */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/CompositeDataTypeImpl.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/CompositeDataTypeImpl.java index 1c94c0f8c5..7b6c19912f 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/CompositeDataTypeImpl.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/CompositeDataTypeImpl.java @@ -146,7 +146,7 @@ public abstract class CompositeDataTypeImpl extends GenericDataType implements C * @param bitfieldComponent bitfield component * @param oldDt affected datatype which has been removed or replaced * @param newDt replacement datatype - * @param true if bitfield component was modified + * @return true if bitfield component was modified * @throws InvalidDataTypeException if new datatype is not */ protected boolean updateBitFieldDataType(DataTypeComponentImpl bitfieldComponent, diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataOrganizationImpl.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataOrganizationImpl.java index d68fad0f92..a33de20475 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataOrganizationImpl.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataOrganizationImpl.java @@ -171,7 +171,7 @@ public class DataOrganizationImpl implements DataOrganization { /** * Defines the size of a pointer data type. - * @param shortSize the size of a short. + * @param pointerSize the size of a pointer. */ public void setPointerSize(int pointerSize) { this.pointerSize = pointerSize; @@ -197,7 +197,7 @@ public class DataOrganizationImpl implements DataOrganization { /** * Defines the size of a char (char) data type. - * @param wideCharSize the size of a char (char). + * @param charSize the size of a char (char). */ public void setCharSize(int charSize) { this.charSize = charSize; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataType.java index f91357a919..4bd2a15234 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataType.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataType.java @@ -40,7 +40,7 @@ public interface DataType { /** * Indicates if this data-type is dynamically sized based upon DataOrganization. - * @returns true if dynamically sized + * @return true if dynamically sized */ public boolean isDynamicallySized(); @@ -220,7 +220,7 @@ public interface DataType { * Returns the appropriate string to use as the default label prefix. * @param buf memory buffer containing the bytes. * @param settings the Settings object - * @param length the length of the data. + * @param len the length of the data. * @param options options for how to format the default label prefix. * @return the default label prefix or null if none specified. */ @@ -234,7 +234,7 @@ public interface DataType { * * @param buf memory buffer containing the bytes. * @param settings the Settings object - * @param length the length of the data. + * @param len the length of the data. * @param options options for how to format the default label prefix. * @param offcutOffset * @return the default label prefix. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeManagerChangeListener.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeManagerChangeListener.java index bd57fedade..eb73e4e081 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeManagerChangeListener.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeManagerChangeListener.java @@ -112,7 +112,7 @@ public interface DataTypeManagerChangeListener { * Notification that the information for a particular source archive has changed. Typically, * this would be because it was renamed or moved. * @param dataTypeManager data type manager referring to the given source information. - * @param sourceArchiveID the id for the + * @param sourceArchive the changed data type source information */ public void sourceArchiveChanged(final DataTypeManager dataTypeManager, final SourceArchive sourceArchive); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeManagerChangeListenerAdapter.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeManagerChangeListenerAdapter.java index bc1ca12c8b..fc068bf43f 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeManagerChangeListenerAdapter.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeManagerChangeListenerAdapter.java @@ -22,80 +22,47 @@ import ghidra.app.plugin.core.datamgr.archive.SourceArchive; */ public class DataTypeManagerChangeListenerAdapter implements DataTypeManagerChangeListener { - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#categoryAdded(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath) - */ @Override public void categoryAdded(DataTypeManager dtm, CategoryPath path) { } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#categoryMoved(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath, ghidra.program.model.data.CategoryPath) - */ @Override public void categoryMoved(DataTypeManager dtm, CategoryPath oldPath, CategoryPath newPath) { } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#categoryRemoved(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath) - */ @Override public void categoryRemoved(DataTypeManager dtm, CategoryPath path) { } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#categoryRenamed(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath, ghidra.program.model.data.CategoryPath) - */ @Override public void categoryRenamed(DataTypeManager dtm, CategoryPath oldPath, CategoryPath newPath) { } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#dataTypeAdded(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath) - */ @Override public void dataTypeAdded(DataTypeManager dtm, DataTypePath path) { } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#dataTypeChanged(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath) - */ @Override public void dataTypeChanged(DataTypeManager dtm, DataTypePath path) { } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#dataTypeMoved(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath, ghidra.program.model.data.CategoryPath) - */ @Override public void dataTypeMoved(DataTypeManager dtm, DataTypePath oldPath, DataTypePath newPath) { } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#dataTypeRemoved(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath) - */ @Override public void dataTypeRemoved(DataTypeManager dtm, DataTypePath path) { } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#dataTypeRenamed(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath, ghidra.program.model.data.CategoryPath) - */ @Override public void dataTypeRenamed(DataTypeManager dtm, DataTypePath oldPath, DataTypePath newPath) { } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#dataTypeReplaced(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath, ghidra.program.model.data.CategoryPath) - */ @Override public void dataTypeReplaced(DataTypeManager dtm, DataTypePath oldPath, DataTypePath newPath, DataType newDataType) { } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#favoritesChanged(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath, boolean) - */ @Override public void favoritesChanged(DataTypeManager dtm, DataTypePath path, boolean isFavorite) { } diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeManagerChangeListenerHandler.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeManagerChangeListenerHandler.java index e7b8b127d2..4850397d2d 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeManagerChangeListenerHandler.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeManagerChangeListenerHandler.java @@ -51,9 +51,6 @@ public class DataTypeManagerChangeListenerHandler implements DataTypeManagerChan listenerList.remove(l); } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#categoryAdded(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath) - */ @Override public void categoryAdded(final DataTypeManager dtm, final CategoryPath path) { if (listenerList.isEmpty()) { @@ -70,9 +67,6 @@ public class DataTypeManagerChangeListenerHandler implements DataTypeManagerChan invokeRunnable(r); } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#categoryMoved(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath, ghidra.program.model.data.CategoryPath) - */ @Override public void categoryMoved(final DataTypeManager dtm, final CategoryPath oldPath, final CategoryPath newPath) { @@ -90,9 +84,6 @@ public class DataTypeManagerChangeListenerHandler implements DataTypeManagerChan invokeRunnable(r); } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#categoryRemoved(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath) - */ @Override public void categoryRemoved(final DataTypeManager dtm, final CategoryPath path) { if (listenerList.isEmpty()) { @@ -109,9 +100,6 @@ public class DataTypeManagerChangeListenerHandler implements DataTypeManagerChan invokeRunnable(r); } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#categoryRenamed(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath, ghidra.program.model.data.CategoryPath) - */ @Override public void categoryRenamed(final DataTypeManager dtm, final CategoryPath oldPath, final CategoryPath newPath) { @@ -130,9 +118,6 @@ public class DataTypeManagerChangeListenerHandler implements DataTypeManagerChan invokeRunnable(r); } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#dataTypeAdded(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath) - */ @Override public void dataTypeAdded(final DataTypeManager dtm, final DataTypePath path) { @@ -150,9 +135,6 @@ public class DataTypeManagerChangeListenerHandler implements DataTypeManagerChan invokeRunnable(r); } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#dataTypeChanged(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath) - */ @Override public void dataTypeChanged(final DataTypeManager dtm, final DataTypePath path) { @@ -170,9 +152,6 @@ public class DataTypeManagerChangeListenerHandler implements DataTypeManagerChan invokeRunnable(r); } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#dataTypeMoved(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath, ghidra.program.model.data.CategoryPath) - */ @Override public void dataTypeMoved(final DataTypeManager dtm, final DataTypePath oldPath, final DataTypePath newPath) { @@ -191,9 +170,6 @@ public class DataTypeManagerChangeListenerHandler implements DataTypeManagerChan invokeRunnable(r); } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#dataTypeRemoved(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath) - */ @Override public void dataTypeRemoved(final DataTypeManager dtm, final DataTypePath path) { @@ -211,9 +187,6 @@ public class DataTypeManagerChangeListenerHandler implements DataTypeManagerChan invokeRunnable(r); } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#dataTypeRenamed(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath, ghidra.program.model.data.CategoryPath) - */ @Override public void dataTypeRenamed(final DataTypeManager dtm, final DataTypePath oldPath, final DataTypePath newPath) { @@ -247,9 +220,6 @@ public class DataTypeManagerChangeListenerHandler implements DataTypeManagerChan // } } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#dataTypeReplaced(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath) - */ @Override public void dataTypeReplaced(final DataTypeManager dtm, final DataTypePath oldPath, final DataTypePath newPath, final DataType newDataType) { @@ -268,9 +238,6 @@ public class DataTypeManagerChangeListenerHandler implements DataTypeManagerChan invokeRunnable(r); } - /** - * @see ghidra.program.model.data.DataTypeManagerChangeListener#favoritesChanged(ghidra.program.model.data.DataTypeManager, ghidra.program.model.data.CategoryPath, boolean) - */ @Override public void favoritesChanged(final DataTypeManager dtm, final DataTypePath path, final boolean isFavorite) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeWriter.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeWriter.java index 92279f5ad6..0e52e07441 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeWriter.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeWriter.java @@ -132,7 +132,7 @@ public class DataTypeWriter { /** * Converts all data types in the data type manager into ANSI-C code. - * @param writer to writer to write the ANSI-C code + * @param dataTypeManager the manager containing the data types to write * @param monitor the task monitor * @throws IOException if an I/O error occurs when writing the data types to the specified writer * @throws CancelledException @@ -144,7 +144,7 @@ public class DataTypeWriter { /** * Converts all data types in the category into ANSI-C code. - * @param writer to writer to write the ANSI-C code + * @param category the category containing the datatypes to write * @param monitor the task monitor * @throws IOException if an I/O error occurs when writing the data types to the specified writer * @throws CancelledException @@ -165,7 +165,7 @@ public class DataTypeWriter { /** * Converts all data types in the array into ANSI-C code. - * @param writer to writer to write the C code + * @param dataTypes the data types to write * @param monitor the task monitor * @throws IOException if an I/O error occurs when writing the data types to the specified writer * @throws CancelledException @@ -183,7 +183,7 @@ public class DataTypeWriter { /** * Converts all data types in the list into ANSI-C code. - * @param writer to writer to write the ANSI-C code + * @param dataTypes the data types to write * @param monitor the task monitor * @throws IOException if an I/O error occurs when writing the data types to the specified writer * @throws CancelledException diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/FileDataTypeManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/FileDataTypeManager.java index 95944ac173..80aa02855e 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/FileDataTypeManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/FileDataTypeManager.java @@ -105,8 +105,8 @@ public class FileDataTypeManager extends StandAloneDataTypeManager * Saves the data type manager to the given file with a specific databaseId. * NOTE: This method is intended for use in transforming one archive database to * match another existing archive database. - * @param outputFilename filename for output - * @param databaseId new databaseId + * @param saveFile the file to save + * @param newUniversalId the new id to use */ public void saveAs(File saveFile, UniversalID newUniversalId) throws DuplicateFileException, IOException { @@ -127,7 +127,7 @@ public class FileDataTypeManager extends StandAloneDataTypeManager /** * Saves the data type manager to the given file - * @param outputFilename filename for output + * @param saveFile the file to save */ public void saveAs(File saveFile) throws DuplicateFileException, IOException { ResourceFile resourceSaveFile = new ResourceFile(saveFile); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/GenericCallingConvention.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/GenericCallingConvention.java index 7692a1d6fd..cdd9ab0248 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/GenericCallingConvention.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/GenericCallingConvention.java @@ -95,7 +95,7 @@ public enum GenericCallingConvention { /** * Returns the GenericCallingConvention which is likely to correspond with the * specified prototype name. - * @param name compiler specific calling convention name + * @param callingConvention compiler specific calling convention name * @return GenericCallingConvention */ public static GenericCallingConvention guessFromName(String callingConvention) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/GenericDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/GenericDataType.java index 860c20fddb..7304098096 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/GenericDataType.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/GenericDataType.java @@ -44,9 +44,6 @@ public abstract class GenericDataType extends DataTypeImpl { } } - /* (non-Javadoc) - * @see ghidra.program.model.data.DataType#setNameAndCategory(ghidra.program.model.data.CategoryPath, java.lang.String) - */ @Override public void setNameAndCategory(CategoryPath path, String name) throws InvalidNameException, DuplicateNameException { @@ -55,9 +52,6 @@ public abstract class GenericDataType extends DataTypeImpl { doSetCategoryPath(path); } - /* (non-Javadoc) - * @see ghidra.program.model.data.DataType#setName(java.lang.String) - */ @Override public void setName(String name) throws InvalidNameException { doSetName(name); @@ -73,9 +67,6 @@ public abstract class GenericDataType extends DataTypeImpl { notifyNameChanged(oldName); } - /* (non-Javadoc) - * @see ghidra.program.model.data.DataType#setCategoryPath(ghidra.program.model.data.CategoryPath) - */ @Override public void setCategoryPath(CategoryPath path) { doSetCategoryPath(path); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/PointerDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/PointerDataType.java index d873911e64..1350d46a04 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/PointerDataType.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/PointerDataType.java @@ -82,7 +82,7 @@ public class PointerDataType extends BuiltIn implements Pointer { * see {@link #PointerDataType(DataType)}) instead of explicitly specifying * the pointer length value. * @param referencedDataType data type this pointer points to - * @param length pointer length (values <= 0 will result in dynamically-sized pointer) + * @param length pointer length (values <= 0 will result in dynamically-sized pointer) */ public PointerDataType(DataType referencedDataType, int length) { this(referencedDataType, length, null); @@ -93,7 +93,7 @@ public class PointerDataType extends BuiltIn implements Pointer { * The pointer size is established dynamically based upon the data organization * associated with the specified dtm but can adapt to another data type manager's * data organization when resolved. - * @param dt data type this pointer points to + * @param referencedDataType data type this pointer points to * @param dtm data-type manager whose data organization should be used */ public PointerDataType(DataType referencedDataType, DataTypeManager dtm) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ShiftedAddressDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ShiftedAddressDataType.java index 83d886324d..e678b18d1b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ShiftedAddressDataType.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/ShiftedAddressDataType.java @@ -48,45 +48,26 @@ public class ShiftedAddressDataType extends BuiltIn { super(null, "ShiftedAddress", dtm); } - /** - * - * @see ghidra.program.model.data.DataType#getMnemonic(Settings) - */ @Override public String getMnemonic(Settings settings) { return "addr"; } - /** - * - * @see ghidra.program.model.data.DataType#getLength() - */ @Override public int getLength() { return getDataOrganization().getPointerSize(); } - /** - * @see ghidra.program.model.data.DataType#isDynamicallySized() - */ @Override public boolean isDynamicallySized() { return true; } - /** - * - * @see ghidra.program.model.data.DataType#getDescription() - */ @Override public String getDescription() { return "shifted address (as specified by compiler spec)"; } - /** - * - * @see ghidra.program.model.data.DataType#getValue(ghidra.program.model.mem.MemBuffer, ghidra.program.model.lang.ProcessorContext, ghidra.docking.settings.Settings, int) - */ @Override public Object getValue(MemBuffer buf, Settings settings, int length) { DataOrganization dataOrg = getDataOrganization(); @@ -166,18 +147,11 @@ public class ShiftedAddressDataType extends BuiltIn { return "??"; } - /** - * - * @see ghidra.program.model.data.DataType#getRepresentation(MemBuffer, ProcessorContext, Settings, int) - */ @Override public String getRepresentation(MemBuffer buf, Settings settings, int length) { return getString(buf, settings); } - /** - * @see ghidra.program.model.data.BuiltIn#getBuiltInSettingsDefinitions() - */ @Override protected SettingsDefinition[] getBuiltInSettingsDefinitions() { return SETTINGS_DEFS; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StringDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StringDataType.java index f9742b6e1f..f8977ca0c3 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StringDataType.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StringDataType.java @@ -25,9 +25,9 @@ import ghidra.util.classfinder.ClassTranslator; *

        *
      • {@link StringDataType} - this type, fixed length, user settable charset. *
      • {@link StringUTF8DataType} - fixed length UTF-8 string. - *
      • {@link TerminatedStringDataType} - terminated & unbounded string, user settable charset. - *
      • {@link TerminatedUnicodeDataType} - terminated & unbounded UTF-16 string. - *
      • {@link TerminatedUnicode32DataType} - terminated & unbounded UTF-32 string. + *
      • {@link TerminatedStringDataType} - terminated and unbounded string, user settable charset. + *
      • {@link TerminatedUnicodeDataType} - terminated and unbounded UTF-16 string. + *
      • {@link TerminatedUnicode32DataType} - terminated and unbounded UTF-32 string. *
      • {@link PascalString255DataType} - length-prefixed string (limited to 255 chars), user settable charset. *
      • {@link PascalStringDataType} - length-prefixed string (limited to 64k), user settable charset. *
      • {@link PascalUnicodeDataType} - length-prefixed UTF-16 (limited to 64k). diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StringRenderBuilder.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StringRenderBuilder.java index 30c4961560..211ac3ff86 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StringRenderBuilder.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StringRenderBuilder.java @@ -58,7 +58,7 @@ public class StringRenderBuilder { /** * Append the specified char after an escaping backslash "\", ie - * "x" -> "\x"; + * {@literal "x" -> "\x";} * * @param ch */ @@ -97,7 +97,7 @@ public class StringRenderBuilder { /** * Add byte values, shown as numeric hex values. *

        - * { 0, 1, 2 } -> 00,01,02 + * {@literal { 0, 1, 2 } -> 00,01,02} * * @param bytes */ @@ -116,9 +116,9 @@ public class StringRenderBuilder { * Add an unicode codepoint as its escaped hex value, with a escape character * prefix of 'x', 'u' or 'U' depending on the magnitude of the codePoint value. *

        - * codePoint 15 -> '\' 'x' "0F"
        - * codePoint 65535 -> '\' 'u' "FFFF"
        - * codePoint 65536 -> '\' 'U' "10000"
        + * {@literal codePoint 15 -> '\' 'x' "0F"}
        + * {@literal codePoint 65535 -> '\' 'u' "FFFF"}
        + * {@literal codePoint 65536 -> '\' 'U' "10000"}
        * * @param codePoint int value */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Structure.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Structure.java index a47d3402b7..2db65c5eb8 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Structure.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/Structure.java @@ -225,7 +225,7 @@ public interface Structure extends Composite { * For example, suppose dt1 contains dt2. Therefore it is not valid * to replace a dt2 component with dt1 since this would cause a cyclic * dependency. In addition, any attempt to replace an existing bit-field - * component or specify a {@link BitFieldDatatype} will produce this error. + * component or specify a {@link BitFieldDataType} will produce this error. * @throws ArrayIndexOutOfBoundsException if component index is out of bounds */ public DataTypeComponent replace(int index, DataType dataType, int length); @@ -246,7 +246,7 @@ public interface Structure extends Composite { * For example, suppose dt1 contains dt2. Therefore it is not valid * to replace a dt2 component with dt1 since this would cause a cyclic * dependency. In addition, any attempt to replace an existing bit-field - * component or specify a {@link BitFieldDatatype} will produce this error. + * component or specify a {@link BitFieldDataType} will produce this error. * @throws ArrayIndexOutOfBoundsException if component index is out of bounds */ public DataTypeComponent replace(int index, DataType dataType, int length, String name, @@ -272,7 +272,7 @@ public interface Structure extends Composite { * For example, suppose dt1 contains dt2. Therefore it is not valid * to replace a dt2 component with dt1 since this would cause a cyclic * dependency. In addition, any attempt to replace an existing bit-field - * component or specify a {@link BitFieldDatatype} will produce this error. + * component or specify a {@link BitFieldDataType} will produce this error. */ public DataTypeComponent replaceAtOffset(int offset, DataType dataType, int length, String name, String comment); @@ -340,7 +340,7 @@ public interface Structure extends Composite { * Increases the size of the structure by the given amount by adding undefined datatypes * at the end of the structure. * @param amount the amount by which to grow the structure. - * @throws IllegalArgumentException if amount < 1 + * @throws IllegalArgumentException if amount < 1 */ public void growStructure(int amount); @@ -348,7 +348,7 @@ public interface Structure extends Composite { /** * BitOffsetComparator provides ability to compare an normalized bit offset - * (see {@link #getNormalizedBitfieldOffset(int, int, int, int, boolean)} with a + * (see {@link #getNormalizedBitfieldOffset(int, int, int, int, boolean)}) with a * {@link DataTypeComponent} object. The offset will be considered equal (0) if the component * contains the offset. A normalized component bit numbering is used to establish the footprint * of each component with an ordinal-based ordering (assumes specific LE/BE allocation rules). @@ -359,6 +359,7 @@ public interface Structure extends Composite { * storage unit (assumes lsb-allocated-first). Both cases result in a normalized view where * normalized bit-0 is allocated first. * + *

        {@literal
         	 * Example:
         	 *    
         	 * Big-Endian (normalized view):
        @@ -371,6 +372,7 @@ public interface Structure extends Composite {
         	 *    | . . . . . . 6 7 | 8 . . . . . . . |
         	 *    |------------>|                       bit-offset (6, lsb position within storage unit)
         	 *                  |<--->|                 bit-size (3)
        +	 * }
        */ public static class BitOffsetComparator implements Comparator { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StructureDataType.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StructureDataType.java index 848df1fca3..6c224a475a 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StructureDataType.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StructureDataType.java @@ -79,7 +79,12 @@ public class StructureDataType extends CompositeDataTypeImpl implements Structur * @param path the category path indicating where this data type is located. * @param name the name of the new structure * @param length the initial size of the structure - * @param dataTypeManager the data type manager associated with this data type. This can be null. + * @param universalID the id for the data type + * @param sourceArchive the source archive for this data type + * @param lastChangeTime the last time this data type was changed + * @param lastChangeTimeInSourceArchive the last time this data type was changed in + * its source archive. + * @param dtm the data type manager associated with this data type. This can be null. * Also, the data type manager may not contain this actual data type. */ public StructureDataType(CategoryPath path, String name, int length, UniversalID universalID, diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/TranslationSettingsDefinition.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/TranslationSettingsDefinition.java index 0b632e3ca5..a48f83afb9 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/TranslationSettingsDefinition.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/TranslationSettingsDefinition.java @@ -82,18 +82,12 @@ public class TranslationSettingsDefinition extends JavaEnumSettingsDefinition
    • 1 will force the use of + * @param maxLines indicate the maximum number of lines to be displayed for the label. A value <= 1 will + * result in a single line display and the preferred geometric shapes. A value >1 will force the use of * rectangualr nodes. * @throws GraphException thrown if an error occurs while communicating with the graph service. */ @@ -89,7 +88,6 @@ public interface GraphDisplay { * Set the handler that will map addresses strings on vertices and edges * to/from objects that make sense to the generator of the graph. * @param handler the GraphSelectionHandler to set on this GraphDisplay. - * @throws GraphException thrown if an error occurs while communicating with the graph service. */ void setSelectionHandler(GraphSelectionHandler handler); /** @@ -99,7 +97,6 @@ public interface GraphDisplay { * * @param selectionObject opaque object to be passed to the selection handler. * @param global true if the selection is to be set on all known graph windows. - * @throws GraphException thrown if an error occurs while communicating with the graph service. */ void select(Object selectionObject, boolean global); /** @@ -109,7 +106,6 @@ public interface GraphDisplay { * * @param locationObject opaque object to be passed to the selection handler. * @param global true if the selection is to be set on all known graph windows. - * @throws GraphException thrown if an error occurs while communicating with the graph service. */ void locate(Object locationObject, boolean global); } diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/DisassemblerContext.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/DisassemblerContext.java index 7fddf35ad1..9e7e973adc 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/DisassemblerContext.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/DisassemblerContext.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,10 +24,10 @@ public interface DisassemblerContext extends ProcessorContext { * register value at address or any value stored in the program if there is no * previously saved future value. Use this method when multiple flows to the same address * don't matter or the flowing from address is unknown. - * + *
      * When value has conflicting bits with the previously * saved value, value will take precedence. - * + *
      * If the register value is the value for the * processor context register and a previously saved * value does not exist, the user saved values in the @@ -44,10 +43,10 @@ public interface DisassemblerContext extends ProcessorContext { * Combines value with any previously saved future * register value at fromAddr/toAddr or any value stored in the program if there is no * previously saved future value. - * + *
      * When value has conflicting bits with the previously * saved value, value will take precedence. - * + *
      * If the register value is the value for the * processor context register and a previously saved * value does not exist, the user saved values in the diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/DynamicVariableStorage.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/DynamicVariableStorage.java index 5272fbb781..a74ad79b44 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/DynamicVariableStorage.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/DynamicVariableStorage.java @@ -150,7 +150,6 @@ public class DynamicVariableStorage extends VariableStorage { * Construct Unassigned dynamic variable storage. * NOTE: The {@link #isUnassignedStorage()} method should be used to * detect this type of storage. - * @param program * @param forcedIndirect if true indicates that the parameter has been forced to pass * as a pointer instead of its raw type */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/GhidraLanguagePropertyKeys.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/GhidraLanguagePropertyKeys.java index c438fb4d76..5515cce05a 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/GhidraLanguagePropertyKeys.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/GhidraLanguagePropertyKeys.java @@ -92,9 +92,9 @@ public final class GhidraLanguagePropertyKeys { /** * PCODE_INJECT_LIBRARY_CLASS indicates the classname of a PcodeInjectLibrary implementation * that is used to generate p-code injection payloads which can replace either CALLs or CALLOTHERs - * during any form of p-code analysis. The injections are primarily provided by and - * tags in the compiler spec, but this provides a hook point for providing other means of - * injection. + * during any form of p-code analysis. The injections are primarily provided by {@code } + * and {@code } tags in the compiler spec, but this provides a hook point for + * providing other means of injection. */ public static final String PCODE_INJECT_LIBRARY_CLASS = "pcodeInjectLibraryClass"; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/InstructionBlock.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/InstructionBlock.java index 444179e890..875d6b8bb1 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/InstructionBlock.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/InstructionBlock.java @@ -92,7 +92,8 @@ public class InstructionBlock implements Iterable { /** * Find the first instruction within this block which intersects the specified range. * This method should be used sparingly since it uses a brute-force search. - * @param address + * @param min the minimum intersection address + * @param max the maximum intersection address * @return instruction within this block which intersects the specified range or null * if not found */ @@ -254,7 +255,7 @@ public class InstructionBlock implements Iterable { * @param newInstrAddr new disassembled instruction address * @param flowFromAddr flow-from address * @param isInstruction true if conflict is due to offcut-instruction, otherwise data is assumed - * @param isOffcutOrData true if conflict due to offcut instruction + * @param isOffcut true if conflict due to offcut instruction */ public void setCodeUnitConflict(Address codeUnitAddr, Address newInstrAddr, Address flowFromAddr, boolean isInstruction, boolean isOffcut) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/InstructionContext.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/InstructionContext.java index b4267576ca..e9bd72dcc2 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/InstructionContext.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/InstructionContext.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +36,7 @@ public interface InstructionContext { * Get the read-only processor context containing the context-register state * state at the corresponding instruction. This is primarily used during the * parse phase to provide the initial context-register state. - * @returns the read-only processor context + * @return the read-only processor context */ public ProcessorContextView getProcessorContext(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/InstructionSet.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/InstructionSet.java index b97a83d791..d82226d328 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/InstructionSet.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/InstructionSet.java @@ -79,7 +79,8 @@ public class InstructionSet implements Iterable { /** * Find the first block within this InstructionSet which intersects the specified range. * This method should be used sparingly since it uses a brute-force search. - * @param address + * @param min the minimum intersection address + * @param max the maximum intersection address * @return block within this InstructionSet which intersects the specified range or null * if not found */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/Language.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/Language.java index 4b7a1bb081..845fbc7108 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/Language.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/Language.java @@ -369,7 +369,7 @@ public interface Language { /** * Get the ManualEntry for the given instruction mnemonic. * - * @param instruction + * @param instructionMnemonic * the instruction mnemonic * @return the ManualEntry or null if instruction mnemonic not found */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/LanguageCompilerSpecQuery.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/LanguageCompilerSpecQuery.java index be24e01ad0..8bea0f4e05 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/LanguageCompilerSpecQuery.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/LanguageCompilerSpecQuery.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,11 +23,13 @@ public class LanguageCompilerSpecQuery { public final CompilerSpecID compilerSpecID; /** - * @param processor - * @param endian - * @param size - * @param variant - * @param compilerSpecName + * Constructs a new LanguageCompilerSpecQuery + * + * @param processor the language's processor + * @param endian the processor's endianness + * @param size the size of an address + * @param variant the processor variant + * @param compilerSpecID the compiler spec id */ public LanguageCompilerSpecQuery(Processor processor, Endian endian, Integer size, String variant, CompilerSpecID compilerSpecID) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/OldLanguageMappingService.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/OldLanguageMappingService.java index 648b4a8e53..4e9ac8be42 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/OldLanguageMappingService.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/OldLanguageMappingService.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -72,7 +71,7 @@ public class OldLanguageMappingService { /** * Parse the language string from an XML language name into the most appropriate LanguageID/CompilerSpec pair. - * The language name may either be an old name (i.e., magicString) or a new : string. + * The language name may either be an old name (i.e., magicString) or a new {@code :} string. * If an old language name magic-string is provided, its replacement language will be returned if known. * The returned pair may or may not be available based upon available language implementations. * @param languageString old or new language string diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/ParamEntry.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/ParamEntry.java index f45b9d33cd..03a2a0a603 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/ParamEntry.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/ParamEntry.java @@ -455,11 +455,13 @@ public class ParamEntry { * If it is contained, return the endian aware offset of (op2,sz2) * I.e. if the least significant byte of the op2 range falls on the least significant * byte of the op1 range, return 0. If it intersects the second least significant, return 1, etc. - * @param op1 base address of first range - * @param sz1 size of first range - * @param op2 base address of second range - * @param sz2 size of second range + * @param spc1 the first address space + * @param offset1 the first offset + * @param sz1 size of first space + * @param spc2 the second address space + * @param sz2 size of second space * @param forceleft is true if containment is forced to be on the left even for big endian + * @param isBigEndian true if big endian * @return the endian aware offset or -1 */ public static int justifiedContainAddress(AddressSpace spc1,long offset1,int sz1,AddressSpace spc2,long offset2,int sz2,boolean forceleft,boolean isBigEndian) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/PrototypeModel.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/PrototypeModel.java index 0ce28fb149..52daf4adb2 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/PrototypeModel.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/PrototypeModel.java @@ -111,7 +111,7 @@ public class PrototypeModel { * @param dataType first parameter dataType or null for a default * undefined type. * @param program - * @return return location or {@link VariableStorage.UNASSIGNED_STORAGE} if + * @return return location or {@link VariableStorage#UNASSIGNED_STORAGE} if * unable to determine suitable location */ @Deprecated @@ -136,7 +136,7 @@ public class PrototypeModel { * @param dataType dataType associated with next parameter location or null * for a default undefined type. * @param program - * @return next parameter location or {@link VariableStorage.UNASSIGNED_STORAGE} if + * @return next parameter location or {@link VariableStorage#UNASSIGNED_STORAGE} if * unable to determine suitable location */ public VariableStorage getNextArgLocation(Parameter[] params, DataType dataType, Program program) { @@ -152,7 +152,7 @@ public class PrototypeModel { * @param dataType dataType associated with next parameter location or null * for a default undefined type. * @param program - * @return parameter location or {@link VariableStorage.UNASSIGNED_STORAGE} if + * @return parameter location or {@link VariableStorage#UNASSIGNED_STORAGE} if * unable to determine suitable location */ public VariableStorage getArgLocation(int argIndex, Parameter[] params, DataType dataType, diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterBuilder.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterBuilder.java index 67d8d40163..972081b06a 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterBuilder.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/RegisterBuilder.java @@ -218,7 +218,7 @@ public class RegisterBuilder { /** * Add a vector lane size to the specified register. * @param registerName register name - * @param registerFlag Register defined flag bit(s) + * @param laneSizeInBytes the size of the lane to add in bytes * @return true if register was found, else false * @throws UnsupportedOperationException if register is unable to support the definition of * lanes. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/SleighLanguageDescription.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/SleighLanguageDescription.java index 01c2bcd127..fd8585bbd0 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/SleighLanguageDescription.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/SleighLanguageDescription.java @@ -87,7 +87,7 @@ public class SleighLanguageDescription extends BasicLanguageDescription { /** * Set the (optional) specification file associated with this language * - * @param specFile + * @param defsFile * the specFile to associate with this description. */ public void setDefsFile(ResourceFile defsFile) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/BookmarkManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/BookmarkManager.java index aa216743a8..88f4e621fc 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/BookmarkManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/BookmarkManager.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,7 +62,6 @@ public interface BookmarkManager { * @param icon marker icon which may get scaled * @param color marker color * @return bookmark type object - * @throws IOException if a database error occurs while adding the new type. */ BookmarkType defineType(String type, ImageIcon icon, Color color, int priority); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DataBuffer.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DataBuffer.java index bccc1ffde6..d7780f9c83 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DataBuffer.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DataBuffer.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,10 +40,9 @@ public interface DataBuffer { * * @return the Data item at offset from the current position. * - * @throws AddressOutOfBoundsException if offset exceeds + * @throws ghidra.program.model.address.AddressOutOfBoundsException if offset exceeds * address space * @throws IndexOutOfBoundsException if offset is negative - * @throws MemoryAccessException if memory cannot be read */ public Data getData(int offset); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DefaultProgramContext.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DefaultProgramContext.java index cd47157f56..d30fdcfac6 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DefaultProgramContext.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/DefaultProgramContext.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +33,6 @@ public interface DefaultProgramContext { * Returns the default value of a register at a given address. * @param register the register for which to get a default value. * @param address the address at which to get a default value. - * @param signed if true, the fix-bit register value will be interpreted as a signed number. * @return the default value of the register at the given address or null if no default value * has been assigned. */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FlowOverride.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FlowOverride.java index cd7ad2a995..ab253b2a6d 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FlowOverride.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FlowOverride.java @@ -29,17 +29,17 @@ public enum FlowOverride { /** * Override the primary CALL or RETURN with a suitable JUMP operation. - *
      +	 * 
      {@literal
       	 *   Pcode mapping:
       	 *      CALL -> BRANCH
       	 *      RETURN -> BRANCHIND
      -	 * 
      + * }
      */ BRANCH, /** * Override the primary BRANCH or RETURN with a suitable CALL operation. - *
      +	 * 
      {@literal
       	 * 	 Pcode mapping:
       	 * 		BRANCH -> CALL
       	 *      BRANCHIND -> CALLIND
      @@ -49,13 +49,13 @@ public enum FlowOverride {
       	 *          CALL 
       	 *        
      + * }
      */ CALL, /** * Override the primary BRANCH or RETURN with a suitable CALL/RETURN operation. - *
      +	 * 
      {@literal
       	 * 	 Pcode mapping:
       	 * 		BRANCH -> CALL/RETURN
       	 *      BRANCHIND -> CALLIND/RETURN
      @@ -66,13 +66,13 @@ public enum FlowOverride {
       	 *          RETURN 0
       	 *        
      + * }
      */ CALL_RETURN, /** * Override the primary BRANCH or CALL with a suitable RETURN operation. - *
      +	 * 
      {@literal
       	 *   Pcode mapping:
       	 *      BRANCH   -> (complex mapping)
       	 *          tmp = COPY &
      @@ -88,7 +88,7 @@ public enum FlowOverride {
       	 *          tmp = COPY &
       	 *          RETURN tmp
       	 *      CALLIND -> RETURN
      -	 * 
      + * }
      */ RETURN; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Function.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Function.java index 75cca37009..3bd8278a61 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Function.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Function.java @@ -400,13 +400,13 @@ public interface Function extends Namespace { * The {@link VariableUtilities#checkVariableConflict(Function, Variable, VariableStorage, boolean)} * method may be used to check and remove conflicting variables which already exist in the function. * @param callingConvention updated calling convention name or null if no change is required - * @param returnVar return variable or null if no change required - * @param params the new set of parameters for the function. + * @param returnValue return variable or null if no change required * @param updateType function update type * @param force if true any conflicting local parameters will be removed * @param source the source of these parameters which will be applied to the parameter symbols and * overall function signature source. If parameter names are null or a default name a SourceType of DEFAULT * will be applied to the corresponding parameter symbol. + * @param newParams a variable number of parameters for the function. * @throws DuplicateNameException if another variable(parameter or local) already * exists in the function with that name. * @throws InvalidInputException if a parameter data type is not a fixed length or variable name is invalid. @@ -429,7 +429,7 @@ public interface Function extends Namespace { * @param source the source of these parameters which will be applied to the parameter symbols and * overall function signature source. If parameter names are null or a default name a SourceType of DEFAULT * will be applied to the corresponding parameter symbol. - * @param params the new parameters for the function (required). + * @param newParams the list of new parameters for the function (required). * @throws DuplicateNameException if another variable(parameter or local) already * exists in the function with that name. * @throws InvalidInputException if a parameter data type is not a fixed length or variable name is invalid. @@ -463,7 +463,7 @@ public interface Function extends Namespace { * moved but must be accounted for in the specified ordinals. * @param fromOrdinal from ordinal position using the current numbering * @param toOrdinal the final position of the specified parameter - * @returns parameter which was moved + * @return parameter which was moved * @deprecated The use of this method is discouraged. The function signature should generally be * adjusted with a single call to {@link #updateFunction(String, Variable, List, FunctionUpdateType, boolean, SourceType)} */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionManager.java index aa567a5267..6414529a08 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionManager.java @@ -72,7 +72,6 @@ public interface FunctionManager { * @param source the source of this function * @return new function or null if one or more functions overlap the specified body address set. * @throws InvalidInputException if the name has invalid characters - * @throws DuplicateNameException if a function with the given name already exists * @throws OverlappingFunctionException if the address set of the body overlaps an existing * function */ @@ -89,7 +88,6 @@ public interface FunctionManager { * @param source the source of this function * @return new function or null if one or more functions overlap the specified body address set. * @throws InvalidInputException if the name has invalid characters - * @throws DuplicateNameException if a function with the given name already exists * @throws OverlappingFunctionException if the address set of the body overlaps an existing * function */ @@ -164,7 +162,7 @@ public interface FunctionManager { * * @return an iterator over functions. */ - public FunctionIterator getFunctions(Address start, boolean foward); + public FunctionIterator getFunctions(Address start, boolean forward); /** * Get an iterator over functions with entry points in the specified address set. Function are @@ -193,7 +191,7 @@ public interface FunctionManager { * * @return an iterator over functions. */ - public FunctionIterator getFunctionsNoStubs(Address start, boolean foward); + public FunctionIterator getFunctionsNoStubs(Address start, boolean forward); /** * Get an iterator over REAL functions with entry points in the specified address set (real @@ -272,7 +270,7 @@ public interface FunctionManager { * * @param instrAddr * @param storageAddr - * @param size varnode size in bytes (1 is assumed if value <= 0) + * @param size varnode size in bytes (1 is assumed if value <= 0) * @param isRead * @return referenced variable or null if one not found */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionSignature.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionSignature.java index 683ca53abf..cef0ffe7ce 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionSignature.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionSignature.java @@ -73,7 +73,7 @@ public interface FunctionSignature { /** * Returns true if the given signature is equivalent to this signature. The * precise meaning of "equivalent" is dependent upon return/parameter dataTypes. - * @param dt the dataType being tested for equivalence. + * @param signature the function signature being tested for equivalence. * @return true if the if the given signature is equivalent to this signature. */ public boolean isEquivalentSignature(FunctionSignature signature); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionSignatureImpl.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionSignatureImpl.java index c76de0d61f..a06f0b8e1e 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionSignatureImpl.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionSignatureImpl.java @@ -23,6 +23,7 @@ import ghidra.program.model.data.FunctionDefinitionDataType; * * @deprecated FunctionDefinitionDataType should be used for defining a function signature */ +@Deprecated public class FunctionSignatureImpl extends FunctionDefinitionDataType { /** @@ -36,7 +37,7 @@ public class FunctionSignatureImpl extends FunctionDefinitionDataType { /** * Creates new FunctionSignatureImpl based upon an existing function signature. - * @param name the name of the function + * @param signature the signature of the function */ public FunctionSignatureImpl(FunctionSignature signature) { super(signature); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTag.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTag.java index d385709404..3d4c0d4edb 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTag.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTag.java @@ -17,7 +17,8 @@ package ghidra.program.model.listing; /** * Represents a function tag object that can be associated with - * functions. This maps to the {@link FunctionTagAdapter} table. + * functions. This maps to the + * {@link ghidra.program.database.function.FunctionTagAdapter FunctionTagAdapter} table. */ public interface FunctionTag extends Comparable { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTagChangeSet.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTagChangeSet.java index 89b58c4cd5..fcc5163dda 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTagChangeSet.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTagChangeSet.java @@ -26,28 +26,28 @@ public interface FunctionTagChangeSet extends ChangeSet { /** * Indicates that a tag has been changed (edited/deleted). * - * @param id the id of the tag (from {@link FunctionTagAdapter}) + * @param id the id of the tag (from {@link ghidra.program.database.function.FunctionTagAdapter FunctionTagAdapter}) */ void tagChanged(long id); /** * Indicates that a tag has been created. * - * @param id id the id of the tag (from {@link FunctionTagAdapter}) + * @param id id the id of the tag (from {@link ghidra.program.database.function.FunctionTagAdapter FunctionTagAdapter}) */ void tagCreated(long id); /** * Returns a list of all tag ids that have been changed (edited/deleted). * - * @return the list of tag ids (from {@link FunctionTagAdapter}) + * @return the list of tag ids (from {@link ghidra.program.database.function.FunctionTagAdapter FunctionTagAdapter}) */ long[] getTagChanges(); /** * Returns a list of all tag ids that have been created. * - * @return the list of tag ids (from {@link FunctionTagAdapter}) + * @return the list of tag ids (from {@link ghidra.program.database.function.FunctionTagAdapter FunctionTagAdapter}) */ long[] getTagCreations(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTagManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTagManager.java index ebcb92311f..4dfabe4591 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTagManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/FunctionTagManager.java @@ -22,8 +22,8 @@ import java.util.List; * Interface for managing function tags. Tags are simple objects consisting of * a name and an optional comment, which can be applied to functions in Ghidra. * - * @see FunctionTagAdapter - * @see FunctionTagMappingAdapter + * @see ghidra.program.database.function.FunctionTagAdapter FunctionTagAdapter + * @see ghidra.program.database.function.FunctionTagMappingAdapter FunctionTagMappingAdapter */ public interface FunctionTagManager { @@ -47,7 +47,6 @@ public interface FunctionTagManager { * Returns all function tags in the database. * * @return list of function tags - * @throws IOException */ List getAllFunctionTags(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Instruction.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Instruction.java index 83ccfba568..19cef43fbd 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Instruction.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Instruction.java @@ -199,7 +199,7 @@ public interface Instruction extends CodeUnit, ProcessorContext { * performs. NOTE: If includeOverrides is true, unique temporary varnodes * may be produced which vary in size to those produced for other instructions. * If your analysis is sensitive to this you should consider using - * {@link InstructionPrototype#getPcode(ghidra.program.model.mem.MemBuffer, ProcessorContext, FlowOverride, ghidra.program.model.address.UniqueAddressFactory)} + * {@link InstructionPrototype#getPcode(InstructionContext, PcodeOverride, UniqueAddressFactory)} * instead with your own {@link UniqueAddressFactory} to prevent duplication within * your scope of analysis. * by this method may not be suitable for use with certain analysis @@ -266,7 +266,7 @@ public interface Instruction extends CodeUnit, ProcessorContext { public boolean isFallThroughOverridden(); /** - * @returns the instruction context for this instruction + * @return the instruction context for this instruction */ public InstructionContext getInstructionContext(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Library.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Library.java index 7b62c3352a..ae6f80382a 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Library.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Library.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +25,7 @@ public interface Library extends Namespace { public static final String UNKNOWN = ""; /** - * @returns the associated program within the project which corresponds to this library + * @return the associated program within the project which corresponds to this library */ public String getAssociatedProgramPath(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/LocalVariableImpl.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/LocalVariableImpl.java index 896e9af39d..4af9d4ffe1 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/LocalVariableImpl.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/LocalVariableImpl.java @@ -65,7 +65,7 @@ public class LocalVariableImpl extends VariableImpl implements LocalVariable { * @param firstUseOffset first use function-relative offset (i.e., start of scope). * @param dataType a fixed-length datatype. (NOTE: Should be cloned to program datatype manager * prior to determining storage elements since their length may change) - * @param the register used for the storage. + * @param register the register used for the storage. * @param program target program * @throws InvalidInputException if dataType restrictions are violated, an invalid storage * element is specified, or error while resolving storage element for specified datatype @@ -82,7 +82,7 @@ public class LocalVariableImpl extends VariableImpl implements LocalVariable { * @param firstUseOffset first use function-relative offset (i.e., start of scope). * @param dataType a fixed-length datatype. (NOTE: Should be cloned to program datatype manager * prior to determining storage elements since their length may change) - * @param the register used for the storage. + * @param register the register used for the storage. * @param program target program * @param sourceType name source type * @throws InvalidInputException if dataType restrictions are violated, an invalid storage diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/OperandRepresentationList.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/OperandRepresentationList.java index 218b867f87..f8d83173b9 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/OperandRepresentationList.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/OperandRepresentationList.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -94,8 +93,6 @@ public class OperandRepresentationList extends ArrayList { /** * Returns a formatted string representation of the specified code unit operand. - * @param cu code unit - * @param opIndex * @return formatted code unit representation */ @Override diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Program.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Program.java index efeb0afadf..912bb952e6 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Program.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Program.java @@ -206,7 +206,6 @@ public interface Program extends DataTypeManagerDomainObject { * Returns the creation date of this program. * If the program was created before this property * existed, then Jan 1, 1970 is returned. - * @param program the prorgam * @return the creation date of this program */ public Date getCreationDate(); @@ -332,8 +331,7 @@ public interface Program extends DataTypeManagerDomainObject { /** * Returns the register which corresponds to the specified varnode - * @param addr register address - * @param size the size of the register (in bytes); + * @param varnode the varnode * @return register or null */ public Register getRegister(Varnode varnode); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramContext.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramContext.java index 6483ae155a..ddf616d7e7 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramContext.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramContext.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -198,7 +197,6 @@ public interface ProgramContext { * Returns the default value of a register at a given address. * @param register the register for which to get a default value. * @param address the address at which to get a default value. - * @param signed if true, the fix-bit register value will be interpreted as a signed number. * @return the default value of the register at the given address or null if no default value * has been assigned. */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Variable.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Variable.java index 8ff9ab0286..b4fff77ae6 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Variable.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/Variable.java @@ -64,19 +64,19 @@ public interface Variable extends Comparable { * @param source signature source * @throws InvalidInputException if data type is not a fixed length or violates storage constraints. * @throws VariableSizeException if data type size causes a conflict with other variables - * @see #setDataType(DataType, boolean) + * @see #setDataType(DataType, boolean, boolean, SourceType) */ public void setDataType(DataType type, SourceType source) throws InvalidInputException; /** * Set the Data Type of this variable. The given dataType must have a fixed length. * @param type the data type - * @param force overwrite conflicting variables - * @param source signature source - * @param align maintain proper stack alignment/justification if supported by implementation. + * @param alignStack maintain proper stack alignment/justification if supported by implementation. * If false and this is a stack variable, the current stack address/offset will not change. * If true, the affect is implementation dependent since alignment can - * not be performed without access to a compiler specification. + * not be performed without access to a compiler specification. + * @param force overwrite conflicting variables + * @param source signature source * @throws InvalidInputException if data type is not a fixed length or violates storage constraints. * @throws VariableSizeException if force is false and data type size causes a conflict * with other variables @@ -159,14 +159,14 @@ public interface Variable extends Comparable { /** * Get the first storage varnode for this variable * @return the first storage varnode associated with this variable - * @see #getStorageElements() + * @see #getVariableStorage() */ public Varnode getFirstStorageVarnode(); /** * Get the last storage varnode for this variable * @return the last storage varnode associated with this variable - * @see #getStorageElements() + * @see #getVariableStorage() */ public Varnode getLastStorageVarnode(); @@ -214,8 +214,8 @@ public interface Variable extends Comparable { /** * @return the minimum address corresponding to the first varnode of this storage - * or null if this is a special empty storage: {@link #BAD_STORAGE}, {@link #UNASSIGNED_STORAGE}, - * {@link #VOID_STORAGE} + * or null if this is a special empty storage: {@link VariableStorage#BAD_STORAGE}, + * {@link VariableStorage#UNASSIGNED_STORAGE}, {@link VariableStorage#VOID_STORAGE} */ public Address getMinAddress(); @@ -229,21 +229,21 @@ public interface Variable extends Comparable { /** * @return true if this is a simple variable consisting of a single storage memory element * which will be returned by either the {@link #getFirstStorageVarnode()} or - * {@link getStorageElements()} methods. + * {@link #getVariableStorage()} methods. */ public boolean isMemoryVariable(); /** * @return true if this is a simple variable consisting of a single storage unique/hash element * which will be returned by either the {@link #getFirstStorageVarnode()} or - * {@link getStorageElements()} methods. The unique hash can be obtained from the + * {@link #getVariableStorage()} methods. The unique hash can be obtained from the * storage address offset corresponding to the single storage element. */ public boolean isUniqueVariable(); /** * @return true if this variable uses compound storage consisting of two or more storage elements - * which will be returned by the {@link getStorageElements()} method. Compound variables will + * which will be returned by the {@link #getVariableStorage()} method. Compound variables will * always use a register(s) optionally followed by other storage (i.e., stack). */ public boolean isCompoundVariable(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/VariableOffset.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/VariableOffset.java index 2ba1a3ca6e..00ec030f64 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/VariableOffset.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/VariableOffset.java @@ -60,7 +60,8 @@ public class VariableOffset { /** * Constructor for an explicit variable reference. - * @param vref + * @param ref the reference + * @param var the variable being referenced */ public VariableOffset(Reference ref, Variable var) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/VariableStorage.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/VariableStorage.java index b28e086f8f..4722c397cd 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/VariableStorage.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/VariableStorage.java @@ -46,7 +46,7 @@ public class VariableStorage implements Comparable { public static final VariableStorage BAD_STORAGE = new VariableStorage(); /** - * UNMASSIGNED_STORAGE used to identify parameter storage which is "unmapped" + * UNASSIGNED_STORAGE used to identify parameter storage which is "unmapped" * or could not be determined. */ public static final VariableStorage UNASSIGNED_STORAGE = new VariableStorage(); @@ -450,8 +450,8 @@ public class VariableStorage implements Comparable { /** * @return true if this is a simple variable consisting of a single register varnode - * which will be returned by either the {@link #getFirstStorageVarnode()} or - * {@link getLastStorageVarnode()} methods. The register can be obtained using the + * which will be returned by either the {@link Variable#getFirstStorageVarnode()} or + * {@link Variable#getLastStorageVarnode()} methods. The register can be obtained using the * {@link #getRegister()} method. Keep in mind that registers * may exist in a memory space or the register space. */ @@ -462,7 +462,7 @@ public class VariableStorage implements Comparable { /** * @return first storage register associated with this register or compound storage, else * null is returned. - * @see #isRegisterVariable() + * @see Variable#isRegisterVariable() */ public Register getRegister() { return registers != null ? registers.get(0) : null; @@ -471,7 +471,7 @@ public class VariableStorage implements Comparable { /** * @return storage register(s) associated with this register or compound storage, else * null is returned. - * @see #isRegisterVariable() + * @see Variable#isRegisterVariable() * @see #isCompoundStorage() */ public List getRegisters() { @@ -648,8 +648,8 @@ public class VariableStorage implements Comparable { /** * Determine if this storage intersects the specified register - * @param set address set - * @return true if this storage intersects the specified address set + * @param reg the register + * @return true if this storage intersects the specified register */ public boolean intersects(Register reg) { if (varnodes == null || reg == null) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/VariableUtilities.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/VariableUtilities.java index a9b055645a..93afde2fc4 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/VariableUtilities.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/VariableUtilities.java @@ -767,8 +767,7 @@ public class VariableUtilities { * within the function's program. * The preferred structure will utilize a namespace-based category path, however, * the match criteria can be fuzzy and relies primarily on the class name. - * @param classNamespace class namespace - * @param dataTypeManager data type manager which should be searched. + * @param func the function. * @return existing structure whose name matches the specified function's class namespace * or null if not found. */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/mem/Memory.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/mem/Memory.java index 034882dd68..6f0f759431 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/mem/Memory.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/mem/Memory.java @@ -270,8 +270,6 @@ public interface Memory extends AddressSetView { * * @param addr a valid data Address. * @return the block containing addr; null if addr is not a valid location. - * @throws AddressTypeException if the addr is not the proper type - * of Address for this Memory. */ public MemoryBlock getBlock(Address addr); @@ -372,8 +370,8 @@ public interface Memory extends AddressSetView { * Finds a sequence of contiguous bytes that match the * given byte array at all bit positions where the mask contains an "on" bit. * Starts at startAddr and ends at endAddr. - * If forward is true, search starts at startAddr and will end if startAddr ">" endAddr. - * If forward is false, search starts at start addr and will end if startAddr "<" endAddr. + * If forward is true, search starts at startAddr and will end if startAddr ">" endAddr. + * If forward is false, search starts at start addr and will end if startAddr "<" endAddr. * * @param startAddr The beginning address in memory to search. * @param endAddr The ending address in memory to search (inclusive). @@ -466,7 +464,7 @@ public interface Memory extends AddressSetView { * @param addr the starting Address. * @param dest the short array to populate. * @param dIndex the offset into dest to place the shorts. - * @param size the number of shorts to get. + * @param nElem the number of shorts to get. * @return the number of shorts put into dest. May be less than * dest.length if the requested number extends beyond available memory. * If the number of retrievable bytes is odd, the final byte will be discarded. @@ -481,7 +479,7 @@ public interface Memory extends AddressSetView { * @param addr the starting Address. * @param dest the short array to populate. * @param dIndex the offset into dest to place the shorts. - * @param size the number of shorts to get. + * @param nElem the number of shorts to get. * @param isBigEndian true means to get the shorts in * bigEndian order * @return the number of shorts put into dest. May be less than @@ -533,7 +531,7 @@ public interface Memory extends AddressSetView { * @param addr the starting Address. * @param dest the int array to populate. * @param dIndex the offset into dest to place the ints. - * @param size the number of ints to get. + * @param nElem the number of ints to get. * @return the number of ints put into dest. May be less than * dest.length if the requested number extends beyond available memory. * If the number of retrievable bytes is not 0 mod 4, the final byte(s) will be discarded. @@ -548,7 +546,7 @@ public interface Memory extends AddressSetView { * @param addr the starting Address. * @param dest the int array to populate. * @param dIndex the offset into dest to place the ints. - * @param size the number of ints to get. + * @param nElem the number of ints to get. * @param isBigEndian true means to get the ints in * bigEndian order * @return the number of ints put into dest. May be less than @@ -599,7 +597,7 @@ public interface Memory extends AddressSetView { * @param addr the starting Address. * @param dest the long array to populate. * @param dIndex the offset into dest to place the longs. - * @param size the number of longs to get. + * @param nElem the number of longs to get. * @return the number of longs put into dest. May be less than * dest.length if the requested number extends beyond available memory. * If the number of retrievable bytes is not 0 mod 8, the final byte(s) will be discarded. @@ -614,7 +612,7 @@ public interface Memory extends AddressSetView { * @param addr the starting Address. * @param dest the long array to populate. * @param dIndex the offset into dest to place the longs. - * @param size the number of longs to get. + * @param nElem the number of longs to get. * @param isBigEndian true means to get the longs in * bigEndian order * @return the number of longs put into dest. May be less than diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/BlockCondition.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/BlockCondition.java index 92965e3a13..804c7fe8f4 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/BlockCondition.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/BlockCondition.java @@ -20,7 +20,7 @@ import ghidra.util.xml.SpecXmlUtils; import ghidra.xml.XmlElement; /** - * Block representing and '&&' or '||' control flow path within a conditional expression + * Block representing and '&&' or '||' control flow path within a conditional expression * possible multiple incoming edges * 2 outgoing edges, one for true control flow, one for false control flow * diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/FunctionPrototype.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/FunctionPrototype.java index 34ae07d970..4896a67280 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/FunctionPrototype.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/FunctionPrototype.java @@ -412,7 +412,7 @@ public class FunctionPrototype { } /** - * Parse the function prototype from tag. + * Parse the function prototype from {@code } tag. * @param parser is the XML document to parse * @param dtmanage is the DataTypeManager used to parse data-type tags * @throws PcodeXMLException for any problems parsing diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java index 28a86c8b6e..377d2a4645 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java @@ -300,7 +300,7 @@ public class HighFunctionDBUtil { * database which conflict with this variable and return * one of them for re-use. The returned variable still * exists within the function at the same first-use-offset. - * @returns existing variable with identical storage and first-use offset or null + * @return existing variable with identical storage and first-use offset or null */ private static Variable clearConflictingLocalVariables(HighLocal local) { @@ -593,9 +593,9 @@ public class HighFunctionDBUtil { /** * Commit an override of a calls prototype to the database - * @param func is the Function whose call is being overriden + * @param function is the Function whose call is being overriden * @param callsite is the address of the call - * @param function signature override + * @param sig signature override * @throws InvalidInputException * @throws DuplicateNameException */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighParam.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighParam.java index 9109245f78..0d42cc4ba7 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighParam.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighParam.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +28,7 @@ public class HighParam extends HighLocal { /** * @param tp data type of variable - * @param store variable storage + * @param rep represented varnode * @param pc null or Address of PcodeOp which defines the representative * @param slot parameter index starting at 0 * @param sym associated symbol diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighParamID.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighParamID.java index cd197a035e..c207104db0 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighParamID.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighParamID.java @@ -52,8 +52,10 @@ public class HighParamID extends PcodeSyntaxTree { /** * @param function function associated with the higher level function abstraction. - * @param langParser language parser used to disassemble/get info on the language - * @param dtManager data type manager + * @param language language parser used to disassemble/get info on the language. + * @param compilerSpec the compiler spec. + * @param dtManager data type manager. + * @param showNamespace true to show the parameters namespace. */ public HighParamID(Function function, Language language, CompilerSpec compilerSpec, PcodeDataTypeManager dtManager, boolean showNamespace) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/ParamMeasure.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/ParamMeasure.java index 0626f2c424..18e2d16c90 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/ParamMeasure.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/ParamMeasure.java @@ -32,6 +32,10 @@ public class ParamMeasure { private DataType dt; private Integer rank; + /** + * Constructs a ParamMeasure Object. + * The ParamMeasure will be empty until {@link #readXml} is invoked. + */ public ParamMeasure() { vn = null; dt = null; @@ -45,10 +49,10 @@ public class ParamMeasure { } /** - * Create a JumpTable object by parsing the XML elements - * @param parser - * @param addrFactory - * @throws PcodeXMLException + * Create a ParamMeasure object by parsing the XML elements + * @param parser xml parser + * @param factory pcode factory + * @throws PcodeXMLException if an error occurs when reading the xml. */ public void readXml(XmlPullParser parser, PcodeFactory factory) throws PcodeXMLException { vn = Varnode.readXML(parser, factory); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeDataTypeManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeDataTypeManager.java index 09b05e6453..126ec5825b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeDataTypeManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeDataTypeManager.java @@ -155,8 +155,8 @@ public class PcodeDataTypeManager { /** * Get the data type that corresponds to the given XML element. - * @param el element - * @return data type + * @param parser the xml parser + * @return the read data type * @throws PcodeXMLException if the data type could be resolved from the * element */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeOpBank.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeOpBank.java index 9ead4875bb..a6ef9fabb7 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeOpBank.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeOpBank.java @@ -111,14 +111,14 @@ public class PcodeOpBank { } /** - * Returns iterator containing both PcodeOpAST and Iterator objects. + * Returns iterator containing both PcodeOpAST and {@literal Iterator} objects. */ public Iterator allAlive() { return aliveList.iterator(); } /** - * Returns iterator containing both PcodeOpAST and Iterator objects. + * Returns iterator containing both PcodeOpAST and {@literal Iterator} objects. */ public Iterator allDead() { return deadList.iterator(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeSyntaxTree.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeSyntaxTree.java index e074d0a461..0a2bb0a003 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeSyntaxTree.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeSyntaxTree.java @@ -106,7 +106,8 @@ public class PcodeSyntaxTree implements PcodeFactory { * @param addr join address associated with pieces * * @return the VariableStorage associated with xml - * @throws PcodeXMLException, InvalidInputException + * @throws PcodeXMLException + * @throws InvalidInputException */ @Override public VariableStorage readXMLVarnodePieces(XmlElement el, Address addr) throws PcodeXMLException, InvalidInputException { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/SequenceNumber.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/SequenceNumber.java index fe591f2b62..ef7dbf10cb 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/SequenceNumber.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/SequenceNumber.java @@ -133,7 +133,7 @@ public class SequenceNumber implements Comparable { /** * Create a new Sequence number from XML SAX tree element. * - * @param el SAX tree element + * @param parser the xml parser * @param factory pcode factory used to create new pcode * * @return new sequence number diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/reloc/RelocationTable.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/reloc/RelocationTable.java index 0fa2cff206..2a16da4c93 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/reloc/RelocationTable.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/reloc/RelocationTable.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +35,7 @@ public interface RelocationTable { * @param type the type of relocation to perform * @param values the values needed when performing the relocation * @param bytes original instruction bytes affected by relocation - * @param the name of the symbol being relocated; may be null + * @param symbolName the name of the symbol being relocated; may be null * @return the newly added relocation object */ public Relocation add(Address addr, int type, long[] values, byte[] bytes, String symbolName); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/scalar/Scalar.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/scalar/Scalar.java index 377e94582f..db9e757983 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/scalar/Scalar.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/scalar/Scalar.java @@ -240,7 +240,7 @@ public class Scalar implements Comparable { * with 0 being the least significant bit.

      * @param n the bit to clear in this scalar. * - * @throws IndexOutOfBoundsException if n >= bitLength(). + * @throws IndexOutOfBoundsException if n >= bitLength(). */ public Scalar clearBit(int n) { if (n < 0 || n > bitLength - 1) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Equate.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Equate.java index cc7139fb58..cfd118d5d2 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Equate.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Equate.java @@ -104,9 +104,9 @@ public interface Equate { public void removeReference(Address refAddr, int opndPosition); /** - * Remove the reference at the given operand position. - * @param refAddr the address that was using this equate - * @param opndPosition the operand index of the operand that was using this eqate. + * Remove the reference at the given address + * @param dynamicHash the hash of the reference + * @param refAddr the reference's address */ public void removeReference(long dynamicHash, Address refAddr); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/ExternalManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/ExternalManager.java index cc3ce7296e..186be46dd3 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/ExternalManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/ExternalManager.java @@ -118,14 +118,26 @@ public interface ExternalManager { /** * Returns a list of External Locations matching the given label name in the given Namespace. - * @param the Namespace to search + * @param namespace the Namespace to search * @param label the name of the labels to search for. * @return a list of External Locations matching the given label name in the given Namespace. */ public List getExternalLocations(Namespace namespace, String label); + /** + * Returns the unique external location associated with the given library name and label + * @param libraryName the library name + * @param label the label of the external location + * @return the unique external location or null + */ public ExternalLocation getUniqueExternalLocation(String libraryName, String label); + /** + * Returns the unique external location associated with the given namespace and label + * @param namespace the namespace + * @param label the label of the external location + * @return the unique external location or null + */ public ExternalLocation getUniqueExternalLocation(Namespace namespace, String label); /** @@ -154,10 +166,10 @@ public interface ExternalManager { /** * Get or create an external location associated with an library/file named extName * and the label within that file specified by extLabel - * @param extName - * @param extLabel - * @param extAddr - * @param source the source of this external library's symbol + * @param extName the external name + * @param extLabel the external label + * @param extAddr the external address + * @param sourceType the source type of this external library's symbol * @return external location * @throws InvalidInputException * @throws DuplicateNameException @@ -167,10 +179,10 @@ public interface ExternalManager { /** * Get or create an external location in the indicated parent namespace with the specified name. - * @param extNameSpace - * @param extLabel - * @param extAddr - * @param source the source of this external library's symbol + * @param extNamespace the external namespace + * @param extLabel the external label + * @param extAddr the external address + * @param sourceType the source type of this external library's symbol * @return external location * @throws InvalidInputException * @throws DuplicateNameException @@ -180,10 +192,10 @@ public interface ExternalManager { /** * Get or create an external location in the indicated parent namespace with the specified name. - * @param extNameSpace - * @param extLabel - * @param extAddr - * @param source the source of this external library's symbol + * @param extNamespace the external namespace + * @param extLabel the external label + * @param extAddr the external address + * @param sourceType the source type of this external library's symbol * @param reuseExisting if true, this will return an existing matching external * location instead of creating a new one. * @return external location @@ -197,10 +209,10 @@ public interface ExternalManager { /** * Get or create an external location associated with an library/file named extName * and the label within that file specified by extLabel - * @param extName - * @param extLabel - * @param extAddr - * @param source the source of this external library's symbol + * @param extName the external name + * @param extLabel the external label + * @param extAddr the external address + * @param sourceType the source type of this external library's symbol * @return external location * @throws InvalidInputException * @throws DuplicateNameException @@ -211,10 +223,10 @@ public interface ExternalManager { /** * Get or create an external function location associated with an library/file named extName * and the label within that file specified by extLabel - * @param extNamespace - * @param extLabel - * @param extAddr - * @param source the source of this external library's symbol + * @param extNamespace the external namespace + * @param extLabel the external label + * @param extAddr the external address + * @param sourceType the source type of this external library's symbol * @return external location * @throws InvalidInputException * @throws DuplicateNameException if another non-Library namespace has the same name @@ -225,9 +237,9 @@ public interface ExternalManager { /** * Get or create an external function location associated with an library/file named extName * and the label within that file specified by extLabel - * @param extNamespace - * @param extLabel - * @param source the source of this external library's symbol + * @param extNamespace the external namespace + * @param extLabel the external label + * @param sourceType the source type of this external library's symbol * @param reuseExisting if true, will return any existing matching location instead of * creating a new one. If false, will prefer to create a new one as long as the specified * address is not null and not used in an existing location. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Reference.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Reference.java index ec3217e132..2a48dc4996 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Reference.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Reference.java @@ -118,7 +118,7 @@ public interface Reference extends Comparable { public boolean isShiftedReference(); /** - * Gets the source of this reference. {@link SourceTypes} + * Gets the source of this reference. {@link SourceType}s * * @return the source of this reference */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Symbol.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Symbol.java index 2d6d15ee20..7dbdf917bd 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Symbol.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Symbol.java @@ -31,12 +31,12 @@ import ghidra.util.task.TaskMonitorAdapter; public interface Symbol { /** - * @returns the address for the symbol. + * @return the address for the symbol. */ public Address getAddress(); /** - * @returns the name of this symbol. + * @return the name of this symbol. */ public String getName(); @@ -49,12 +49,12 @@ public interface Symbol { /** * Gets the full path name for this symbol as an ordered array of strings ending * with the symbol name. The global symbol will return an empty array. - * @returns the array indicating the full path name for this symbol. + * @return the array indicating the full path name for this symbol. */ public String[] getPath(); /** - * @returns the program associated with this symbol. + * @return the program associated with this symbol. * Null may be returned for global symbols. */ public Program getProgram(); @@ -62,12 +62,12 @@ public interface Symbol { /** * Returns the symbol name, optionally prepended with the namespace path. * @param includeNamespace if true, the namespace path is prepended to the name. - * @returns formatted name + * @return formatted name */ public String getName(boolean includeNamespace); /** - * @returns the namespace that contains this symbol + * @return the namespace that contains this symbol */ public Namespace getParentNamespace(); @@ -86,7 +86,7 @@ public interface Symbol { /** * Returns whether the given parent is valid for this Symbol. * @param parent - * @returns true if parent is valid + * @return true if parent is valid */ public boolean isValidParent(Namespace parent); @@ -96,17 +96,17 @@ public interface Symbol { public SymbolType getSymbolType(); /** - * @returns the number of References to this symbol. + * @return the number of References to this symbol. */ public int getReferenceCount(); /** - * @returns true if this symbol has more than one reference to it. + * @return true if this symbol has more than one reference to it. */ public boolean hasMultipleReferences(); /** - * @returns true if this symbol has at least one reference to it. + * @return true if this symbol has at least one reference to it. */ public boolean hasReferences(); @@ -115,7 +115,7 @@ public interface Symbol { * {@link TaskMonitor} instance, then you can pass {@link TaskMonitorAdapter#DUMMY_MONITOR} or * null. * - * @returns all memory references to the address of this symbol. + * @return all memory references to the address of this symbol. * * @param monitor the monitor that is used to report progress and to cancel this * potentially long-running call @@ -125,13 +125,13 @@ public interface Symbol { /** * Returns all memory references to the address of this symbol. * - * @returns all memory references to the address of this symbol + * @return all memory references to the address of this symbol * @see #getReferences(TaskMonitor) */ public Reference[] getReferences(); /** - * @returns a program location corresponding to this symbol + * @return a program location corresponding to this symbol */ public ProgramLocation getProgramLocation(); @@ -186,7 +186,7 @@ public interface Symbol { /** * Delete the symbol and its associated resources. - * @returns true if successful + * @return true if successful */ public boolean delete(); @@ -194,7 +194,7 @@ public interface Symbol { * Returns true if the symbol is pinned to its current address. If it is pinned, then moving * or removing the memory associated with that address will not affect this symbol. * - * @returns true if the symbol is pinned to its current address. + * @return true if the symbol is pinned to its current address. */ public boolean isPinned(); @@ -215,7 +215,7 @@ public interface Symbol { public void setPinned(boolean pinned); /** - * @returns true if this symbol is a dynamic symbol (not actually defined in the database). + * @return true if this symbol is a dynamic symbol (not actually defined in the database). */ public boolean isDynamic(); @@ -228,7 +228,7 @@ public interface Symbol { public boolean isExternal(); /** - * @returns true if this symbol is primary + * @return true if this symbol is primary */ public boolean isPrimary(); @@ -240,36 +240,36 @@ public interface Symbol { public boolean setPrimary(); /** - * @returns true if the symbol is at an address + * @return true if the symbol is at an address * set as a external entry point. */ public boolean isExternalEntryPoint(); /** - * @returns this symbol's ID. + * @return this symbol's ID. */ public long getID(); /** - * @returns object associated with this symbol or null if symbol has been deleted + * @return object associated with this symbol or null if symbol has been deleted */ public Object getObject(); /** - * @returns true if the symbol is global + * @return true if the symbol is global */ public boolean isGlobal(); /** * Sets the source of this symbol. - * {@link SourceTypes} + * {@link SourceType} * @param source the new source of this symbol */ public void setSource(SourceType source); /** * Gets the source of this symbol. - * {@link SourceTypes} + * {@link SourceType} * @return the source of this symbol */ public SourceType getSource(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/SymbolTable.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/SymbolTable.java index 82abf5d987..5cbab0d20f 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/SymbolTable.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/SymbolTable.java @@ -158,7 +158,7 @@ public interface SymbolTable { * @param name the name of the symbol to retrieve * @param addr the address of the symbol to retrieve * @param namespace the namespace of the symbol to retrieve. May be null which indicates global namespace. - * @See {@link getGlobalSymbol(String, Address)} for a convenience method if the namespace is the global namespace. + * @see #getGlobalSymbol(String, Address) for a convenience method if the namespace is the global namespace. */ public Symbol getSymbol(String name, Address addr, Namespace namespace); @@ -172,18 +172,18 @@ public interface SymbolTable { * * @param name the name of the symbol to retrieve * @param addr the address of the symbol to retrieve - * @See {@link getSymbol(String, Address, Namespace)} + * @see #getSymbol(String, Address, Namespace) */ public Symbol getGlobalSymbol(String name, Address addr); /** * Returns the first symbol with the given name found in the given namespace. Ghidra now * allows multiple symbols with the same name in the same namespace, so using this method - * is likely to produce unintended results. Use {@link #getSymbols(Namespace, String)} instead. + * is likely to produce unintended results. Use {@link #getSymbols(String, Namespace)} instead. * @param name the name of the symbol to retreive * @param namespace the namespace of the symbol to retrieve (null assumes global namespace) * @deprecated This method is no longer useful as Ghidra allows duplicate symbol names in - * the same namespace. Use {@link #getSymbols(Namespace, String)} instead. + * the same namespace. Use {@link #getSymbols(String, Namespace)} instead. * Deprecated in version 7.5, will be removed a few versions later. */ @Deprecated @@ -213,8 +213,6 @@ public interface SymbolTable { * @param name the name of the symbols to search for. * @param namespace the namespace to search. If null, then the global namespace is assumed. * @return a list of all the label or function symbols with the given name in the given namespace. - * @throws DuplicateNameException if more than one label or function symbol has the name in - * the given namespace. */ public List getLabelOrFunctionSymbols(String name, Namespace namespace); @@ -269,7 +267,7 @@ public interface SymbolTable { * Returns a symbol that is either a parameter or local variable. There can be only * one because these symbol types have a unique name requirement. * @param name the naem of the variable. - * @param namespace the namespace (function) to search. + * @param function the function to search. * @return a parameter or local variable symbol with the given name. */ public Symbol getVariableSymbol(String name, Function function); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/SymbolUtilities.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/SymbolUtilities.java index 01f99db339..4e88c792ec 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/SymbolUtilities.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/SymbolUtilities.java @@ -820,7 +820,7 @@ public class SymbolUtilities { /** * Gets the base symbol name regardless of whether or not the address has been appended. * @param symbol the symbol to get the clean name for. - * @return the base symbol name where the "@
      " has been stripped away if it exists. + * @return the base symbol name where the {@literal "@
      "} has been stripped away if it exists. */ public static String getCleanSymbolName(Symbol symbol) { return getCleanSymbolName(symbol.getName(), symbol.getAddress()); @@ -833,7 +833,7 @@ public class SymbolUtilities { * {@link #getAddressString(Address)} method for it to be recognized. * @param symbolName a symbol name to get the clean name for. * @param address the symbol's address - * @return the base symbol name where the "@
      " has been stripped away if it exists. + * @return the base symbol name where the {@literal "@
      "} has been stripped away if it exists. */ public static String getCleanSymbolName(String symbolName, Address address) { @@ -971,7 +971,6 @@ public class SymbolUtilities { * @param namespace symbol namespace or null for global * @param name symbol name * @param source symbol source type - * @param errorConsumer error logging consumer * @return new or existing label or function symbol or null if creating a global symbol * whose name already exists at address * @throws InvalidInputException if invalid symbol name provided diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/AddressLabelInfo.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/AddressLabelInfo.java index f07ab97b09..8f3834d2f1 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/AddressLabelInfo.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/AddressLabelInfo.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -112,12 +111,6 @@ public class AddressLabelInfo implements Comparable { return processorSymbolType; } - /** - * Compares this object with the specified object for order. Returns a - * negative integer, zero, or a positive integer as this object is less - * than, equal to, or greater than the specified object. - * @param o the object to compare with this one - */ @Override public int compareTo(AddressLabelInfo info) { if (info == null) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/DefaultPropertyMap.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/DefaultPropertyMap.java index b6f4e369a2..dffff2e3c2 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/DefaultPropertyMap.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/DefaultPropertyMap.java @@ -147,8 +147,6 @@ public abstract class DefaultPropertyMap implements PropertyMap { /** * Get the next address where the property value exists. * @param addr the address from which to begin the search (exclusive). - * @throws NoSuchIndexException thrown if there is no address with - * a property value after the given address. */ @Override public Address getNextPropertyAddress(Address addr) { @@ -167,8 +165,6 @@ public abstract class DefaultPropertyMap implements PropertyMap { * Get the previous Address where a property value exists. * @param addr the address from which * to begin the search (exclusive). - * @throws NoSuchIndexException when there is no address - * with a property value before the given address. */ @Override public Address getPreviousPropertyAddress(Address addr) { @@ -198,8 +194,6 @@ public abstract class DefaultPropertyMap implements PropertyMap { /** * Get the last Address where a property value exists. - * @exception NoSuchIndexException - * thrown if there is no address having the property value. */ @Override public Address getLastPropertyAddress() { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/PropertyMap.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/PropertyMap.java index ea5c669c17..68d6868e9d 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/PropertyMap.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/PropertyMap.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -81,16 +80,12 @@ public interface PropertyMap { /** * Get the next address where the property value exists. * @param addr the address from which to begin the search (exclusive). - * @throws NoSuchIndexException thrown if there is no address with - * a property value after the given address. */ public Address getNextPropertyAddress(Address addr); /** * Get the previous Address where a property value exists. * @param addr the address from which * to begin the search (exclusive). - * @throws NoSuchIndexException when there is no address - * with a property value before the given address. */ public Address getPreviousPropertyAddress(Address addr); /** @@ -99,8 +94,6 @@ public interface PropertyMap { public Address getFirstPropertyAddress(); /** * Get the last Address where a property value exists. - * @exception NoSuchIndexException - * thrown if there is no address having the property value. */ public Address getLastPropertyAddress(); /** diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AddressFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AddressFieldLocation.java index 2a7f8c6291..e613318650 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AddressFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AddressFieldLocation.java @@ -33,7 +33,7 @@ public class AddressFieldLocation extends CodeUnitLocation { * standard string representation * and a position within that string. * - * @param the program of the location + * @param program the program of the location * @param addr address of the location * @param componentPath if not null, it is the array of indexes that point * to a specific data type inside of another data type @@ -52,7 +52,7 @@ public class AddressFieldLocation extends CodeUnitLocation { /** * Construct a new default AddressFieldLocation for a given program address. * - * @param the program of the location + * @param program the program of the location * @param addr address of the location */ public AddressFieldLocation(Program program, Address addr) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AutomaticCommentFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AutomaticCommentFieldLocation.java index 3b05b8abb9..7b1fd60085 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AutomaticCommentFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AutomaticCommentFieldLocation.java @@ -30,7 +30,7 @@ public class AutomaticCommentFieldLocation extends CommentFieldLocation { /** * Construct a new AutomaticCommentFieldLocation. * - * @param the program of the location + * @param program the program of the location * @param addr the address of the codeunit. * @param componentPath the componentPath of the codeUnit * @param comment comment text for the particular comment indicated by the address, subtype, and reference address. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/BlockStartLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/BlockStartLocation.java index ed2a2c0c05..55a7c3ce94 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/BlockStartLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/BlockStartLocation.java @@ -30,11 +30,14 @@ public class BlockStartLocation extends CommentFieldLocation { /** * Create a new BlockStartLocation. * - * @param the program of the location + * @param program the program of the location * @param addr address of block - * @param groupPath object that uniquely identifies a module or fragment + * @param componentPath object that uniquely identifies a module or fragment * by its hierarchy names; this parameter may be null + * @param row the component row * @param charOffset character position of the location + * @param comment the block comments + * @param commentRow the comment row */ public BlockStartLocation(Program program, Address addr, int[] componentPath, int row, int charOffset, String[] comment, int commentRow) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/CommentFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/CommentFieldLocation.java index 5fe8243bdc..94ddb973ce 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/CommentFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/CommentFieldLocation.java @@ -35,7 +35,7 @@ public class CommentFieldLocation extends CodeUnitLocation { /** * Construct a new CommentFieldLocation. - * @param the program of the location + * @param program the program of the location * @param addr address of the location; should not be null * hierarchy names; this parameter may be null * @param componentPath if not null, it is the array of indexes that point diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/DividerLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/DividerLocation.java index e81a4f1eec..2deda6905d 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/DividerLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/DividerLocation.java @@ -29,7 +29,7 @@ public class DividerLocation extends ProgramLocation { /** * Create a new DividerLocation. * - * @param the program of the location + * @param program the program of the location * @param addr address of bookmark * @param groupPath object that uniquely identifies a module or fragment * by its hierarchy names; this parameter may be null diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/EolCommentFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/EolCommentFieldLocation.java index 5b4cf65fdf..2aa42370ce 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/EolCommentFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/EolCommentFieldLocation.java @@ -30,7 +30,7 @@ public class EolCommentFieldLocation extends CommentFieldLocation { /** * Construct a new EolCommentFieldLocation. * - * @param the program of the location + * @param program the program of the location * @param addr the address of the codeunit. * @param componentPath the componentPath of the codeUnit * @param comment comment text for the particular comment indicated by the address, subtype, and reference address. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FieldNameFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FieldNameFieldLocation.java index 54e1f2284c..c336995a9e 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FieldNameFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FieldNameFieldLocation.java @@ -32,7 +32,7 @@ public class FieldNameFieldLocation extends CodeUnitLocation { /** * Construct a new FieldNameFieldLocation. * - * @param the program of the location + * @param program the program of the location * @param addr the address of the codeunit. * @param componentPath if not null, it is the array of indexes that point * to a specific data type inside of another data type diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionCallFixupFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionCallFixupFieldLocation.java index a4d795a4c2..77f73b14d4 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionCallFixupFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionCallFixupFieldLocation.java @@ -30,10 +30,9 @@ public class FunctionCallFixupFieldLocation extends FunctionLocation { /** * Construct a new FunctionCallFixupFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address - * @param path the group path from the program tree. * @param callFixupName the function call-fixup field text String at this location. * @param charOffset the character position within the field */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionCallingConventionFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionCallingConventionFieldLocation.java index 28c5de6689..6868f5d86d 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionCallingConventionFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionCallingConventionFieldLocation.java @@ -27,7 +27,7 @@ public class FunctionCallingConventionFieldLocation extends FunctionSignatureFie /** * Construct a new FunctionCallingConventionFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address * @param charOffset the position within the function signature string for this location. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionEndParametersFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionEndParametersFieldLocation.java index 2caaa9dfd3..6b223a2fd0 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionEndParametersFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionEndParametersFieldLocation.java @@ -27,7 +27,7 @@ public class FunctionEndParametersFieldLocation extends FunctionSignatureFieldLo /** * Construct a new FunctionEndParametersFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address * @param charOffset the position within the function signature string for this location. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionInlineFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionInlineFieldLocation.java index 5d1445b2cc..26c2328b72 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionInlineFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionInlineFieldLocation.java @@ -27,7 +27,7 @@ public class FunctionInlineFieldLocation extends FunctionSignatureFieldLocation /** * Construct a new FunctionInlineFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address * @param charOffset the position within the function inline string for this location. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionLocation.java index 65b0371707..994870d021 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionLocation.java @@ -33,7 +33,7 @@ public class FunctionLocation extends ProgramLocation { /** * Create a new FunctionLocation. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address * @param row the row in the field @@ -79,7 +79,6 @@ public class FunctionLocation extends ProgramLocation { * Save this function location to the given save state object. * * @param obj the save state object for saving the location - * @param prefix prefix appended to the names of the save state items to make the entry unique */ @Override public void saveState(SaveState obj) { @@ -93,7 +92,8 @@ public class FunctionLocation extends ProgramLocation { /** * Restore this function location using the given program and save state object. * - * @param prefix prefix appended to the names of the save state items to make the entry unique + * @param program1 the program containing the function location + * @param obj the save state object for saving the location */ @Override public void restoreState(Program program1, SaveState obj) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionNameFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionNameFieldLocation.java index d8a6506531..a67af9b2b2 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionNameFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionNameFieldLocation.java @@ -30,7 +30,7 @@ public class FunctionNameFieldLocation extends FunctionSignatureFieldLocation { /** * Construct a new FunctionNameFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address * @param charOffset the position within the function signature string for this location. @@ -46,7 +46,7 @@ public class FunctionNameFieldLocation extends FunctionSignatureFieldLocation { /** * Construct a new FunctionNameFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param functionAddr the function address * @param col the position within the function signature string for this location. * @param signature the function signature string for this location. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionNoReturnFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionNoReturnFieldLocation.java index 60fba50636..51b627c68b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionNoReturnFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionNoReturnFieldLocation.java @@ -27,7 +27,7 @@ public class FunctionNoReturnFieldLocation extends FunctionSignatureFieldLocatio /** * Construct a new FunctionNoReturnFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address * @param charOffset the position within the function noreturn string for this location. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionParameterNameFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionParameterNameFieldLocation.java index 1b8a61ca81..317f993e4d 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionParameterNameFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionParameterNameFieldLocation.java @@ -31,7 +31,7 @@ public class FunctionParameterNameFieldLocation extends FunctionParameterFieldLo /** * Construct a new FunctionParameterNameFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address * @param charOffset the position within the function signature string for this location. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionRepeatableCommentFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionRepeatableCommentFieldLocation.java index ddcd49c1d0..30153480b6 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionRepeatableCommentFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionRepeatableCommentFieldLocation.java @@ -32,7 +32,7 @@ public class FunctionRepeatableCommentFieldLocation extends FunctionLocation { /** * Construct a new FunctionRepeatableCommentFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address * @param comment the function comment array String at this location. @@ -48,7 +48,7 @@ public class FunctionRepeatableCommentFieldLocation extends FunctionLocation { /** * Construct a new FunctionRepeatableCommentFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param functionAddr the function address (must not be an EXTERNAL function) * @param comment the function comment array String at this location. * @param row row number (index into the comment array) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionReturnTypeFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionReturnTypeFieldLocation.java index 451388ace7..f258e36a58 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionReturnTypeFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionReturnTypeFieldLocation.java @@ -32,7 +32,7 @@ public class FunctionReturnTypeFieldLocation extends FunctionSignatureFieldLocat /** * Construct a new FunctionReturnTypeFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address * @param charOffset the position within the function signature string for this location. @@ -48,7 +48,7 @@ public class FunctionReturnTypeFieldLocation extends FunctionSignatureFieldLocat /** * Construct a new FunctionReturnTypeFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param functionAddr the function address * @param col the position within the function signature string for this location. * @param signature the function signature string for this location. @@ -61,7 +61,7 @@ public class FunctionReturnTypeFieldLocation extends FunctionSignatureFieldLocat /** * Construct a new FunctionReturnTypeFieldLocation object that is field based.

      - * @param the program of the location + * @param program the program of the location * @param functionAddr the function address * @param returnType the function return type String at this location. */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionSignatureFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionSignatureFieldLocation.java index 12af6338ab..b7ed094968 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionSignatureFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionSignatureFieldLocation.java @@ -41,7 +41,7 @@ public class FunctionSignatureFieldLocation extends FunctionLocation { /** * Construct a new FunctionSignatureFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address * @param charOffset the character position within the function signature string for this location. @@ -57,7 +57,7 @@ public class FunctionSignatureFieldLocation extends FunctionLocation { /** * Construct a new FunctionSignatureFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param functionAddr the function address * @param col the character position within the function signature string for this location. * @param signature the function signature String at this location. @@ -70,7 +70,7 @@ public class FunctionSignatureFieldLocation extends FunctionLocation { /** * Construct a new FunctionSignatureFieldLocation object with field-based positioning. * - * @param the program of the location + * @param program the program of the location * @param functionAddr the function address */ public FunctionSignatureFieldLocation(Program program, Address functionAddr) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionSignatureSourceFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionSignatureSourceFieldLocation.java index bd79c6093c..39e481c01a 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionSignatureSourceFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionSignatureSourceFieldLocation.java @@ -34,7 +34,7 @@ public class FunctionSignatureSourceFieldLocation extends FunctionLocation { /** * Construct a new FunctionSignatureFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of this location. * @param functionAddr the function address * @param source the function signature SourceType at this location. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionStartParametersFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionStartParametersFieldLocation.java index 32e796e73c..5d8228a956 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionStartParametersFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionStartParametersFieldLocation.java @@ -27,10 +27,11 @@ public class FunctionStartParametersFieldLocation extends FunctionSignatureField /** * Construct a new FunctionStartParametersFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address - * @param index the position within the function name string for this location. + * @param charOffset the position within the function name string for this location. + * @param signature the function signature */ public FunctionStartParametersFieldLocation(Program program, Address locationAddr, Address functionAddr, int charOffset, String signature) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionThunkFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionThunkFieldLocation.java index 70f77fa2e5..ca6244f77c 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionThunkFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionThunkFieldLocation.java @@ -27,7 +27,7 @@ public class FunctionThunkFieldLocation extends FunctionSignatureFieldLocation { /** * Construct a new FunctionThunkFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address * @param charOffset the position within the function thunk string for this location. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/IndentFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/IndentFieldLocation.java index 9b83acee61..2cb4714190 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/IndentFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/IndentFieldLocation.java @@ -26,7 +26,7 @@ public class IndentFieldLocation extends CodeUnitLocation { /** * Construct a new IndentFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param addr address of the location; should not be null * fragment by its hierarchy names; this parameter may be null * @param componentPath array of indexes for each nested data component; the diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/InstructionUtils.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/InstructionUtils.java index d4a3878179..7101357b63 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/InstructionUtils.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/InstructionUtils.java @@ -129,7 +129,7 @@ public class InstructionUtils { /** * Format instruction operand objects * @param instr instruction - * @param int opIndex + * @param opIndex the operand index * @return formatted array of strings */ public static String[] getFormatedOperandObjects(Instruction instr, int opIndex) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LabelFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LabelFieldLocation.java index 277d51c876..95344dccc7 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LabelFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LabelFieldLocation.java @@ -42,7 +42,7 @@ public class LabelFieldLocation extends CodeUnitLocation { /** * Construct a new LabelFieldLocation. * - * @param the program of the location + * @param program the program of the location * @param addr address of the location; should not be null * @param componentPath array of indexes for each nested data component; the * index is the data component's index within its parent; may be null diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguagePostUpgradeInstructionHandler.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguagePostUpgradeInstructionHandler.java index b041e60346..b0d6c6e76b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguagePostUpgradeInstructionHandler.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguagePostUpgradeInstructionHandler.java @@ -76,7 +76,6 @@ public abstract class LanguagePostUpgradeInstructionHandler { /** * Repair the context and re-disassemble the instruction at the specified address. - * @param program * @param addr instruction address * @param contextValue new context value * @param mergeContext if true, the specified context value will be merged with the existing diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguageTranslator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguageTranslator.java index 739c9cd1e0..3366310206 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguageTranslator.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguageTranslator.java @@ -39,7 +39,7 @@ public interface LanguageTranslator extends ExtensionPoint { * Validate translator to complete initialization and ensure language compatibility. * This method will be invoked by the LanguageTranslatorFactory before handing out this * translator. - * @returns true if translator successfully validated + * @return true if translator successfully validated */ public boolean isValid(); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguageTranslatorFactory.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguageTranslatorFactory.java index 4e412b6edd..e1d1ab97ff 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguageTranslatorFactory.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/LanguageTranslatorFactory.java @@ -200,7 +200,7 @@ public class LanguageTranslatorFactory { /** * Validate all translators contained within the translator maps. * This is intended to be used by a unit test. - * @returns number of validation errors + * @return number of validation errors */ int validateAllTranslators() { int errorCnt = 0; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/MemoryBlockStartFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/MemoryBlockStartFieldLocation.java index 1b12813870..08f48338f5 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/MemoryBlockStartFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/MemoryBlockStartFieldLocation.java @@ -30,11 +30,13 @@ public class MemoryBlockStartFieldLocation extends CommentFieldLocation { /** * Create a new BlockStartLocation. * - * @param the program of the location + * @param program the program of the location * @param addr address of block - * @param groupPath object that uniquely identifies a module or fragment - * by its hierarchy names; this parameter may be null + * @param componentPath the component path + * @param row component row * @param charOffset character position of the location + * @param comment the location comment + * @param commentRow the comment row */ public MemoryBlockStartFieldLocation(Program program, Address addr, int[] componentPath, int row, int charOffset, String[] comment, int commentRow) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/MnemonicFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/MnemonicFieldLocation.java index b6cbfeb0f4..f5f0090f45 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/MnemonicFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/MnemonicFieldLocation.java @@ -32,7 +32,7 @@ public class MnemonicFieldLocation extends CodeUnitLocation { /** * Construct a new MnemonicFieldLocation. * - * @param the program of the location + * @param program the program of the location * @param addr address of the location; should not be null * @param componentPath array of indexes for each nested data component; the * index is the data component's index within its parent; may be @@ -49,7 +49,7 @@ public class MnemonicFieldLocation extends CodeUnitLocation { /** * Construct a new MnemonicFieldLocation. * - * @param the program of the location + * @param program the program of the location * @param addr address of the location; should not be null * @param refAddr the "referred to" address if the location is over a * reference; may be null @@ -68,7 +68,7 @@ public class MnemonicFieldLocation extends CodeUnitLocation { } /** - * @see CodeUnitLocation#ProgramLocation(Program, Address) + * @see ProgramLocation#ProgramLocation(Program, Address) */ public MnemonicFieldLocation(Program program, Address address) { super(program, address, 0, 0, 0); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguageFactory.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguageFactory.java index 3c4faf41ff..1aa64e5e4e 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguageFactory.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/OldLanguageFactory.java @@ -115,7 +115,7 @@ public class OldLanguageFactory { /** * Validate all old language definitions contained within the old language map. * This is intended to be used by a unit test. - * @returns number of validation errors + * @return number of validation errors */ int validateAllOldLanguages() { int errorCnt = 0; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/PlateFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/PlateFieldLocation.java index d8b9054df6..f10a3f23a9 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/PlateFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/PlateFieldLocation.java @@ -36,7 +36,7 @@ public class PlateFieldLocation extends CommentFieldLocation { /** * Construct a new PlateFieldLocation. * - * @param the program of the location + * @param program the program of the location * @param addr the address of the code unit. * @param componentPath the componentPath of the codeUnit * @param row the line of the location @@ -79,7 +79,7 @@ public class PlateFieldLocation extends CommentFieldLocation { * the comment row that was clicked. -1 will be returned if the border of the * plate field was clicked. *

      - * Note: This value is different than that returned by {@link #getRowIndex()}, as that + * Note: This value is different than that returned by {@link #getRow()}, as that * value represents the screen row clicked. Further, the PlateField adds screen * decoration to the comments, which causes the screen row to differ from the comment * row. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/PostCommentFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/PostCommentFieldLocation.java index b6ee8731b8..7a8fddc007 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/PostCommentFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/PostCommentFieldLocation.java @@ -28,7 +28,7 @@ public class PostCommentFieldLocation extends CommentFieldLocation { /** * Construct a new PostCommentFieldLocation. * - * @param the program of the location + * @param program the program of the location * @param addr the address of the codeunit. * @param componentPath the componentPath of the codeUnit * @param comment comment text for the particular comment indicated by the address, subtype, and reference address. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/ProgramLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/ProgramLocation.java index 13360847d9..7272f4f5cb 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/ProgramLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/ProgramLocation.java @@ -54,8 +54,6 @@ public class ProgramLocation implements Comparable { * @param addr address of the location; cannot be null; This could be a * code unit minimum address where the byteAddr is within the code unit. * @param byteAddr address of the location; cannot be null - * @param groupPath path associated with the address (an address could - * appear at more than one group path); may be null * @param componentPath array of indexes for each nested data component; * the data index is the data component's index within its parent; may be null * @param refAddr the "referred to" address if the location is @@ -202,8 +200,6 @@ public class ProgramLocation implements Comparable { /** * Save this program location to the given save state object. * @param obj the save state object for saving the location - * @param prefix prefix appended to the names of the save state items to make the entry - * unique */ public void saveState(SaveState obj) { obj.putString("_CLASSNAME", getClass().getName()); @@ -224,8 +220,8 @@ public class ProgramLocation implements Comparable { /** * Restore this program location using the given program * and save state object. - * @param prefix prefix appended to the names of the save state items to make the entry - * unique + * @param program1 program to restore from + * @param obj the save state to restore from */ public void restoreState(Program program1, SaveState obj) { this.program = program1; diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RangeMapAdapter.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RangeMapAdapter.java index 8b5af8132f..5b4cefe6a3 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RangeMapAdapter.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RangeMapAdapter.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +38,6 @@ public interface RangeMapAdapter { * @param length the number of addresses to move. * @param monitor the task monitor. * @throws CancelledException if the user canceled the operation via the task monitor. - * @throws AddressOverflowException if the length is such that a address wrap occurs */ public void moveAddressRange(Address fromAddr, Address toAddr, long length, TaskMonitor monitor) throws CancelledException; @@ -100,8 +98,7 @@ public interface RangeMapAdapter { /** * Returns the bounding address-range containing addr and the the same value throughout. * This range will be limited by any value change associated with the base register. - * @param register - * @param addr + * @param addr the containing address * @return single value address-range containing addr */ public AddressRange getValueRangeContaining(Address addr); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RefRepeatCommentFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RefRepeatCommentFieldLocation.java index f8c95ce9fa..de70c45df8 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RefRepeatCommentFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RefRepeatCommentFieldLocation.java @@ -31,7 +31,7 @@ public class RefRepeatCommentFieldLocation extends CommentFieldLocation { /** * Construct a new RefRepeatCommentFieldLocation. * - * @param the program of the location + * @param program the program of the location * @param addr the address of the codeunit. * @param componentPath the componentPath of the codeUnit * @param comment comment text for the particular comment indicated by the address, subtype, and reference address. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RegisterValueStore.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RegisterValueStore.java index 2d3d8dcef1..db012cb750 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RegisterValueStore.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RegisterValueStore.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -89,7 +88,6 @@ public class RegisterValueStore { * @param length the number of addresses to move. * @param monitor the task monitor. * @throws CancelledException if the user canceled the operation via the task monitor. - * @throws AddressOverflowException if the length is such that a address wrap occurs */ public void moveAddressRange(Address fromAddr, Address toAddr, long length, TaskMonitor monitor) throws CancelledException { @@ -103,7 +101,7 @@ public class RegisterValueStore { * not changed. * @param start the start of the range to set the register value. * @param end the end of the range(inclusive) to set the register value. - * @param bytes byte array containing the mask and value bytes. + * @param newValue the new register value to set. */ public void setValue(Address start, Address end, RegisterValue newValue) { @@ -315,8 +313,7 @@ public class RegisterValueStore { /** * Returns the bounding address-range containing addr and the the same value throughout. * This range will be limited by any value change associated with the base register. - * @param register - * @param addr + * @param addr the contained address * @return single value address-range containing addr */ public AddressRange getValueRangeContaining(Address addr) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RepeatableCommentFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RepeatableCommentFieldLocation.java index bd16d1e6db..80193494f6 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RepeatableCommentFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/RepeatableCommentFieldLocation.java @@ -30,7 +30,7 @@ public class RepeatableCommentFieldLocation extends CommentFieldLocation { /** * Construct a new RepeatableCommentFieldLocation. * - * @param the program of the location + * @param program the program of the location * @param addr the address of the codeunit. * @param componentPath the componentPath of the codeUnit * @param comment comment text for the particular comment indicated by the address, subtype, and reference address. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SimpleDiffUtility.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SimpleDiffUtility.java index 137db1eec0..558f1b806b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SimpleDiffUtility.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SimpleDiffUtility.java @@ -267,7 +267,6 @@ public class SimpleDiffUtility { /** * Convert an address from the specified program to a comparable address in the * specified otherProgram. - * @param program program which contains the specified address instance * @param addr address in program * @param otherProgram other program * @param exactMatchOnly if false and addr is an overlay address, a closest match will be returned @@ -693,8 +692,9 @@ public class SimpleDiffUtility { /** * Find the variable symbol in otherProgram which corresponds to the specified varSym. - * @param varSym variable symbol - * @param otherProgram + * @param symbol variable symbol + * @param otherProgram other program + * @return the variable symbol or null */ public static Symbol getVariableSymbol(Symbol symbol, Program otherProgram) { Symbol otherParent = getSymbol(symbol.getParentSymbol(), otherProgram); @@ -726,9 +726,10 @@ public class SimpleDiffUtility { } /** - * Find the variable symbol in otherProgram which corresponds to the specified varSym. + * Find the variable symbol in otherFunction which corresponds to the specified varSym. * @param varSym variable symbol - * @param otherProgram + * @param otherFunction other function + * @return the variable symbol or null */ protected static Symbol getVariableSymbol(Symbol varSym, Function otherFunction) { Program program = varSym.getProgram(); @@ -756,11 +757,11 @@ public class SimpleDiffUtility { * 1. First use offset matches * 2. Ordinal matches (for parameters only) * 3. Minimum or maximum address matches - * @param otherSymTable - * @param var - * @param otherStorage - * @param otherFunc - * @return + * @param otherSymTable other symbol table + * @param var variable + * @param otherStorage other variable storage + * @param otherFunctionSymbol other function symbol + * @return the overlapping variable or null */ protected static Variable getOverlappingVariable(SymbolTable otherSymTable, Variable var, VariableStorage otherStorage, Symbol otherFunctionSymbol) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SpaceFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SpaceFieldLocation.java index 3b04f76482..24e2be1081 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SpaceFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SpaceFieldLocation.java @@ -27,7 +27,7 @@ public class SpaceFieldLocation extends CodeUnitLocation { /** * Construct a new SpaceFieldLocation. * - * @param the program of the location + * @param program the program of the location * @param addr the address of the codeunit. * @param componentPath the componentPath of the codeUnit * @param row the line of the location diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SpacerFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SpacerFieldLocation.java index ffa40d8d93..6314171bc3 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SpacerFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/SpacerFieldLocation.java @@ -31,7 +31,7 @@ public class SpacerFieldLocation extends CodeUnitLocation { /** *Construct a new SpacerFieldLocation. * - * @param the program of the location + * @param program the program of the location * @param addr the address of the codeunit. * @param componentPath the componentPath of the codeUnit * @param charOffset the character position on the row of the location. diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/ThunkedFunctionFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/ThunkedFunctionFieldLocation.java index 5e36b0f467..a3cba7149b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/ThunkedFunctionFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/ThunkedFunctionFieldLocation.java @@ -19,18 +19,18 @@ import ghidra.program.model.address.Address; import ghidra.program.model.listing.Program; /** - * The FunctionCallFixupFieldLocation class provides specific information - * about the Function call-fixup field within a program location. + * The ThunkedFunctionFieldLocation class provides specific information + * about a thunked function within a program location. */ public class ThunkedFunctionFieldLocation extends FunctionLocation { /** - * Construct a new FunctionCallFixupFieldLocation object. + * Construct a new ThunkedFunctionFieldLocation object. * - * @param program + * @param program the program containing the thinked function * @param locationAddr the address of the listing location (i.e., referent code unit) * @param functionAddr the function address - * @param callFixupName the function call-fixup field text String at this location. + * @param thunkedFunctionAddr the thunked function address * @param charOffset field character offset */ public ThunkedFunctionFieldLocation(Program program, Address locationAddr, diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/UserDataChangeRecord.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/UserDataChangeRecord.java index 82f0d21744..290c640f56 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/UserDataChangeRecord.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/UserDataChangeRecord.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,8 +42,6 @@ public class UserDataChangeRecord extends DomainObjectChangeRecord { /** * Constructor for change record for removing a range of properties. * @param propertyName name of the property - * @param start start of the range of properties being removed - * @param end end of the range of properties being removed */ public UserDataChangeRecord(String propertyName) { super(ChangeManager.DOCR_CODE_UNIT_PROPERTY_RANGE_REMOVED); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableCommentFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableCommentFieldLocation.java index 4422dde13f..fa5877848d 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableCommentFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableCommentFieldLocation.java @@ -33,10 +33,10 @@ public class VariableCommentFieldLocation extends VariableLocation { /** * Construct a new VariableCommentFieldLocation object. + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param var the variable which has its comment in the field. * @param charOffset the position within the variable comment string for this location. - * @param the program of the location */ public VariableCommentFieldLocation(Program program, Address locationAddr, Variable var, int charOffset) { @@ -49,7 +49,7 @@ public class VariableCommentFieldLocation extends VariableLocation { * Construct a new VariableCommentFieldLocation object. * Variable function entry point is the assumed listing location (i.e., referent code unit). * Care should be taken if variable corresponds to an EXTERNAL function. - * @param the program of the location + * @param program the program of the location * @param var the variable which has its comment in the field. * @param charOffset the position within the variable comment string for this location. */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableLocFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableLocFieldLocation.java index ff50cbc009..59728100c2 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableLocFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableLocFieldLocation.java @@ -33,10 +33,10 @@ public class VariableLocFieldLocation extends VariableLocation { /** * Construct a new VariableLocFieldLocation object. + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param var the variable which has its location (stack offset) in the field. * @param charOffset the position within the variable location (stack offset) string for this location. - * @param the program of the location */ public VariableLocFieldLocation(Program program, Address locationAddr, Variable var, int charOffset) { @@ -49,9 +49,9 @@ public class VariableLocFieldLocation extends VariableLocation { * Construct a new VariableLocFieldLocation object. * Variable function entry point is the assumed listing location (i.e., referent code unit). * Care should be taken if variable corresponds to an EXTERNAL function. + * @param program the program of the location * @param var the variable which has its location (stack offset) in the field. - * @param the program of the location - * @param col the position within the variable location (stack offset) string for this location. + * @param charOffset the position within the variable location (stack offset) string for this location. */ public VariableLocFieldLocation(Program program, Variable var, int charOffset) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableLocation.java index 967b45c079..763acdb13d 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableLocation.java @@ -49,11 +49,11 @@ public class VariableLocation extends FunctionLocation { /** * Create a new VariableLocation. * - * @param the program of the location + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param var the variable associated with this location. - * @index the index of the sub-piece on that variable (only the xrefs have subpieces - * @charOffset the character position on the piece. + * @param index the index of the sub-piece on that variable (only the xrefs have subpieces + * @param charOffset the character position on the piece. */ public VariableLocation(Program program, Address locationAddr, Variable var, int index, int charOffset) { @@ -72,8 +72,10 @@ public class VariableLocation extends FunctionLocation { /** * Create a new VariableLocation. * - * @param the program of the location + * @param program the program of the location * @param var the variable associated with this location. + * @param index the index of the sub-piece on that variable (only the xrefs have subpieces + * @param charOffset the character position on the piece. */ public VariableLocation(Program program, Variable var, int index, int charOffset) { this(program, var.getFunction().getEntryPoint(), var, index, charOffset); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableNameFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableNameFieldLocation.java index 00fb4e9d85..a89e0a244f 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableNameFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableNameFieldLocation.java @@ -33,10 +33,10 @@ public class VariableNameFieldLocation extends VariableLocation { /** * Construct a new VariableNameFieldLocation object. + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param var the variable the name is for. * @param charOffset the position within the function name string for this location. - * @param the program of the location */ public VariableNameFieldLocation(Program program, Address locationAddr, Variable var, int charOffset) { @@ -49,7 +49,7 @@ public class VariableNameFieldLocation extends VariableLocation { * Construct a new VariableNameFieldLocation object. * Variable function entry point is the assumed listing location (i.e., referent code unit). * Care should be taken if variable corresponds to an EXTERNAL function. - * @param the program of the location + * @param program the program of the location * @param var the variable the name is for. * @param charOffset the position within the function name string for this location. */ diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableTypeFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableTypeFieldLocation.java index 954ba1f182..3d6d4123b5 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableTypeFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableTypeFieldLocation.java @@ -33,10 +33,10 @@ public class VariableTypeFieldLocation extends VariableLocation { /** * Construct a new VariableTypeFieldLocation object. + * @param program the program of the location * @param locationAddr the address of the listing location (i.e., referent code unit) * @param var the variable associated with this type field location. * @param charOffset the position within the function name string for this location. - * @param the program of the location */ public VariableTypeFieldLocation(Program program, Address locationAddr, Variable var, int charOffset) { @@ -49,9 +49,9 @@ public class VariableTypeFieldLocation extends VariableLocation { * Construct a new VariableTypeFieldLocation object. * Variable function entry point is the assumed listing location (i.e., referent code unit). * Care should be taken if variable corresponds to an EXTERNAL function. + * @param program the program of the location * @param var the variable associated with this type field location. * @param charOffset the position within the function name string for this location. - * @param the program of the location */ public VariableTypeFieldLocation(Program program, Variable var, int charOffset) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableXRefFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableXRefFieldLocation.java index d811607697..ae79d7850d 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableXRefFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableXRefFieldLocation.java @@ -30,11 +30,11 @@ public class VariableXRefFieldLocation extends VariableLocation { /** * Construct a new VariableXRefFieldLocation object. + * @param program the program of the location * @param var the variable * @param refAddr the reference address. * @param index the index of the XREF (tells which XREF). * @param charOffset the character position within the XREF. - * @param the program of the location */ public VariableXRefFieldLocation(Program program, Variable var, Address refAddr, int index, int charOffset) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableXRefHeaderFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableXRefHeaderFieldLocation.java index a58e8e0bb4..e8f793f22b 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableXRefHeaderFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableXRefHeaderFieldLocation.java @@ -30,11 +30,10 @@ public class VariableXRefHeaderFieldLocation extends VariableXRefFieldLocation { /** * Creates a variable xref field program location - * @param program the program + * @param program the program of the location * @param var the variable - * @param index the - * @param charOffset - * @param refAddr + * @param charOffset the character offset + * @param refAddr the xref address */ public VariableXRefHeaderFieldLocation(Program program, Variable var, int charOffset, Address refAddr) { diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/XRefFieldLocation.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/XRefFieldLocation.java index 13aaed8c9e..52b1194523 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/XRefFieldLocation.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/XRefFieldLocation.java @@ -29,7 +29,7 @@ public class XRefFieldLocation extends CodeUnitLocation { /** * Construct a new XRefFieldLocation object. * - * @param the program of the location + * @param program the program of the location * @param addr address of the location * appear at more than one group path); may be null * @param componentPath array of indexes for each nested data component; diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/framework/ApplicationIdentifier.java b/Ghidra/Framework/Utility/src/main/java/ghidra/framework/ApplicationIdentifier.java index 2a9453a124..a296c1a75c 100644 --- a/Ghidra/Framework/Utility/src/main/java/ghidra/framework/ApplicationIdentifier.java +++ b/Ghidra/Framework/Utility/src/main/java/ghidra/framework/ApplicationIdentifier.java @@ -26,7 +26,9 @@ package ghidra.framework; * converted to all uppercase. Both will have spaces removed from their names. *

      * Examples: + *

        *
      • ghidra-7.4_DEV + *
      */ public class ApplicationIdentifier { diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/framework/ApplicationVersion.java b/Ghidra/Framework/Utility/src/main/java/ghidra/framework/ApplicationVersion.java index 8de22c4234..51da17df99 100644 --- a/Ghidra/Framework/Utility/src/main/java/ghidra/framework/ApplicationVersion.java +++ b/Ghidra/Framework/Utility/src/main/java/ghidra/framework/ApplicationVersion.java @@ -24,9 +24,11 @@ package ghidra.framework; * part of the version is disregarded in the {@link #compareTo(ApplicationVersion)} method). *

      * Examples: + *

        *
      • 7.4 *
      • 7.4.1 *
      • 7.4.1-BETA + *
      */ public class ApplicationVersion implements Comparable { diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/util/Swing.java b/Ghidra/Framework/Utility/src/main/java/ghidra/util/Swing.java index f76cee51ce..3512de086f 100644 --- a/Ghidra/Framework/Utility/src/main/java/ghidra/util/Swing.java +++ b/Ghidra/Framework/Utility/src/main/java/ghidra/util/Swing.java @@ -138,9 +138,9 @@ public class Swing { *

      Use this method when you are not on the Swing thread and you need to get a value * that is managed/synchronized by the Swing thread. * - *

      +	 * 
      {@literal
       	 * 		String value = runNow(() -> label.getText());
      -	 * 
      + * }
      * * @param s the supplier that will be called on the Swing thread * @return the result of the supplier diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/util/SystemUtilities.java b/Ghidra/Framework/Utility/src/main/java/ghidra/util/SystemUtilities.java index 4bd61e89f1..09b05f67ed 100644 --- a/Ghidra/Framework/Utility/src/main/java/ghidra/util/SystemUtilities.java +++ b/Ghidra/Framework/Utility/src/main/java/ghidra/util/SystemUtilities.java @@ -203,9 +203,9 @@ public class SystemUtilities { * {@link SwingUtilities#invokeAndWait(Runnable)}. Use this method when you need to get * a value while being on the Swing thread. * - *
      +	 * 
      {@literal
       	 * 		String value = runSwingNow(() -> label.getText());
      -	 * 
      + * }
      * * @param s the supplier that will be called on the Swing thread * @return the result of the supplier diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/util/exception/AssertException.java b/Ghidra/Framework/Utility/src/main/java/ghidra/util/exception/AssertException.java index 15fdbbdd0f..14d67e7b9d 100644 --- a/Ghidra/Framework/Utility/src/main/java/ghidra/util/exception/AssertException.java +++ b/Ghidra/Framework/Utility/src/main/java/ghidra/util/exception/AssertException.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: YES * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,8 +49,8 @@ public class AssertException extends RuntimeException { /** * Create a new AssertException with the given message. * - * @param msg the exception message. - * @param t the Throwable which caused this exception to be generated. + * @param message the exception message. + * @param throwable the Throwable which caused this exception to be generated. */ public AssertException( String message, Throwable throwable ) { super( message, throwable ); diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/util/task/TaskMonitor.java b/Ghidra/Framework/Utility/src/main/java/ghidra/util/task/TaskMonitor.java index 7cd613b04b..3f7ce33899 100644 --- a/Ghidra/Framework/Utility/src/main/java/ghidra/util/task/TaskMonitor.java +++ b/Ghidra/Framework/Utility/src/main/java/ghidra/util/task/TaskMonitor.java @@ -80,7 +80,7 @@ public interface TaskMonitor { * Set the progress maximum value *

      * Note: setting this value will reset the progress to be the max if the progress is currently - * greater than the new new max value. + * greater than the new new max value. * @param max maximum value for progress */ public void setMaximum(long max); diff --git a/Ghidra/Framework/Utility/src/main/java/utilities/util/FileUtilities.java b/Ghidra/Framework/Utility/src/main/java/utilities/util/FileUtilities.java index 4a3de8e410..0d843a2176 100644 --- a/Ghidra/Framework/Utility/src/main/java/utilities/util/FileUtilities.java +++ b/Ghidra/Framework/Utility/src/main/java/utilities/util/FileUtilities.java @@ -353,7 +353,7 @@ public final class FileUtilities { *

      * Throws an {@link IOException} if there is any problem while creating the directory. *

      - * Does not create any missing parent directories. See {@link #checkMkdirs(File)} instead. + * Does not create any missing parent directories. See {@link #checkedMkdirs(File)} instead. *

      * Takes into account race conditions with external threads/processes * creating the same directory at the same time. @@ -499,7 +499,10 @@ public final class FileUtilities { * * @param originalDir The directory from which to extract contents * @param copyDir The directory in which the extracted contents will be placed - * @param fileFilte a filter to apply against the directory's contents + * @param filter a filter to apply against the directory's contents + * @param monitor the task monitor + * @throws IOException if there was a problem accessing the files + * @throws CancelledException if the copy is cancelled */ public final static int copyDir(File originalDir, File copyDir, FileFilter filter, TaskMonitor monitor) throws IOException, CancelledException { @@ -608,7 +611,7 @@ public final class FileUtilities { /** * Copy the contents of the specified fromFile to the out stream. * @param fromFile file data source - * @param toFile destination stream + * @param out destination stream * @param monitor if specified the progress will be reset and will advance to * 100% when the copy is complete. * @throws IOException thrown if there was a problem accessing the files @@ -714,9 +717,9 @@ public final class FileUtilities { *

      * The file is treated as UTF-8 encoded. *

      - * @param is the input stream from which to read + * @param url the input stream from which to read * @return a list of file lines - * @throws IOException + * @throws IOException thrown if there was a problem accessing the files */ public static List getLines(URL url) throws IOException { @@ -1039,8 +1042,8 @@ public final class FileUtilities { * no case sensitivity checks are done and the original specified File param is returned * unchanged. *

      - * (Put another way: symlink "FILE1" -> "../path/file2", no case sensitive enforcing can be done, - * but symlink "FILE1" -> "../path/file1" will be enforced by this method.) + * (Put another way: symlink "FILE1" -> "../path/file2", no case sensitive enforcing can be done, + * but symlink "FILE1" -> "../path/file1" will be enforced by this method.) *

      * Querying a filepath that does not exist will result in a 'success' and the caller will * receive the non-existent File instance back. diff --git a/Ghidra/Framework/Utility/src/main/java/utilities/util/reflection/ReflectionUtilities.java b/Ghidra/Framework/Utility/src/main/java/utilities/util/reflection/ReflectionUtilities.java index b8c42ff9fa..8cac1b2d38 100644 --- a/Ghidra/Framework/Utility/src/main/java/utilities/util/reflection/ReflectionUtilities.java +++ b/Ghidra/Framework/Utility/src/main/java/utilities/util/reflection/ReflectionUtilities.java @@ -296,7 +296,7 @@ public class ReflectionUtilities { /** * Uses the given patterns to remove elements from the given stack trace. * The current implementation will simply perform a toString() on each element and - * then check to see if that string contains any of the patterns. + * then check to see if that string contains any of the patterns. * * @param trace the trace to filter * @param patterns the non-regex patterns used to perform a diff --git a/Ghidra/Framework/Utility/src/main/java/utility/function/ExceptionalCallback.java b/Ghidra/Framework/Utility/src/main/java/utility/function/ExceptionalCallback.java index d7325ba417..91eeea1ee8 100644 --- a/Ghidra/Framework/Utility/src/main/java/utility/function/ExceptionalCallback.java +++ b/Ghidra/Framework/Utility/src/main/java/utility/function/ExceptionalCallback.java @@ -27,7 +27,7 @@ public interface ExceptionalCallback { /** * The method that will be called * - * @throws Exception if the call throws an exception + * @throws E if the call throws an exception */ public void call() throws E; } diff --git a/gradle/root/distribution.gradle b/gradle/root/distribution.gradle index e52859d5b8..d13c9f0f71 100644 --- a/gradle/root/distribution.gradle +++ b/gradle/root/distribution.gradle @@ -56,8 +56,10 @@ task createJavadocs(type: Javadoc, description: 'Generate javadocs for all proje classpath = rootProject.ext.ghidraPath // If we don't exclude module directories, the javascript search feature doesn't work - options.addBooleanOption("-no-module-directories", true) - + if (JavaVersion.current().isJava11()) { + options.addBooleanOption("-no-module-directories", true) + } + // Some internal packages are not public and need to be exported. options.addMultilineStringsOption("-add-exports").setValue(["java.desktop/sun.awt.image=ALL-UNNAMED", "java.desktop/sun.awt=ALL-UNNAMED", @@ -108,6 +110,10 @@ task createJsondocs(type: Javadoc, description: 'Generate JSON docs for all proj // Generate at package level because user may try to get help directly on an object they have // rather than its public interface. options.addBooleanOption("package", true) + + // Newer versions of gradle set this to true by default. + // The JsonDoclet doesn't have the -notimestamp option so ensure it isn't set. + options.setNoTimestamp(false) // Some internal packages are not public and need to be exported. options.addMultilineStringsOption("-add-exports").setValue(["java.desktop/sun.awt.image=ALL-UNNAMED",

      NumberRadixDEFAULT Mode AliasUNSIGNED Mode ValueSIGNED Mode Value
       
      1002UNSIGNED1100100b1100100b