diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectTree.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectTree.java index 0c60220433..2a16c96e7f 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectTree.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectTree.java @@ -90,7 +90,7 @@ public class ObjectTree implements ObjectPane { if (selectionPaths != null && selectionPaths.length > 0) { TreePath currentPath = currentSelectionPaths[0]; TreePath selectedPath = selectionPaths[0]; - // NB. isDescendant == has a descendent + // NB. isDescendant == has a descendant if (selectedPath.isDescendant(currentPath)) { return; } diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java index c2afd37fc3..2865e61965 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/vars/VariableValueUtils.java @@ -556,7 +556,7 @@ public enum VariableValueUtils { } /** - * Find the descendent that dereferences this given varnode + * Find the descendant that dereferences this given varnode * *

* This searches only one hop for a {@link PcodeOp#LOAD} or {@link PcodeOp#STORE}. If it find a diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIClassRecoverer.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIClassRecoverer.java index 0989b189a9..36951b00cf 100644 --- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIClassRecoverer.java +++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIClassRecoverer.java @@ -203,7 +203,7 @@ public class RTTIClassRecoverer extends RecoveredClassHelper { * @throws CancelledException if cancelled * @throws InvalidInputException if issues setting function return * @throws DuplicateNameException if try to create same symbol name already in namespace - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace */ public void figureOutClassDataMembers(List recoveredClasses) throws CancelledException, DuplicateNameException, InvalidInputException, diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIWindowsClassRecoverer.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIWindowsClassRecoverer.java index 0720dd7e58..5d40c04b3c 100644 --- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIWindowsClassRecoverer.java +++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIWindowsClassRecoverer.java @@ -2009,16 +2009,16 @@ public class RTTIWindowsClassRecoverer extends RTTIClassRecoverer { for (RecoveredClass ancestor : ancestors) { monitor.checkCancelled(); - List decendentList = ancestorToCommonChild.get(ancestor); - if (decendentList == null) { - List newDecendentList = new ArrayList(); - newDecendentList.add(parentClass); - ancestorToCommonChild.put(ancestor, newDecendentList); + List descendantList = ancestorToCommonChild.get(ancestor); + if (descendantList == null) { + List newDescendantList = new ArrayList(); + newDescendantList.add(parentClass); + ancestorToCommonChild.put(ancestor, newDescendantList); } else { - if (!decendentList.contains(parentClass)) { - decendentList.add(parentClass); - ancestorToCommonChild.replace(ancestor, decendentList); + if (!descendantList.contains(parentClass)) { + descendantList.add(parentClass); + ancestorToCommonChild.replace(ancestor, descendantList); } } } diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java index d3fdf6194a..ba0ee5fbcf 100644 --- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java +++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java @@ -1040,7 +1040,7 @@ public class RecoveredClassHelper { * @throws CancelledException if cancelled * @throws DuplicateNameException if try to create same symbol name already in namespace * @throws InvalidInputException if issues setting return type - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace */ public void gatherClassMemberDataInfoForFunction(RecoveredClass recoveredClass, Function function) throws CancelledException, DuplicateNameException, @@ -1256,7 +1256,7 @@ public class RecoveredClassHelper { * @throws CancelledException if cancelled * @throws DuplicateNameException if try to create same symbol name already in namespace * @throws InvalidInputException if issue making function thiscall - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace */ private void temporarilyReplaceEmptyStructures(Function function, Namespace classNamespace) throws CancelledException, DuplicateNameException, InvalidInputException, @@ -1823,7 +1823,7 @@ public class RecoveredClassHelper { * @throws CancelledException if cancelled * @throws InvalidInputException if issue setting return type * @throws DuplicateNameException if try to create same symbol name already in namespace - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace */ public boolean processConstructorsAndDestructorsUsingParent(RecoveredClass recoveredClass, RecoveredClass parentClass) throws CancelledException, InvalidInputException, @@ -1965,7 +1965,7 @@ public class RecoveredClassHelper { * @throws CancelledException if cancelled * @throws InvalidInputException if error setting return type * @throws DuplicateNameException if try to create same symbol name already in namespace - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace */ public void addConstructorToClass(RecoveredClass recoveredClass, Function constructorFunction) throws CancelledException, InvalidInputException, DuplicateNameException, @@ -2090,7 +2090,7 @@ public class RecoveredClassHelper { * @throws CancelledException if cancelled * @throws InvalidInputException if error setting return type * @throws DuplicateNameException if try to create same symbol name already in namespace - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace */ public void createListedConstructorFunctions(Map referenceToClassMap, List

referencesToConstructors) throws CancelledException, @@ -2124,7 +2124,7 @@ public class RecoveredClassHelper { * @throws CancelledException if cancelled * @throws InvalidInputException if issue setting return type * @throws DuplicateNameException if try to create same symbol name already in namespace - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace */ public void processInlineConstructor(RecoveredClass recoveredClass, @@ -2542,7 +2542,7 @@ public class RecoveredClassHelper { /** * Method to use existing pdb names to assign class constructors and destructors * @param recoveredClasses List of classes - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace * @throws DuplicateNameException if try to create same symbol name already in namespace * @throws InvalidInputException if error setting return type * @throws CancelledException if cancelled @@ -3480,7 +3480,7 @@ public class RecoveredClassHelper { * @param address the given address * @param name the name to give the new symbol * @param namespace the namespace to put the new symbol in - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace * @throws InvalidInputException if issues setting return type * @throws DuplicateNameException if try to create same symbol name already in namespace * @throws CancelledException if cancelled @@ -3563,7 +3563,7 @@ public class RecoveredClassHelper { * @param namespace the namespace to put the new symbol in * @param setPrimary if true, set the new symbol primary, if false do not make the new symbol primary * @param removeBadFID if true, check for and remove any incorrect FID symbols, if false leave them there - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace * @throws InvalidInputException if issues setting return type * @throws DuplicateNameException if try to create same symbol name already in namespace * @throws CancelledException if cancelled @@ -3640,7 +3640,7 @@ public class RecoveredClassHelper { * @param name the given name * @param function the given function * @throws CancelledException if cancelled - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace * @throws DuplicateNameException if try to create same symbol name already in namespace * @throws InvalidInputException if issues setting return type */ @@ -3728,7 +3728,7 @@ public class RecoveredClassHelper { * @throws CancelledException if cancelled * @throws InvalidInputException if error setting return type * @throws DuplicateNameException if try to create same symbol name already in namespace - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace */ private void findAndRemoveBadStructuresFromFunction(Function function, Namespace namespace) throws CancelledException, InvalidInputException, DuplicateNameException, @@ -3765,7 +3765,7 @@ public class RecoveredClassHelper { * @throws CancelledException if cancelled * @throws DuplicateNameException if try to create same symbol name already in namespace * @throws InvalidInputException if invalid data input - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace */ private void fixBadSignatures(Function function, List badStructureDataTypes) throws CancelledException, InvalidInputException, DuplicateNameException, @@ -3842,7 +3842,7 @@ public class RecoveredClassHelper { * @throws CancelledException if cancelled * @throws DuplicateNameException if try to create same symbol name already in namespace * @throws InvalidInputException if invalid data input - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace */ private void removeBadParameterDataTypes(Function function, List badStructureDataTypes) throws CancelledException, @@ -4694,7 +4694,7 @@ public class RecoveredClassHelper { * @throws CancelledException if cancelled * @throws InvalidInputException if issues setting return type * @throws DuplicateNameException if try to create same symbol name already in namespace - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace */ private void nameVfunctions(RecoveredClass recoveredClass, Address vftableAddress, String vftableStructureName) throws CancelledException, InvalidInputException, @@ -6078,7 +6078,7 @@ public class RecoveredClassHelper { * determine, using vftable order, which class contains the constructor/destructor and which * contains the inlined constructor/destructor. * @param recoveredClasses List of classes - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace * @throws DuplicateNameException if try to create same symbol name already in namespace * @throws InvalidInputException if error setting return type * @throws CancelledException when cancelled and others @@ -6258,7 +6258,7 @@ public class RecoveredClassHelper { * @throws CancelledException if cancelled * @throws InvalidInputException if issues setting return type * @throws DuplicateNameException if try to create same symbol name already in namespace - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace */ public void processRemainingIndeterminateConstructorsAndDestructors( List recoveredClasses) throws CancelledException, InvalidInputException, @@ -6561,7 +6561,7 @@ public class RecoveredClassHelper { * @throws CancelledException if cancelled * @throws InvalidInputException if issues setting return type * @throws DuplicateNameException if try to create same symbol name already in namespace - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace */ public void processRegularConstructorsAndDestructorsUsingCallOrder( List recoveredClasses) throws CancelledException, InvalidInputException, @@ -6592,7 +6592,7 @@ public class RecoveredClassHelper { * indeterminate functions are constructors or destructors. * @param recoveredClasses List of class objects * @throws CancelledException if cancelled - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace * @throws DuplicateNameException if try to create same symbol name already in namespace * @throws InvalidInputException if error setting return type */ @@ -6661,7 +6661,7 @@ public class RecoveredClassHelper { * descendant regular list. * @param recoveredClasses list of classes * @throws CancelledException if cancelled - * @throws CircularDependencyException if parent namespace is descendent of given namespace + * @throws CircularDependencyException if parent namespace is descendant of given namespace * @throws DuplicateNameException if try to create same symbol name already in namespace * @throws InvalidInputException if error setting return type */ diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc index bfca3d6ee5..d646f5d128 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/ruleaction.cc @@ -6303,7 +6303,7 @@ int4 RulePtrArith::evaluatePointerExpression(PcodeOp *op,int4 slot) return 0; if (count > 1) { if (outVn->isSpacebase()) - return 0; // For the RESULT to be a spacebase pointer it must have only 1 descendent + return 0; // For the RESULT to be a spacebase pointer it must have only 1 descendant // res = 2; // Uncommenting this line will not let pointers get pushed to multiple descendants } return res; diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/subflow.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/subflow.cc index bcdccecfca..14a6a8acbd 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/subflow.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/subflow.cc @@ -2795,7 +2795,7 @@ TransformVar *SubfloatFlow::setReplacement(Varnode *vn) /// \brief Try to trace logical variable through descendant Varnodes /// -/// Given a Varnode placeholder, look at all descendent PcodeOps and create +/// Given a Varnode placeholder, look at all descendant PcodeOps and create /// placeholders for the op and its output Varnode. If appropriate add the /// output placeholder to the worklist. /// \param rvn is the given Varnode placeholder diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/store/RepositoryFolder.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/store/RepositoryFolder.java index c9d8a5b707..375080e2a5 100644 --- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/store/RepositoryFolder.java +++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/store/RepositoryFolder.java @@ -313,7 +313,7 @@ public class RepositoryFolder { /** * Returns true if any file/item contained within this folder - * or its descendents is checked-out. + * or its descendants is checked-out. */ private boolean containsCheckout() throws IOException { @@ -376,8 +376,8 @@ public class RepositoryFolder { if (parent == null) { throw new IOException("Root folder may not be moved"); } - if (newParent.isDescendentOf(this)) { - throw new IOException("New folder must not be decendent"); + if (newParent.isDescendantOf(this)) { + throw new IOException("New folder must not be descendant"); } if (containsCheckout()) { throw new FileInUseException( @@ -426,9 +426,9 @@ public class RepositoryFolder { } /** - * Returns true if this folder is a descendent of the specified folder + * Returns true if this folder is a descendant of the specified folder */ - private boolean isDescendentOf(RepositoryFolder folder) { + private boolean isDescendantOf(RepositoryFolder folder) { RepositoryFolder rf = parent; while (rf != null) { if (rf == folder) { diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DockingUtils.java b/Ghidra/Framework/Docking/src/main/java/docking/DockingUtils.java index 40069ff3e3..98b8e09536 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/DockingUtils.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/DockingUtils.java @@ -299,7 +299,7 @@ public class DockingUtils { } /** - * Perform some operation on a component and all of its descendents, recursively. + * Perform some operation on a component and all of its descendants, recursively. * * This applies the operation to all components in the tree, children first. * diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/CoreGTreeNode.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/CoreGTreeNode.java index 72905d7150..43685be554 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/CoreGTreeNode.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/CoreGTreeNode.java @@ -32,7 +32,7 @@ import ghidra.util.SystemUtilities; * that this will allow direct thread-safe access to the children without having to worry about * {@link ConcurrentModificationException}s while iterating the children. Also, the assumption * is that accessing the children will occur much more frequently than modifying the children. - * This should only be a problem if a direct descendent of GTreeNode creates its children by calling + * This should only be a problem if a direct descendant of GTreeNode creates its children by calling * addNode many times. But in that case, the tree should be using Lazy or * SlowLoading nodes which always load into another list first and all the children will be set * on a node in a single operation. 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 1d3e5b10b2..87ecb91aab 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 @@ -223,7 +223,7 @@ public interface FileSystem { * @param newParentPath path to where the folder is to be moved. * @throws FileNotFoundException if the moved folder does not exist. * @throws DuplicateFileException if folder with the same name exists within the new parent folder - * @throws FileInUseException if any file within this folder or its decendents are in-use or checked-out + * @throws FileInUseException if any file within this folder or its descendants are in-use or checked-out * @throws IOException if an IO error occurs. * @throws InvalidNameException if the new FolderPath contains an illegal file name. * @throws IllegalArgumentException if new Parent is invalid. @@ -238,7 +238,7 @@ public interface FileSystem { * @param newFolderName the name the folder to be renamed to. * @throws FileNotFoundException if the folder to be renamed does not exist. * @throws DuplicateFileException if folder with the new name already exists. - * @throws FileInUseException if any file within this folder or its decendents are in-use or checked-out + * @throws FileInUseException if any file within this folder or its descendants are in-use or checked-out * @throws IOException if an IO error occurs. * @throws InvalidNameException if the new FolderName contains an illegal file name. */ diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/projectdata/actions/ProjectDataPasteAction.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/projectdata/actions/ProjectDataPasteAction.java index 253a2bbc8a..009357571e 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/projectdata/actions/ProjectDataPasteAction.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/projectdata/actions/ProjectDataPasteAction.java @@ -133,7 +133,7 @@ public class ProjectDataPasteAction extends ProjectDataCopyCutBaseAction { return; } - boolean listChanged = removeDecendantsFromList(list); + boolean listChanged = removeDescendantsFromList(list); boolean resetClipboard = false; StringBuffer sb = new StringBuffer(); @@ -188,7 +188,7 @@ public class ProjectDataPasteAction extends ProjectDataCopyCutBaseAction { * Remove descendant nodes from the list; having the parent node * is enough when folders are getting pasted. */ - private boolean removeDecendantsFromList(List list) { + private boolean removeDescendantsFromList(List list) { List newList = new ArrayList<>(); for (int i = 0; i < list.size(); i++) { GTreeNode destNode = list.get(i); diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/DecisionNode.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/DecisionNode.java index a4445a5e09..2a22643055 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/DecisionNode.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/DecisionNode.java @@ -107,7 +107,7 @@ public class DecisionNode { (startbit + bitsize - 1) + "), value=0x" + Integer.toHexString(val) + ", context="); debug.append(walker.getParserContext().getContextBytes(), startbit, bitsize); debug.append("\n"); - debugDumpDecendentConstructors(debug, children[val]); + debugDumpDescendantConstructors(debug, children[val]); } private void debugInstructionBitsDecision(SleighDebugLogger debug, ParserWalker walker, @@ -135,15 +135,15 @@ public class DecisionNode { (startbit + bitsize - 1) + "), value=0x" + Integer.toHexString(val) + ", bytes="); debug.append(bytes, (offset * 8) + startbit, bitsize); debug.append("\n"); - debugDumpDecendentConstructors(debug, children[val]); + debugDumpDescendantConstructors(debug, children[val]); } - private void debugDumpDecendentConstructors(SleighDebugLogger debug, DecisionNode child) { + private void debugDumpDescendantConstructors(SleighDebugLogger debug, DecisionNode child) { debug.indent(); debug.append( - "decendent constructors for decision node (complete tree dump ordered by line number):\n"); + "descendant constructors for decision node (complete tree dump ordered by line number):\n"); List clist = new ArrayList<>(); - child.dumpDecendentConstructors(clist); + child.dumpDescendantConstructors(clist); for (Constructor c : clist) { debug.dumpConstructor(null, c); } @@ -158,7 +158,7 @@ public class DecisionNode { } }; - private void dumpDecendentConstructors(List clist) { + private void dumpDescendantConstructors(List clist) { if (bitsize == 0) { // The node is terminal for (Constructor c : constructlist) { int index = Collections.binarySearch(clist, c, debugInstructionComparator); @@ -171,7 +171,7 @@ public class DecisionNode { } else { for (DecisionNode child : children) { - child.dumpDecendentConstructors(clist); + child.dumpDescendantConstructors(clist); } } } diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/module/ModuleManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/module/ModuleManager.java index 24c7e9bf3b..2f9a7024c5 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/module/ModuleManager.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/module/ModuleManager.java @@ -522,9 +522,9 @@ class ModuleManager { } /** - * Perform recursive check to determine if specified id is a child or decendant + * Perform recursive check to determine if specified id is a child or descendant * of the specified module. - * @param id descendent child id (positive for module, negative for fragment) + * @param id descendant child id (positive for module, negative for fragment) * @param moduleID module id (positive) * @return true if specified id is a descendant of moduleID. * @throws IOException if database IO error occurs diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Namespace.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Namespace.java index 678480c8b6..592ec964e8 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Namespace.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/symbol/Namespace.java @@ -110,7 +110,7 @@ public interface Namespace { * this namespace. * @throws DuplicateNameException if another symbol exists in the parent namespace with * the same name as this namespace - * @throws CircularDependencyException if the parent namespace is a descendent of this + * @throws CircularDependencyException if the parent namespace is a descendant of this * namespace. */ public void setParentNamespace(Namespace parentNamespace) diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/GroupPath.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/GroupPath.java index 92044bdc77..792e545065 100644 --- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/GroupPath.java +++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/GroupPath.java @@ -152,7 +152,7 @@ public class GroupPath implements Serializable { } /** - * Return true if the indicated group path is a descendent of this group path. + * Return true if the indicated group path is a descendant of this group path. * @param grpPath the group path */ public boolean isDescendant(GroupPath grpPath) {