GT-2971 - Key Bindings - Added the ability to set a key binding for the

close button for all Component Providers

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/FindPossibleReferencesPlugin.java

@@ -22,6 +22,7 @@ import docking.ActionContext;
 import docking.ComponentProvider;
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.context.*;
 import ghidra.app.events.ProgramClosedPluginEvent;
@@ -33,7 +34,6 @@ import ghidra.app.util.HelpTopics;
 import ghidra.app.util.query.TableService;
 import ghidra.framework.plugintool.*;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.*;
 import ghidra.program.model.listing.CodeUnit;
 import ghidra.program.model.listing.Program;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/archive/ArchivePlugin.java

@@ -25,6 +25,7 @@ import java.util.zip.ZipEntry;
 import docking.ActionContext;
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.framework.main.*;
 import ghidra.framework.model.*;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/blockmodel/BlockModelServicePlugin.java

@@ -15,6 +15,12 @@
  */
 package ghidra.app.plugin.core.blockmodel;
 
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.TreeMap;
+
+import docking.options.editor.StringWithChoicesEditor;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.plugin.PluginCategoryNames;
 import ghidra.app.plugin.ProgramPlugin;
@@ -31,12 +37,6 @@ import ghidra.util.datastruct.WeakDataStructureFactory;
 import ghidra.util.datastruct.WeakSet;
 import ghidra.util.exception.NotFoundException;
 
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.TreeMap;
-
-import docking.options.editor.StringWithChoicesEditor;
-
 /** 
  * Provides a service for tracking the selected basic/subroutine block models for a tool.
  * Methods are provided for obtaining an instance of the active or arbitrary block model.
@@ -64,9 +64,9 @@ public class BlockModelServicePlugin extends ProgramPlugin
 	private static final String SUB_OPTION = "Subroutine Block Model";
 
 	private TreeMap<String, BlockModelInfo> basicModelsByName =
-		new TreeMap<String, BlockModelInfo>();
+		new TreeMap<>();
 	private TreeMap<String, BlockModelInfo> subroutineModelsByName =
-		new TreeMap<String, BlockModelInfo>();
+		new TreeMap<>();
 	private BlockModelInfo activeBasicModel;
 	private BlockModelInfo activeSubroutineModel;
 
@@ -103,9 +103,8 @@ public class BlockModelServicePlugin extends ProgramPlugin
 		info =
 			new BlockModelInfo(OverlapCodeSubModel.OVERLAP_MODEL_NAME, OverlapCodeSubModel.class);
 		subroutineModelsByName.put(OverlapCodeSubModel.OVERLAP_MODEL_NAME, info);
-		info =
-			new BlockModelInfo(IsolatedEntrySubModel.ISOLATED_MODEL_NAME,
-				IsolatedEntrySubModel.class);
+		info = new BlockModelInfo(IsolatedEntrySubModel.ISOLATED_MODEL_NAME,
+			IsolatedEntrySubModel.class);
 		subroutineModelsByName.put(IsolatedEntrySubModel.ISOLATED_MODEL_NAME, info);
 		info =
 			new BlockModelInfo(OverlapCodeSubModel.OVERLAP_MODEL_NAME, PartitionCodeSubModel.class);
@@ -115,7 +114,7 @@ public class BlockModelServicePlugin extends ProgramPlugin
 		selectedSubroutineModelName = availableModelNames[0];
 
 		// Install model selection option in Tool panel
-		options = tool.getOptions("Tool");
+		options = tool.getOptions(ToolConstants.TOOL_OPTIONS);
 		editor = new StringWithChoicesEditor(availableModelNames);
 		options.registerOption(SUB_OPTION, OptionType.STRING_TYPE, selectedSubroutineModelName,
 			null, "The default subroutine model used when creating call graphs.", editor);
@@ -426,7 +425,7 @@ public class BlockModelServicePlugin extends ProgramPlugin
 		String defaultModelName =
 			(modelType == BASIC_MODEL) ? DEFAULT_BLOCK_MODEL_NAME : DEFAULT_SUBROUTINE_MODEL_NAME;
 
-		ArrayList<String> list = new ArrayList<String>();
+		ArrayList<String> list = new ArrayList<>();
 		for (String modelName : models.keySet()) {
 			if (modelName.equals(defaultModelName)) {
 				list.add(0, modelName);

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/checksums/ComputeChecksumsPlugin.java

@@ -18,13 +18,13 @@ package ghidra.app.plugin.core.checksums;
 import docking.ActionContext;
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.plugin.PluginCategoryNames;
 import ghidra.app.plugin.ProgramPlugin;
 import ghidra.framework.plugintool.PluginInfo;
 import ghidra.framework.plugintool.PluginTool;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.listing.Program;
 import ghidra.program.util.ProgramSelection;
 import ghidra.util.HelpLocation;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clear/ClearPlugin.java

@@ -19,6 +19,7 @@ import java.awt.event.KeyEvent;
 
 import docking.ActionContext;
 import docking.action.*;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.context.ListingActionContext;
 import ghidra.app.context.ListingContextAction;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/CodeBrowserPlugin.java

@@ -32,6 +32,7 @@ import org.jdom.Element;
 import docking.ActionContext;
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import docking.widgets.fieldpanel.*;
 import docking.widgets.fieldpanel.field.Field;
 import docking.widgets.fieldpanel.support.*;
@@ -57,7 +58,6 @@ import ghidra.framework.model.*;
 import ghidra.framework.options.*;
 import ghidra.framework.plugintool.*;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.*;
 import ghidra.program.model.listing.*;
 import ghidra.program.util.ProgramLocation;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/actions/ClearSelectionAction.java

@@ -17,9 +17,9 @@ package ghidra.app.plugin.core.codebrowser.actions;
 
 import docking.ActionContext;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import ghidra.app.plugin.core.codebrowser.CodeViewerProvider;
 import ghidra.app.util.HelpTopics;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.util.ProgramSelection;
 import ghidra.util.HelpLocation;
 

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/actions/GotoNextFunctionAction.java

@@ -22,12 +22,12 @@ import javax.swing.KeyStroke;
 
 import docking.action.KeyBindingData;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import ghidra.app.nav.Navigatable;
 import ghidra.app.plugin.core.codebrowser.CodeViewerActionContext;
 import ghidra.app.services.GoToService;
 import ghidra.app.util.HelpTopics;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.listing.*;
 import ghidra.program.util.FunctionSignatureFieldLocation;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/actions/GotoPreviousFunctionAction.java

@@ -22,12 +22,12 @@ import javax.swing.KeyStroke;
 
 import docking.action.KeyBindingData;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import ghidra.app.nav.Navigatable;
 import ghidra.app.plugin.core.codebrowser.CodeViewerActionContext;
 import ghidra.app.services.GoToService;
 import ghidra.app.util.HelpTopics;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.listing.*;
 import ghidra.program.util.FunctionSignatureFieldLocation;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/actions/SelectAllAction.java

@@ -17,7 +17,6 @@ package ghidra.app.plugin.core.codebrowser.actions;
 
 import ghidra.app.plugin.core.codebrowser.CodeViewerProvider;
 import ghidra.app.util.HelpTopics;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.util.HelpLocation;
 
 import java.awt.event.InputEvent;
@@ -26,6 +25,7 @@ import java.awt.event.KeyEvent;
 import docking.ActionContext;
 import docking.action.KeyBindingData;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 
 /**
  * Action for adding all fields to the current format.

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/actions/SelectComplementAction.java

@@ -17,11 +17,11 @@ package ghidra.app.plugin.core.codebrowser.actions;
 import ghidra.app.plugin.core.codebrowser.CodeViewerActionContext;
 import ghidra.app.plugin.core.codebrowser.CodeViewerProvider;
 import ghidra.app.util.HelpTopics;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.util.ProgramSelection;
 import ghidra.util.HelpLocation;
 import docking.ActionContext;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 
 /**
  * Action for changing the selection to the complement of all the currently 

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/colorizer/NextColorRangeAction.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,10 +20,10 @@ import ghidra.app.nav.NextRangeAction;
 import ghidra.app.plugin.PluginCategoryNames;
 import ghidra.app.plugin.core.navigation.NavigationOptions;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.util.ProgramSelection;
 import ghidra.util.HelpLocation;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 
 public class NextColorRangeAction extends NextRangeAction {
 

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/colorizer/PreviousColorRangeAction.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,10 +20,10 @@ import ghidra.app.nav.PreviousRangeAction;
 import ghidra.app.plugin.PluginCategoryNames;
 import ghidra.app.plugin.core.navigation.NavigationOptions;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.util.ProgramSelection;
 import ghidra.util.HelpLocation;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 
 public class PreviousColorRangeAction extends PreviousRangeAction {
 

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/cparser/CParserPlugin.java

@@ -24,6 +24,7 @@ import javax.swing.SwingUtilities;
 import docking.ActionContext;
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import docking.widgets.OptionDialog;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.plugin.PluginCategoryNames;
@@ -37,7 +38,6 @@ import ghidra.framework.options.SaveState;
 import ghidra.framework.plugintool.PluginInfo;
 import ghidra.framework.plugintool.PluginTool;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.database.data.ProgramDataTypeManager;
 import ghidra.program.model.data.*;
 import ghidra.program.model.listing.Program;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerPlugin.java

@@ -18,6 +18,7 @@ package ghidra.app.plugin.core.disassembler;
 import docking.ActionContext;
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import docking.widgets.table.GTable;
 import docking.widgets.table.threaded.ThreadedTableModelListener;
 import ghidra.app.CorePluginPackage;
@@ -32,7 +33,6 @@ import ghidra.framework.model.*;
 import ghidra.framework.plugintool.PluginInfo;
 import ghidra.framework.plugintool.PluginTool;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.address.AddressSetView;
 import ghidra.program.model.lang.RegisterValue;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/help/AboutProgramPlugin.java

@@ -20,6 +20,7 @@ import java.util.Map;
 import docking.ActionContext;
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.context.ProgramActionContext;
 import ghidra.app.context.ProgramContextAction;
@@ -33,7 +34,6 @@ import ghidra.framework.main.datatable.ProjectDataContextAction;
 import ghidra.framework.model.DomainFile;
 import ghidra.framework.plugintool.*;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.listing.Program;
 import ghidra.util.HelpLocation;
 

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/help/ProcessorListPlugin.java

@@ -27,6 +27,7 @@ import docking.action.DockingAction;
 import docking.action.MenuData;
 import docking.dnd.GClipboard;
 import docking.dnd.StringTransferable;
+import docking.tool.ToolConstants;
 import docking.widgets.table.AbstractSortedTableModel;
 import docking.widgets.table.GTable;
 import ghidra.app.CorePluginPackage;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/highlight/SetHighlightPlugin.java

@@ -19,6 +19,7 @@ import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 
 import docking.action.*;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.context.NavigatableActionContext;
 import ghidra.app.context.NavigatableContextAction;
@@ -28,7 +29,6 @@ import ghidra.app.plugin.PluginCategoryNames;
 import ghidra.app.services.GoToService;
 import ghidra.framework.plugintool.*;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.util.InteriorSelection;
 import ghidra.program.util.ProgramSelection;
 

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/instructionsearch/InstructionSearchPlugin.java

@@ -21,6 +21,7 @@ import java.util.Set;
 
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.context.*;
 import ghidra.app.plugin.PluginCategoryNames;
@@ -31,7 +32,6 @@ import ghidra.app.util.query.TableService;
 import ghidra.framework.plugintool.PluginInfo;
 import ghidra.framework.plugintool.PluginTool;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.*;
 import ghidra.program.model.listing.*;
 import ghidra.program.model.mem.MemoryBlock;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/label/AllHistoryAction.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.
@@ -19,12 +18,12 @@ package ghidra.app.plugin.core.label;
 import ghidra.app.context.ListingActionContext;
 import ghidra.app.context.ListingContextAction;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 
 import java.awt.event.KeyEvent;
 
 import docking.action.KeyBindingData;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 
 public class AllHistoryAction extends ListingContextAction {
 

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/AbstractNextPreviousAction.java

@@ -18,6 +18,7 @@ package ghidra.app.plugin.core.navigation;
 import javax.swing.*;
 
 import docking.action.*;
+import docking.tool.ToolConstants;
 import ghidra.app.context.ListingActionContext;
 import ghidra.app.nav.Navigatable;
 import ghidra.app.plugin.core.codebrowser.CodeViewerActionContext;
@@ -25,7 +26,6 @@ import ghidra.app.plugin.core.codebrowser.actions.CodeViewerContextAction;
 import ghidra.app.services.GoToService;
 import ghidra.app.util.HelpTopics;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.listing.Program;
 import ghidra.program.util.AddressFieldLocation;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/GoToAddressLabelPlugin.java

@@ -18,6 +18,7 @@ package ghidra.app.plugin.core.navigation;
 import java.awt.event.KeyEvent;
 
 import docking.action.*;
+import docking.tool.ToolConstants;
 import ghidra.GhidraOptions;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.context.NavigatableActionContext;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NavigationHistoryPlugin.java

@@ -19,6 +19,7 @@ import java.util.*;
 
 import org.jdom.Element;
 
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.events.ProgramClosedPluginEvent;
 import ghidra.app.nav.*;
@@ -27,7 +28,6 @@ import ghidra.app.services.*;
 import ghidra.framework.options.*;
 import ghidra.framework.plugintool.*;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.listing.Program;
 import ghidra.util.Msg;
 import ghidra.util.bean.opteditor.OptionsVetoException;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextHighlightedRangeAction.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,6 @@ import ghidra.app.nav.NextRangeAction;
 import ghidra.app.plugin.PluginCategoryNames;
 import ghidra.app.util.HelpTopics;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.util.ProgramSelection;
 import ghidra.util.HelpLocation;
 
@@ -30,6 +28,7 @@ import java.awt.event.KeyEvent;
 
 import resources.ResourceManager;
 import docking.action.*;
+import docking.tool.ToolConstants;
 
 public class NextHighlightedRangeAction extends NextRangeAction {
 

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextPrevCodeUnitPlugin.java

@@ -32,6 +32,7 @@ import javax.swing.Icon;
 
 import resources.ResourceManager;
 import docking.action.*;
+import docking.tool.ToolConstants;
 
 /**
  * The NextPrevCodeUnitPlugin generates a GoTo event based on where the cursor

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextPreviousBookmarkAction.java

@@ -26,6 +26,7 @@ import docking.ActionContext;
 import docking.action.*;
 import docking.menu.ActionState;
 import docking.menu.MultiStateDockingAction;
+import docking.tool.ToolConstants;
 import docking.widgets.EventTrigger;
 import ghidra.app.context.ListingActionContext;
 import ghidra.app.nav.Navigatable;
@@ -33,7 +34,6 @@ import ghidra.app.plugin.core.codebrowser.CodeViewerActionContext;
 import ghidra.app.services.GoToService;
 import ghidra.app.util.HelpTopics;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.listing.*;
 import ghidra.util.HelpLocation;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextPreviousMarkerAction.java

@@ -26,6 +26,7 @@ import docking.ActionContext;
 import docking.action.*;
 import docking.menu.ActionState;
 import docking.menu.MultiStateDockingAction;
+import docking.tool.ToolConstants;
 import docking.widgets.EventTrigger;
 import ghidra.app.context.ListingActionContext;
 import ghidra.app.nav.Navigatable;
@@ -34,7 +35,6 @@ import ghidra.app.services.GoToService;
 import ghidra.app.services.MarkerSet;
 import ghidra.app.util.HelpTopics;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.listing.BookmarkType;
 import ghidra.util.HelpLocation;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NextSelectedRangeAction.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,6 @@ import ghidra.app.nav.NextRangeAction;
 import ghidra.app.plugin.PluginCategoryNames;
 import ghidra.app.util.HelpTopics;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.util.ProgramSelection;
 import ghidra.util.HelpLocation;
 
@@ -30,6 +28,7 @@ import java.awt.event.KeyEvent;
 
 import resources.ResourceManager;
 import docking.action.*;
+import docking.tool.ToolConstants;
 
 public class NextSelectedRangeAction extends NextRangeAction {
 

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/PreviousHighlightedRangeAction.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,6 @@ import ghidra.app.nav.PreviousRangeAction;
 import ghidra.app.plugin.PluginCategoryNames;
 import ghidra.app.util.HelpTopics;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.util.ProgramSelection;
 import ghidra.util.HelpLocation;
 
@@ -30,6 +28,7 @@ import java.awt.event.KeyEvent;
 
 import resources.ResourceManager;
 import docking.action.*;
+import docking.tool.ToolConstants;
 
 public class PreviousHighlightedRangeAction extends PreviousRangeAction {
 

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/PreviousSelectedRangeAction.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,6 @@ import ghidra.app.nav.PreviousRangeAction;
 import ghidra.app.plugin.PluginCategoryNames;
 import ghidra.app.util.HelpTopics;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.util.ProgramSelection;
 import ghidra.util.HelpLocation;
 
@@ -32,6 +30,7 @@ import javax.swing.ImageIcon;
 
 import resources.ResourceManager;
 import docking.action.*;
+import docking.tool.ToolConstants;
 
 public class PreviousSelectedRangeAction extends PreviousRangeAction {
 

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/ProviderNavigationPlugin.java

@@ -22,11 +22,11 @@ import javax.swing.KeyStroke;
 
 import docking.*;
 import docking.action.*;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.plugin.PluginCategoryNames;
 import ghidra.framework.plugintool.*;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.util.HelpLocation;
 
 //@formatter:off

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/printing/PrintingPlugin.java

@@ -26,6 +26,7 @@ import javax.swing.SwingUtilities;
 
 import docking.ActionContext;
 import docking.action.*;
+import docking.tool.ToolConstants;
 import docking.widgets.fieldpanel.*;
 import docking.widgets.fieldpanel.support.AnchoredLayout;
 import ghidra.app.CorePluginPackage;
@@ -36,7 +37,6 @@ import ghidra.app.util.viewer.util.AddressIndexMap;
 import ghidra.framework.plugintool.PluginInfo;
 import ghidra.framework.plugintool.PluginTool;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.*;
 import ghidra.program.model.listing.Program;
 import ghidra.util.HelpLocation;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/MultiTabPlugin.java

@@ -24,6 +24,7 @@ import javax.swing.Timer;
 import docking.ActionContext;
 import docking.DockingUtils;
 import docking.action.*;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.events.*;
 import ghidra.app.plugin.PluginCategoryNames;
@@ -32,7 +33,6 @@ import ghidra.app.services.ProgramManager;
 import ghidra.framework.model.*;
 import ghidra.framework.plugintool.*;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.listing.Program;
 import ghidra.util.HelpLocation;
 

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramManagerPlugin.java

@@ -30,6 +30,7 @@ import javax.swing.Icon;
 import docking.ActionContext;
 import docking.action.*;
 import docking.options.editor.*;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.context.ProgramActionContext;
 import ghidra.app.context.ProgramContextAction;
@@ -46,7 +47,6 @@ import ghidra.framework.model.*;
 import ghidra.framework.options.*;
 import ghidra.framework.plugintool.*;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.framework.protocol.ghidra.*;
 import ghidra.program.database.ProgramContentHandler;
 import ghidra.program.model.address.*;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/RedoAction.java

@@ -22,12 +22,12 @@ import javax.swing.Icon;
 
 import docking.ActionContext;
 import docking.action.*;
+import docking.tool.ToolConstants;
 import ghidra.app.context.ProgramActionContext;
 import ghidra.app.context.ProgramContextAction;
 import ghidra.app.services.GoToService;
 import ghidra.app.services.NavigationHistoryService;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.listing.Program;
 import ghidra.util.*;
 import resources.ResourceManager;
@@ -38,7 +38,7 @@ public class RedoAction extends ProgramContextAction {
 	public RedoAction(PluginTool tool, String owner) {
 		super("Redo", owner);
 		this.tool = tool;
-		setHelpLocation(new HelpLocation("Tool", "Redo"));
+		setHelpLocation(new HelpLocation(ToolConstants.TOOL_HELP_TOPIC, "Redo"));
 		String[] menuPath = { ToolConstants.MENU_EDIT, "&Redo" };
 		String group = "Undo";
 		Icon icon = ResourceManager.loadImage("images/redo.png");

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/UndoAction.java

@@ -22,12 +22,12 @@ import javax.swing.Icon;
 
 import docking.ActionContext;
 import docking.action.*;
+import docking.tool.ToolConstants;
 import ghidra.app.context.ProgramActionContext;
 import ghidra.app.context.ProgramContextAction;
 import ghidra.app.services.GoToService;
 import ghidra.app.services.NavigationHistoryService;
 import ghidra.framework.plugintool.PluginTool;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.listing.Program;
 import ghidra.util.*;
 import resources.ResourceManager;
@@ -38,7 +38,7 @@ public class UndoAction extends ProgramContextAction {
 	public UndoAction(PluginTool tool, String owner) {
 		super("Undo", owner);
 		this.tool = tool;
-		setHelpLocation(new HelpLocation("Tool", "Undo"));
+		setHelpLocation(new HelpLocation(ToolConstants.TOOL_HELP_TOPIC, "Undo"));
 		String[] menuPath = { ToolConstants.MENU_EDIT, "&Undo" };
 		Icon icon = ResourceManager.loadImage("images/undo.png");
 		MenuData menuData = new MenuData(menuPath, icon, "Undo");

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/scalartable/ScalarSearchPlugin.java

@@ -19,6 +19,7 @@ import java.util.*;
 
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.context.*;
 import ghidra.app.events.ViewChangedPluginEvent;
@@ -29,7 +30,6 @@ import ghidra.framework.model.*;
 import ghidra.framework.plugintool.PluginInfo;
 import ghidra.framework.plugintool.PluginTool;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.listing.Program;
 import ghidra.program.util.ChangeManager;
 import ghidra.util.HelpLocation;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptActionManager.java

@@ -30,13 +30,13 @@ import docking.ActionContext;
 import docking.DockingUtils;
 import docking.action.*;
 import docking.actions.KeyBindingUtils;
+import docking.tool.ToolConstants;
 import docking.widgets.table.GTable;
 import generic.jar.ResourceFile;
 import ghidra.app.script.GhidraScriptUtil;
 import ghidra.app.script.ScriptInfo;
 import ghidra.framework.Application;
 import ghidra.framework.options.SaveState;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.util.*;
 import ghidra.util.task.*;
 import resources.Icons;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/MemSearchPlugin.java

@@ -25,6 +25,7 @@ import javax.swing.JComponent;
 
 import docking.*;
 import docking.action.*;
+import docking.tool.ToolConstants;
 import docking.widgets.fieldpanel.support.Highlight;
 import docking.widgets.table.threaded.*;
 import ghidra.GhidraOptions;
@@ -44,7 +45,6 @@ import ghidra.framework.model.DomainObject;
 import ghidra.framework.options.*;
 import ghidra.framework.plugintool.*;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.listing.CodeUnit;
 import ghidra.program.model.listing.Program;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin.java

@@ -27,6 +27,7 @@ import javax.swing.ImageIcon;
 
 import docking.*;
 import docking.action.*;
+import docking.tool.ToolConstants;
 import docking.widgets.fieldpanel.support.Highlight;
 import docking.widgets.table.threaded.*;
 import ghidra.GhidraOptions;
@@ -49,7 +50,6 @@ import ghidra.framework.options.ToolOptions;
 import ghidra.framework.plugintool.PluginInfo;
 import ghidra.framework.plugintool.PluginTool;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.*;
 import ghidra.program.model.listing.*;
 import ghidra.program.model.mem.Memory;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/RestoreSelectionPlugin.java

@@ -34,6 +34,7 @@ import java.util.Map;
 import docking.ActionContext;
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 
 //@formatter:off
 @PluginInfo(

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/SelectBlockPlugin.java

@@ -27,6 +27,7 @@ import docking.ActionContext;
 import docking.ComponentProvider;
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 
 /**
  * This plugin class contains the structure needed for the user to

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/flow/SelectByFlowAction.java

@@ -18,11 +18,11 @@ package ghidra.app.plugin.core.select.flow;
 import ghidra.app.context.ListingActionContext;
 import ghidra.app.context.ListingContextAction;
 import ghidra.app.util.HelpTopics;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.listing.CodeUnit;
 import ghidra.util.HelpLocation;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 
 /**
  * <CODE>SelectByFlowAction</CODE> allows the user to Select Code By Flowing from

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/flow/SelectByScopedFlowPlugin.java

@@ -19,6 +19,7 @@ import java.util.*;
 
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import edu.uci.ics.jung.graph.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.Graph;
 import ghidra.app.CorePluginPackage;
@@ -29,7 +30,6 @@ import ghidra.app.plugin.ProgramPlugin;
 import ghidra.framework.plugintool.PluginInfo;
 import ghidra.framework.plugintool.PluginTool;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.graph.GDirectedGraph;
 import ghidra.graph.GraphAlgorithms;
 import ghidra.graph.jung.JungToGDirectedGraphAdapter;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/qualified/QualifiedSelectionPlugin.java

@@ -17,6 +17,7 @@ package ghidra.app.plugin.core.select.qualified;
 
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.context.*;
 import ghidra.app.events.ProgramSelectionPluginEvent;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/string/StringTablePlugin.java

@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.context.NavigatableActionContext;
 import ghidra.app.context.NavigatableContextAction;
@@ -29,7 +30,6 @@ import ghidra.app.util.HelpTopics;
 import ghidra.framework.plugintool.PluginInfo;
 import ghidra.framework.plugintool.PluginTool;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.program.model.address.*;
 import ghidra.program.model.listing.Program;
 import ghidra.program.util.ProgramSelection;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/totd/TipOfTheDayPlugin.java

@@ -22,11 +22,12 @@ import java.util.List;
 import docking.ActionContext;
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.plugin.PluginCategoryNames;
 import ghidra.framework.main.FrontEndOnly;
 import ghidra.framework.plugintool.*;
-import ghidra.framework.plugintool.util.*;
+import ghidra.framework.plugintool.util.PluginStatus;
 import ghidra.framework.preferences.Preferences;
 import ghidra.util.HelpLocation;
 import ghidra.util.SystemUtilities;
@@ -63,7 +64,7 @@ public class TipOfTheDayPlugin extends Plugin implements FrontEndOnly {
 			ToolConstants.HELP_CONTENTS_MENU_GROUP));
 
 		action.setEnabled(true);
-		action.setHelpLocation(new HelpLocation("Tool", "Tip_of_the_day"));
+		action.setHelpLocation(new HelpLocation(ToolConstants.TOOL_HELP_TOPIC, "Tip_of_the_day"));
 		tool.addAction(action);
 
 		List<String> tips = null;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/validator/ValidateProgramPlugin.java

@@ -33,6 +33,7 @@ import java.util.*;
 import docking.ActionContext;
 import docking.action.DockingAction;
 import docking.action.MenuData;
+import docking.tool.ToolConstants;
 import docking.widgets.conditiontestpanel.ConditionTester;
 
 /**

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/JavaHelpPlugin.java

@@ -27,13 +27,13 @@ import docking.action.DockingAction;
 import docking.action.MenuData;
 import docking.actions.SharedStubKeyBindingAction;
 import docking.help.*;
+import docking.tool.ToolConstants;
 import ghidra.app.DeveloperPluginPackage;
 import ghidra.app.plugin.PluginCategoryNames;
 import ghidra.framework.main.FrontEndable;
 import ghidra.framework.model.Project;
 import ghidra.framework.plugintool.*;
 import ghidra.framework.plugintool.util.PluginStatus;
-import ghidra.framework.plugintool.util.ToolConstants;
 import ghidra.util.HelpLocation;
 import ghidra.util.Msg;
 import ghidra.util.task.*;

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/gui/LookAndFeelPlugin.java

@@ -20,6 +20,7 @@ import static ghidra.docking.util.DockingWindowsLookAndFeelUtils.*;
 import java.util.List;
 
 import docking.options.editor.StringWithChoicesEditor;
+import docking.tool.ToolConstants;
 import docking.widgets.OptionDialog;
 import ghidra.app.CorePluginPackage;
 import ghidra.app.plugin.PluginCategoryNames;
@@ -49,7 +50,7 @@ public class LookAndFeelPlugin extends Plugin implements FrontEndOnly, OptionsCh
 	private boolean useInvertedColors;
 	public final static String LOOK_AND_FEEL_NAME = "Swing Look And Feel";
 	private final static String USE_INVERTED_COLORS_NAME = "Use Inverted Colors";
-	private final static String OPTIONS_TITLE = "Tool";
+	private final static String OPTIONS_TITLE = ToolConstants.TOOL_OPTIONS;
 
 	private static boolean issuedLafNotification;
 	private static boolean issuedPreferredDarkThemeLafNotification;
@@ -69,7 +70,7 @@ public class LookAndFeelPlugin extends Plugin implements FrontEndOnly, OptionsCh
 		selectedLookAndFeel = getInstalledLookAndFeelName();
 		List<String> lookAndFeelNames = getLookAndFeelNames();
 		opt.registerOption(LOOK_AND_FEEL_NAME, OptionType.STRING_TYPE, selectedLookAndFeel,
-			new HelpLocation("Tool", "Look_And_Feel"),
+			new HelpLocation(ToolConstants.TOOL_HELP_TOPIC, "Look_And_Feel"),
 			"Set the look and feel for Ghidra.  After you change the " +
 				"look and feel, you will have to restart Ghidra to see the effect.",
 			new StringWithChoicesEditor(lookAndFeelNames));
@@ -77,7 +78,7 @@ public class LookAndFeelPlugin extends Plugin implements FrontEndOnly, OptionsCh
 
 		useInvertedColors = getUseInvertedColorsPreference();
 		opt.registerOption(USE_INVERTED_COLORS_NAME, OptionType.BOOLEAN_TYPE, useInvertedColors,
-			new HelpLocation("Tool", "Use_Inverted_Colors"),
+			new HelpLocation(ToolConstants.TOOL_HELP_TOPIC, "Use_Inverted_Colors"),
 			"Indicates to invert all drawn colors.   This provides the ability to create an " +
 				"effective 'Dark Theme' appearance.  (Note: you may have to change your " +
 				"Look and Feel to achieve the best rendering.)\n\n" +