diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/progress/ProgressServicePlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/progress/ProgressServicePlugin.java index 0a4001b04d..59fb4bd807 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/progress/ProgressServicePlugin.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/progress/ProgressServicePlugin.java @@ -26,8 +26,9 @@ import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; import ghidra.util.datastruct.ListenerSet; +//@formatter:off @PluginInfo( - category = PluginCategoryNames.MISC, + category = PluginCategoryNames.DEBUGGER, shortDescription = "Service for monitoring task progress", description = """ Implements a pub-sub model for notifying of tasks and progress. Publishers can create @@ -36,7 +37,9 @@ import ghidra.util.datastruct.ListenerSet; """, servicesProvided = { ProgressService.class }, packageName = DebuggerPluginPackage.NAME, - status = PluginStatus.RELEASED) + status = PluginStatus.RELEASED +) +//@formatter:on public class ProgressServicePlugin extends Plugin implements ProgressService { ListenerSet listeners = new ListenerSet<>(ProgressListener.class, true); 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 174fd613d1..99d2698dc4 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 @@ -15,16 +15,13 @@ */ package ghidra.app.merge; +import javax.swing.JComponent; + import ghidra.app.CorePluginPackage; import ghidra.app.plugin.PluginCategoryNames; -import ghidra.framework.model.DomainFile; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; -import ghidra.program.model.address.Address; import ghidra.program.model.listing.DataTypeArchive; -import ghidra.program.model.listing.Program; - -import javax.swing.JComponent; /** * Plugin that provides a merge component provider for data type archives. @@ -33,7 +30,7 @@ import javax.swing.JComponent; @PluginInfo( status = PluginStatus.HIDDEN, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = PluginCategoryNames.COMMON, shortDescription = "DataType Archive Merge Manager", description = "Manage merge of DataType Archives" ) @@ -46,187 +43,98 @@ public class DataTypeArchiveMergeManagerPlugin extends MergeManagerPlugin { * @param mergeManager the merge manager that will control the merge process * @param dataTypeArchive the data type archive */ - public DataTypeArchiveMergeManagerPlugin( PluginTool tool, - DataTypeArchiveMergeManager mergeManager, - DataTypeArchive dataTypeArchive) { + public DataTypeArchiveMergeManagerPlugin(PluginTool tool, + DataTypeArchiveMergeManager mergeManager, + DataTypeArchive dataTypeArchive) { super(tool, mergeManager, dataTypeArchive); -// registerEventConsumed(ProgramActivatedPluginEvent.class); -// registerServiceProvided(ProgramManager.class, this); - } - - @Override - public MergeManagerProvider createProvider() { - return new MergeManagerProvider(this, - "Merge Data Type Archives for " + currentDomainObject.getName()); } @Override - public void processEvent(PluginEvent event) { -// if (event instanceof ProgramActivatedPluginEvent) { -// Program activeProgram = ((ProgramActivatedPluginEvent) event).getActiveProgram(); -// currentProgram = activeProgram; -// } - } - + public MergeManagerProvider createProvider() { + return new MergeManagerProvider(this, + "Merge Data Type Archives for " + currentDomainObject.getName()); + } + @Override - protected void dispose() { + public void processEvent(PluginEvent event) { + // stub + } + + @Override + protected void dispose() { provider.dispose(); } - - public static String getDescription() { - return "Manage merge of Programs"; - } - - public static String getDescriptiveName() { - return "Program Merge Manager"; - } - - public static String getCategory() { - return "Unmanaged"; - } - + /** * Gets the merge manager associated with this plug-in. * @return the merge manager */ @Override - DataTypeArchiveMergeManager getMergeManager() { - return (DataTypeArchiveMergeManager)mergeManager; + DataTypeArchiveMergeManager getMergeManager() { + return (DataTypeArchiveMergeManager) mergeManager; } - + /** * Defines and displays a component for resolving merge conflicts. * @param component the component * @param componentID the identifier for this component */ @Override - void setMergeComponent(JComponent component, String componentID) { + void setMergeComponent(JComponent component, String componentID) { provider.setMergeComponent(component, componentID); } - + /** * Sets the merge description at the top of the merge tool. * @param mergeDescription the new description */ @Override - void updateMergeDescription(String mergeDescription) { + void updateMergeDescription(String mergeDescription) { provider.updateMergeDescription(mergeDescription); } - + /** * Sets the message below the progress meter in the current phase progress area. * @param progressDescription the new text message to display. If null, then the default message is displayed. */ @Override - void updateProgressDetails(String progressDescription) { + void updateProgressDetails(String progressDescription) { provider.updateProgressDetails(progressDescription); } - + /** * Sets the percentage of the progress meter that is filled in for the current phase progress area. * @param currentPercentProgress the percentage of the progress bar to fill in from 0 to 100. */ @Override - void setCurrentProgress(int currentPercentProgress) { + void setCurrentProgress(int currentPercentProgress) { provider.setCurrentProgress(currentPercentProgress); } - + /** * Displays the default information in the merge tool. */ @Override - void showDefaultComponent() { + void showDefaultComponent() { provider.showDefaultComponent(); } - + /** * Enables/disables the Apply button at the bottom of the merge tool. * The Apply button is for applying conflicts. * @param state true means enable the button. false means disable it. */ @Override - void setApplyEnabled(boolean state) { + void setApplyEnabled(boolean state) { provider.setApplyEnabled(state); } - + /** * Gets the provider for the merge. * @return the provider */ @Override - MergeManagerProvider getProvider() { + MergeManagerProvider getProvider() { return provider; } - - public boolean closeAllPrograms(boolean ignoreChanges) { - return false; - } - - public boolean closeProgram() { - return false; - } - - public boolean closeProgram(Program program, boolean ignoreChanges) { - return false; - } - - public DataTypeArchive[] getAllOpenDataTypeArchives() { - DataTypeArchiveMergeManager archiveMergeManager = (DataTypeArchiveMergeManager)mergeManager; - return new DataTypeArchive[] { - archiveMergeManager.getDataTypeArchive(MergeConstants.RESULT), - archiveMergeManager.getDataTypeArchive(MergeConstants.LATEST), - archiveMergeManager.getDataTypeArchive(MergeConstants.MY), - archiveMergeManager.getDataTypeArchive(MergeConstants.ORIGINAL) - }; - } - - public DataTypeArchive getCurrentDataTypeArchive() { - return (DataTypeArchive)currentDomainObject; - } - - public Program getProgram(Address addr) { - return null; - } - - public int getSearchPriority(Program p) { - return 0; - } - - public boolean isVisible(Program program) { - return false; - } - - public Program openProgram(DomainFile domainFile) { - return null; - } - - public Program openProgram(DomainFile df, int version) { - return null; - } - - public Program openProgram(DomainFile domainFile, int version, int state) { - return null; - } - - public void openProgram(Program program) { - } - - public void openProgram(Program program, boolean current) { - } - - public void openProgram(Program program, int state) { - } - - public void releaseProgram(Program program, Object persistentOwner) { - } - - public void setCurrentProgram(Program p) { - } - - public boolean setPersistentOwner(Program program, Object owner) { - return false; - } - - public void setSearchPriority(Program p, int priority) { - } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/ProgramMergeManagerPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/ProgramMergeManagerPlugin.java index a4aff1022c..68f8bd5709 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/ProgramMergeManagerPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/ProgramMergeManagerPlugin.java @@ -38,7 +38,7 @@ import ghidra.program.model.listing.Program; @PluginInfo( status = PluginStatus.HIDDEN, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = PluginCategoryNames.COMMON, shortDescription = "Program Merge Manager", description = "Manage merge of Programs", servicesProvided = { ProgramManager.class }, 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 e17a7fd63b..087c5e301f 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 @@ -30,7 +30,7 @@ import ghidra.program.util.ProgramLocation; @PluginInfo( status = PluginStatus.STABLE, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.TESTING, + category = PluginCategoryNames.COMMON, shortDescription = "Listing Merge", description = "Merge Panel for Listing", eventsConsumed = { ProgramLocationPluginEvent.class } @@ -44,14 +44,14 @@ public class ListingMergePanelPlugin extends Plugin implements ProgramaticUseOnl * @param tool merge tool * @param mergePanel merge panel */ - public ListingMergePanelPlugin(PluginTool tool, ListingMergePanel mergePanel) { - super(tool); + public ListingMergePanelPlugin(PluginTool tool, ListingMergePanel mergePanel) { + super(tool); createProvider(mergePanel); firePluginEvent(new ProgramActivatedPluginEvent(this.getName(), mergePanel.getProgram(MergeConstants.RESULT))); createActions(); } - + private void createActions() { ViewInstructionDetailsAction viewDetailsAction = new ViewInstructionDetailsAction(this); tool.addAction(viewDetailsAction); @@ -60,17 +60,18 @@ public class ListingMergePanelPlugin extends Plugin implements ProgramaticUseOnl public ComponentProvider getProvider() { return provider; } - + /* (non-Javadoc) * @see ghidra.framework.plugintool.Plugin#dispose() */ @Override - public void dispose() { + public void dispose() { if (provider != null) { provider.dispose(); firePluginEvent(new ProgramActivatedPluginEvent(this.getName(), null)); } } + public static String getDescription() { return "Listing Merge"; } @@ -84,19 +85,18 @@ public class ListingMergePanelPlugin extends Plugin implements ProgramaticUseOnl } private void createProvider(ListingMergePanel mergePanel) { - provider = new ListingMergePanelProvider(tool,this, getName(), mergePanel); + provider = new ListingMergePanelProvider(tool, this, getName(), mergePanel); tool.addComponentProvider(provider, false); } - @Override - public void processEvent(PluginEvent event) { + public void processEvent(PluginEvent event) { - if (event instanceof ProgramLocationPluginEvent) { - ProgramLocationPluginEvent evt = (ProgramLocationPluginEvent)event; - ProgramLocation location = evt.getLocation(); - ListingMergePanel mergePanel = (ListingMergePanel)provider.getComponent(); - mergePanel.goTo(location, true); - } - } + if (event instanceof ProgramLocationPluginEvent) { + ProgramLocationPluginEvent evt = (ProgramLocationPluginEvent) event; + ProgramLocation location = evt.getLocation(); + ListingMergePanel mergePanel = (ListingMergePanel) provider.getComponent(); + mergePanel.goTo(location, true); + } + } } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/algorithmtree/ModuleAlgorithmPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/algorithmtree/ModuleAlgorithmPlugin.java index 11bdc7711b..341fdf8461 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/algorithmtree/ModuleAlgorithmPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/algorithmtree/ModuleAlgorithmPlugin.java @@ -43,7 +43,7 @@ import docking.action.MenuData; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.TREE, + category = PluginCategoryNames.PROGRAM_ORGANIZATION, shortDescription = "Apply Module Algorithm to a folder or fragment", description = "This plugin applies the \"module\" algorithm "+ " to a Folder or Fragment in a program tree. This algorithm "+ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/assembler/AssemblerPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/assembler/AssemblerPlugin.java index 95d5a58614..8c196badf7 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/assembler/AssemblerPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/assembler/AssemblerPlugin.java @@ -18,7 +18,6 @@ package ghidra.app.plugin.core.assembler; import docking.ActionContext; import ghidra.app.CorePluginPackage; import ghidra.app.context.ListingActionContext; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.app.plugin.ProgramPlugin; import ghidra.app.plugin.assembler.Assemblers; import ghidra.docking.settings.Settings; @@ -40,7 +39,7 @@ import ghidra.program.model.mem.MemBuffer; * The API for instruction assembly is available from {@link Assemblers}. For data assembly, the API * is in {@link DataType#encodeRepresentation(String, MemBuffer, Settings, int)}. */ -@PluginInfo(status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, category = PluginCategoryNames.PATCHING, shortDescription = "Assembler", description = "This plugin provides functionality for assembly patching. " + +@PluginInfo(status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, category = "Patching", shortDescription = "Assembler", description = "This plugin provides functionality for assembly patching. " + "The assembler supports most processor languages also supported by the " + "disassembler. Depending on the particular processor, your mileage may vary. " + "We are in the process of testing and improving support for all our processors. " + 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 bbf155d607..9f10a4a2f2 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 @@ -51,7 +51,7 @@ import ghidra.util.exception.NotFoundException; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.SUPPORT, + category = PluginCategoryNames.COMMON, shortDescription = "Provides the block model service", description = "This plugin provides registration and distribution of basic-block " + "and subroutine models via the block model service.", diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clipboard/ClipboardPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clipboard/ClipboardPlugin.java index 6ea28c2157..8c7e87e3aa 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clipboard/ClipboardPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/clipboard/ClipboardPlugin.java @@ -49,7 +49,7 @@ import ghidra.util.task.*; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.SUPPORT, + category = PluginCategoryNames.COMMON, shortDescription = "Clipboard Manager", description = "This plugin manages cut/copy/paste of labels, comments, formatted code, and byte strings to and from the system clipboard.", servicesProvided = { ClipboardService.class } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/functioncompare/FunctionComparisonPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/functioncompare/FunctionComparisonPlugin.java index b315d585b7..f7ec3d6201 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/functioncompare/FunctionComparisonPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/functioncompare/FunctionComparisonPlugin.java @@ -47,7 +47,7 @@ import ghidra.util.Swing; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.DIFF, + category = PluginCategoryNames.CODE_VIEWER, shortDescription = "Compare Functions", description = "Allows users to compare two or more functions", servicesProvided = { FunctionComparisonService.class }, diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/gotoquery/GoToServicePlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/gotoquery/GoToServicePlugin.java index 88a1c68b54..67c452d910 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/gotoquery/GoToServicePlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/gotoquery/GoToServicePlugin.java @@ -40,7 +40,7 @@ import ghidra.program.util.ProgramSelection; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.SUPPORT, + category = PluginCategoryNames.COMMON, shortDescription = "Go To Service", description = "This plugin provides the service used by other plugins to " + "go to an address in the program, or to an address in another program." + @@ -225,7 +225,8 @@ public final class GoToServicePlugin extends ProgramPlugin { } @Override - public void removeHighlightProvider(ListingHighlightProvider highlightProvider, Program program) { + public void removeHighlightProvider(ListingHighlightProvider highlightProvider, + Program program) { CodeViewerService service = tool.getService(CodeViewerService.class); if (service != null) { service.removeHighlightProvider(highlightProvider, program); @@ -233,7 +234,8 @@ public final class GoToServicePlugin extends ProgramPlugin { } @Override - public void setHighlightProvider(ListingHighlightProvider highlightProvider, Program program) { + public void setHighlightProvider(ListingHighlightProvider highlightProvider, + Program program) { CodeViewerService service = tool.getService(CodeViewerService.class); if (service != null) { service.setHighlightProvider(highlightProvider, program); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/interpreter/InterpreterPanelPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/interpreter/InterpreterPanelPlugin.java index c9d51b1151..84686dfbb4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/interpreter/InterpreterPanelPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/interpreter/InterpreterPanelPlugin.java @@ -24,7 +24,7 @@ import ghidra.framework.plugintool.util.PluginStatus; @PluginInfo( status = PluginStatus.STABLE, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.SUPPORT, + category = PluginCategoryNames.COMMON, shortDescription = "Interpreter panel service", description = "Provides a generic interpreter connection and mates it to a panel" + " which takes input from the user and displays output from the interpreter.", diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/marker/MarkerManagerPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/marker/MarkerManagerPlugin.java index 2662929ecb..fb1b41f71a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/marker/MarkerManagerPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/marker/MarkerManagerPlugin.java @@ -29,7 +29,7 @@ import ghidra.util.HelpLocation; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.SUPPORT, + category = PluginCategoryNames.COMMON, shortDescription = "Provides the marker display", description = "This plugin extends the code browser to include left and right marker" + "components. The left margin shows marks related to the address being shown at " + diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/misc/FontAdjustPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/misc/FontAdjustPlugin.java index 96549a3894..a2448ebc8a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/misc/FontAdjustPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/misc/FontAdjustPlugin.java @@ -18,8 +18,8 @@ package ghidra.app.plugin.core.misc; import docking.ActionContext; import docking.ComponentProvider; import docking.action.builder.ActionBuilder; -import ghidra.app.CorePluginPackage; import ghidra.app.plugin.PluginCategoryNames; +import ghidra.framework.main.UtilityPluginPackage; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -28,8 +28,8 @@ import ghidra.framework.plugintool.util.PluginStatus; */ @PluginInfo( //@formatter:off status = PluginStatus.RELEASED, - packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.MISC, + packageName = UtilityPluginPackage.NAME, + category = PluginCategoryNames.FRAMEWORK, shortDescription = "Provides generic actions for increasing/decreasing fonts.", description = "This plugin provides actions for increasing fonts used by component providers. "+ "ComponentProviders can either override the \"changeFontSize()\" method or register a" + diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/misc/RecoverySnapshotMgrPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/misc/RecoverySnapshotMgrPlugin.java index b3302be4ba..4b6671e0f0 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/misc/RecoverySnapshotMgrPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/misc/RecoverySnapshotMgrPlugin.java @@ -39,7 +39,7 @@ import ghidra.util.exception.AssertException; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.MISC, + category = PluginCategoryNames.COMMON, shortDescription = "Generates recovery snapshot files", description = "Facilitates the periodic creation of recovery snapshot files. " + "In the event of a crash or application hang, these files may be used to " + diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/module/AutoRenamePlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/module/AutoRenamePlugin.java index cb03b4223a..e6fe4d06a9 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/module/AutoRenamePlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/module/AutoRenamePlugin.java @@ -52,7 +52,7 @@ import docking.action.MenuData; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.TREE, + category = PluginCategoryNames.PROGRAM_ORGANIZATION, shortDescription = "Rename Fragment", description = "Rename a fragment in the program tree viewer with either the " + "selected label within the fragment or with the minimum " + diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/module/ModuleSortPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/module/ModuleSortPlugin.java index 2839d47845..5fe0bcc181 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/module/ModuleSortPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/module/ModuleSortPlugin.java @@ -54,7 +54,7 @@ import ghidra.util.task.*; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.TREE, + category = PluginCategoryNames.PROGRAM_ORGANIZATION, shortDescription = "Sort Fragments within Module", description = "Plugin to sort Modules and Fragments within a selected Module. " + "Child Module folders are always name-sorted and placed " + diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NavigationHistoryPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NavigationHistoryPlugin.java index 8d38294c49..1df6b2d952 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NavigationHistoryPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/NavigationHistoryPlugin.java @@ -49,7 +49,7 @@ import ghidra.util.bean.opteditor.OptionsVetoException; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.SUPPORT, + category = PluginCategoryNames.COMMON, shortDescription = "Tool State History", description = "This plugin maintains a history of tool states. " + "It is used in conjunction with other plugins " diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/processors/LanguageProviderPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/processors/LanguageProviderPlugin.java index 81a4413070..98246c670f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/processors/LanguageProviderPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/processors/LanguageProviderPlugin.java @@ -48,7 +48,7 @@ import ghidra.util.task.*; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.SUPPORT, + category = PluginCategoryNames.COMMON, shortDescription = "Set Language", description = "This plugin provides the set language feature." ) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramManagerPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramManagerPlugin.java index bac13d4cbd..f65f6fa87d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramManagerPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramManagerPlugin.java @@ -57,7 +57,7 @@ import ghidra.util.task.TaskLauncher; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.SUPPORT, + category = PluginCategoryNames.COMMON, shortDescription = "Manage open programs", description = "This plugin provides actions for opening and closing programs. It also " + "provides a service to allow plugins to open/close programs. This plugin is " + diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/ProgramTreeModularizationPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/ProgramTreeModularizationPlugin.java index 8fc3b1edbd..e3ac1909f0 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/ProgramTreeModularizationPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/ProgramTreeModularizationPlugin.java @@ -15,6 +15,9 @@ */ package ghidra.app.plugin.core.programtree; +import docking.ActionContext; +import docking.action.DockingAction; +import docking.action.MenuData; import ghidra.app.CorePluginPackage; import ghidra.app.cmd.module.ComplexityDepthModularizationCmd; import ghidra.app.cmd.module.DominanceModularizationCmd; @@ -25,35 +28,30 @@ import ghidra.framework.plugintool.PluginInfo; import ghidra.framework.plugintool.PluginTool; import ghidra.framework.plugintool.util.PluginStatus; import ghidra.util.HelpLocation; -import docking.ActionContext; -import docking.action.DockingAction; -import docking.action.MenuData; -/** - * - * Provides actions for organizing the program tree based on various algorithms. Currently, there - * are two algorithms: - * - * Dominance: organizes the functions in a program such that a function is in a subtree of another - * function if all call paths to that function must past through the parent funciton. - * - * Complexity Depth: organizes the functions into "levels" from the bottom up. All leaf functions are - * in the same lowest level (highest number, call it level N). All functions that only call leaf functions - * are in the next higher level, N-1. Functions in the highest level (labeled level 0) are those furthest - * from the leaves. - * - */ //@formatter:off @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.TREE, + category = PluginCategoryNames.PROGRAM_ORGANIZATION, shortDescription = "Program Tree Modularization Plugin", description = "Provides actions for orgainizing a program tree into modules or fragments. " + "Currently there are two organizations, dominance and complexity depth", servicesRequired = { BlockModelService.class } ) //@formatter:on +/** + * Provides actions for organizing the program tree based on various algorithms. Currently, there + * are two algorithms: + *

+ * Dominance: organizes the functions in a program such that a function is in a subtree of another + * function if all call paths to that function must past through the parent function. + *

+ * Complexity Depth: organizes the functions into "levels" from the bottom up. All leaf functions + * are in the same lowest level (highest number, call it level N). All functions that only call + * leaf functions are in the next higher level, N-1. Functions in the highest level (labeled level + * 0) are those furthest from the leaves. + */ public class ProgramTreeModularizationPlugin extends ProgramPlugin { public ProgramTreeModularizationPlugin(PluginTool tool) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/ProgramTreePlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/ProgramTreePlugin.java index 47bfffbe35..39aa86c54a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/ProgramTreePlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/ProgramTreePlugin.java @@ -55,7 +55,7 @@ import resources.Icons; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.TREE, + category = PluginCategoryNames.PROGRAM_ORGANIZATION, shortDescription = "Show Program Tree Views", description = "This plugin shows a view for " + " each tree in the program. A tree can be organized into " + diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/programtree/ProgramTreeSelectionPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/programtree/ProgramTreeSelectionPlugin.java index 9af6dcc58f..c480deb676 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/programtree/ProgramTreeSelectionPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/select/programtree/ProgramTreeSelectionPlugin.java @@ -43,7 +43,7 @@ import ghidra.util.HelpLocation; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.TREE, + category = PluginCategoryNames.PROGRAM_ORGANIZATION, shortDescription = "Selects addresses from Program Tree", description = "Allows the user to select code in the code browser from a selection" + " of nodes (modules and fragments) in the Program Tree.", diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolRowObject.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolRowObject.java index 3ea92788cc..c1b2c279cf 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolRowObject.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/symtable/SymbolRowObject.java @@ -91,7 +91,7 @@ public class SymbolRowObject implements Comparable { /** * The AbstractSortedTableModel.EndOfChainComparator makes it - * neccessary to implement this method to avoid use of identity hash equality + * necessary to implement this method to avoid use of identity hash equality * when two instances are otherwise equal. */ @Override diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/table/TableServicePlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/table/TableServicePlugin.java index 344812c4b5..d01dd76b30 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/table/TableServicePlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/table/TableServicePlugin.java @@ -45,7 +45,7 @@ import ghidra.util.task.SwingUpdateManager; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.SUPPORT, + category = PluginCategoryNames.COMMON, shortDescription = "Results table service", description = "Provides a generic results service that takes a list of information " + "and displays the list to user in the form of a table", diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/ComponentInfoPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/ComponentInfoPlugin.java index 5e50aa17ee..9bcbd83aca 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/ComponentInfoPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/ComponentInfoPlugin.java @@ -33,10 +33,10 @@ import help.HelpService; @PluginInfo( status = PluginStatus.RELEASED, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.TESTING, + category = PluginCategoryNames.DIAGNOSTIC, shortDescription = "Show component information", - description = "This plugin is a debug aid that displays " + - "a table of information about the components in the application." + description = "A debug aid that displays a table of information about the components in the " + + "application." ) //@formatter:on public class ComponentInfoPlugin extends Plugin { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DbViewerPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DbViewerPlugin.java index 55f0b5c19f..3cc9721a34 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DbViewerPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DbViewerPlugin.java @@ -33,7 +33,7 @@ import resources.Icons; @PluginInfo( status = PluginStatus.RELEASED, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.TESTING, + category = PluginCategoryNames.DIAGNOSTIC, shortDescription = "Show database tables", description = "This plugin is a debug aid that allows the user to browse database tables.", eventsConsumed = { ProgramActivatedPluginEvent.class } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DomainEventDisplayPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DomainEventDisplayPlugin.java index b8ed6bc539..59c1b534e8 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DomainEventDisplayPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DomainEventDisplayPlugin.java @@ -35,7 +35,7 @@ import help.HelpService; @PluginInfo( status = PluginStatus.RELEASED, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.TESTING, + category = PluginCategoryNames.DIAGNOSTIC, shortDescription = "Displays domain object events", description = "This plugin provides a component to display domain object event " + "as they are generated. The maximum number of messages shown is " + diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DomainFolderChangesDisplayPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DomainFolderChangesDisplayPlugin.java index 762577a456..93e980b94b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DomainFolderChangesDisplayPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/DomainFolderChangesDisplayPlugin.java @@ -27,7 +27,7 @@ import ghidra.framework.plugintool.util.PluginStatus; @PluginInfo( status = PluginStatus.STABLE, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.TESTING, + category = PluginCategoryNames.DIAGNOSTIC, shortDescription = "Show Domain Folder change notifications", description = "Displays active project domain folder change notifications", servicesRequired = { FrontEndService.class } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/EventDisplayPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/EventDisplayPlugin.java index aabbd9790b..69057c959e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/EventDisplayPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/EventDisplayPlugin.java @@ -31,7 +31,7 @@ import help.HelpService; @PluginInfo( status = PluginStatus.RELEASED, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.TESTING, + category = PluginCategoryNames.DIAGNOSTIC, shortDescription = "Show plugin events", description = "This plugin is a debug aid that prints " + "plugin event information. It can also be used as a sample " + diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/GenerateOldLanguagePlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/GenerateOldLanguagePlugin.java index 55969fdba4..5535277c3e 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/GenerateOldLanguagePlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/GenerateOldLanguagePlugin.java @@ -56,7 +56,7 @@ import ghidra.util.xml.GenericXMLOutputter; @PluginInfo( status = PluginStatus.STABLE, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.MISC, + category = PluginCategoryNames.DIAGNOSTIC, shortDescription = "Generate Old Language File", description = "This plugin allows the user to generate an old-language XML " + "file from the current version of a loaded language. " + diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/JavaHelpPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/JavaHelpPlugin.java index 08035ea85a..c0596415d9 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/JavaHelpPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/JavaHelpPlugin.java @@ -26,7 +26,7 @@ import docking.*; import docking.action.DockingAction; import docking.action.MenuData; import docking.actions.SharedStubKeyBindingAction; -import docking.help.*; +import docking.help.HelpManager; import docking.tool.ToolConstants; import ghidra.app.DeveloperPluginPackage; import ghidra.app.plugin.PluginCategoryNames; @@ -45,9 +45,9 @@ import help.HelpService; */ //@formatter:off @PluginInfo( - status = PluginStatus.RELEASED, + status = PluginStatus.STABLE, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.TESTING, + category = PluginCategoryNames.DIAGNOSTIC, shortDescription = "Write JavaHelp Info", description = "This plugin identifies " + "those plugin actions that do not have help associated with them. The file, " + diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/propertymanager/PropertyManagerPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/propertymanager/PropertyManagerPlugin.java index 3b1286679f..fcb137a881 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/propertymanager/PropertyManagerPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/debug/propertymanager/PropertyManagerPlugin.java @@ -41,7 +41,7 @@ import ghidra.program.util.*; @PluginInfo( status = PluginStatus.STABLE, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.TESTING, + category = PluginCategoryNames.COMMON, shortDescription = "Show Markers for Properties", description = "This plugin shows a list of properties in the program."+ " For each property selected, navigation markers are displayed to indicate "+ diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/gui/WindowLocationPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/gui/WindowLocationPlugin.java index 15ffcae96f..e3e7ef3eab 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/gui/WindowLocationPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/gui/WindowLocationPlugin.java @@ -40,7 +40,7 @@ import ghidra.util.Swing; @PluginInfo( status = PluginStatus.STABLE, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.SUPPORT, + category = PluginCategoryNames.DIAGNOSTIC, shortDescription = WindowLocationPlugin.NAME, description = "Shows all known window and screen geometry" ) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/debug/ScreenshotPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/debug/ScreenshotPlugin.java index 2b911b4412..2043241c3a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/debug/ScreenshotPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/prototype/debug/ScreenshotPlugin.java @@ -39,7 +39,7 @@ import ghidra.framework.plugintool.util.PluginStatus; @PluginInfo( status = PluginStatus.RELEASED, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.TESTING, + category = PluginCategoryNames.DIAGNOSTIC, shortDescription = "Capture Screenshots", description = "Capture screen images and export to Portable Network Graphic (.PNG) format." ) @@ -84,7 +84,8 @@ public class ScreenshotPlugin extends ProgramPlugin { RenderedImage image = generateImage(activeComponent); String componentName = - ((DockableComponent) activeComponent).getComponentWindowingPlaceholder().getName(); + ((DockableComponent) activeComponent).getComponentWindowingPlaceholder() + .getName(); File file = getFile(componentName + ".png"); if (file != null) { @@ -93,7 +94,8 @@ public class ScreenshotPlugin extends ProgramPlugin { } }; captureActiveWindowAction.setAddToAllWindows(true); - captureActiveWindowAction.setDescription("Takes a screenshot of the active component provider and exports it to PNG format."); + captureActiveWindowAction.setDescription( + "Takes a screenshot of the active component provider and exports it to PNG format."); captureActiveWindowAction.setKeyBindingData(new KeyBindingData(KeyEvent.VK_F11, InputEvent.ALT_DOWN_MASK)); String group = "ScreenCapture"; @@ -118,7 +120,8 @@ public class ScreenshotPlugin extends ProgramPlugin { } }; captureToolFrameAction.setAddToAllWindows(true); - captureToolFrameAction.setDescription("Takes a screenshot of the active tool and exports it to PNG format."); + captureToolFrameAction.setDescription( + "Takes a screenshot of the active tool and exports it to PNG format."); captureToolFrameAction.setKeyBindingData(new KeyBindingData(KeyEvent.VK_F12, InputEvent.ALT_DOWN_MASK)); captureToolFrameAction.setMenuBarData(new MenuData(new String[] { ToolConstants.MENU_TOOLS, diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/runtimeinfo/RuntimeInfoPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/runtimeinfo/RuntimeInfoPlugin.java index a4c8e1e558..64e218ef9c 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/runtimeinfo/RuntimeInfoPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/runtimeinfo/RuntimeInfoPlugin.java @@ -27,7 +27,7 @@ import ghidra.util.HelpLocation; @PluginInfo( status = PluginStatus.RELEASED, packageName = UtilityPluginPackage.NAME, - category = PluginCategoryNames.SUPPORT, + category = PluginCategoryNames.DIAGNOSTIC, shortDescription = "Runtime Information", description = "Plugin for displaying runtime information" ) diff --git a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerPlugin.java b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerPlugin.java index 9e8417af2c..a05bbebb68 100644 --- a/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerPlugin.java +++ b/Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerPlugin.java @@ -19,7 +19,6 @@ import java.util.Iterator; import ghidra.app.CorePluginPackage; import ghidra.app.events.*; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.app.services.*; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -27,20 +26,33 @@ import ghidra.program.model.listing.Program; import ghidra.program.util.ProgramSelection; import ghidra.util.SystemUtilities; +//@formatter:off +@PluginInfo( + status = PluginStatus.RELEASED, + packageName = CorePluginPackage.NAME, + category = "Byte Viewer", + shortDescription = "Displays bytes in memory", + description = "Provides a component for showing the bytes in memory. Additional plugins " + + "provide capabilites for this plugin to show the bytes in various formats (e.g., hex, " + + "octal, decimal). The hex format plugin is loaded by default when this plugin is loaded.", + servicesRequired = { + ProgramManager.class, GoToService.class, NavigationHistoryService.class, + ClipboardService.class + }, + eventsConsumed = { + ProgramLocationPluginEvent.class, ProgramActivatedPluginEvent.class, + ProgramSelectionPluginEvent.class, ProgramHighlightPluginEvent.class, + ProgramClosedPluginEvent.class, ByteBlockChangePluginEvent.class + }, + eventsProduced = { + ProgramLocationPluginEvent.class, ProgramSelectionPluginEvent.class, + ByteBlockChangePluginEvent.class + } +) +//@formatter:on /** - * Visible Plugin to show ByteBlock data in various formats. + * Plugin to show ByteBlock data in various formats. */ -@PluginInfo(status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, category = PluginCategoryNames.BYTE_VIEWER, shortDescription = "Displays bytes in memory", description = "Provides a component for showing the bytes in memory. " + - "Additional plugins provide capabilites for this plugin" + - " to show the bytes in various formats (e.g., hex, octal, decimal)." + - " The hex format plugin is loaded by default when this plugin is loaded.", servicesRequired = { - ProgramManager.class, GoToService.class, NavigationHistoryService.class, - ClipboardService.class, }, eventsConsumed = { ProgramLocationPluginEvent.class, - ProgramActivatedPluginEvent.class, ProgramSelectionPluginEvent.class, - ProgramHighlightPluginEvent.class, ProgramClosedPluginEvent.class, - ByteBlockChangePluginEvent.class, }, eventsProduced = { - ProgramLocationPluginEvent.class, ProgramSelectionPluginEvent.class, - ByteBlockChangePluginEvent.class, }) public class ByteViewerPlugin extends AbstractByteViewerPlugin { public ByteViewerPlugin(PluginTool tool) { diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/DataTypeDecompilerHoverPlugin.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/DataTypeDecompilerHoverPlugin.java index a0a860f6b3..6267f80706 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/DataTypeDecompilerHoverPlugin.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/DataTypeDecompilerHoverPlugin.java @@ -29,7 +29,7 @@ import ghidra.framework.plugintool.util.PluginStatus; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.DECOMPILER, + category = PluginCategoryNames.ANALYSIS, shortDescription = "Data Type Hover", description = "Displays data type information in a tooltip as you hover over a data type name in the decompiler.", servicesProvided = { DecompilerHoverService.class } diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/FunctionSignatureDecompilerHoverPlugin.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/FunctionSignatureDecompilerHoverPlugin.java index 4b3e537886..805464390c 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/FunctionSignatureDecompilerHoverPlugin.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/FunctionSignatureDecompilerHoverPlugin.java @@ -29,7 +29,7 @@ import ghidra.framework.plugintool.util.PluginStatus; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.DECOMPILER, + category = PluginCategoryNames.ANALYSIS, shortDescription = "Function Name Hover", description = "Pop-up display of the function prototype of the hovered-over function name in the decompiler", servicesProvided = { DecompilerHoverService.class } diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/ReferenceDecompilerHoverPlugin.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/ReferenceDecompilerHoverPlugin.java index d63e107387..70463dbc05 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/ReferenceDecompilerHoverPlugin.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/ReferenceDecompilerHoverPlugin.java @@ -29,7 +29,7 @@ import ghidra.framework.plugintool.util.PluginStatus; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.DECOMPILER, + category = PluginCategoryNames.ANALYSIS, shortDescription = "Reference Hover", description = "Pop-up display of \"referred to\" code and data", servicesProvided = { DecompilerHoverService.class } diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/ScalarValueDecompilerHoverPlugin.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/ScalarValueDecompilerHoverPlugin.java index 5e287dd8ae..1fc6894666 100644 --- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/ScalarValueDecompilerHoverPlugin.java +++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/hover/ScalarValueDecompilerHoverPlugin.java @@ -29,7 +29,7 @@ import ghidra.framework.plugintool.util.PluginStatus; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.DECOMPILER, + category = PluginCategoryNames.ANALYSIS, shortDescription = "Scalar Value Hover", description = "Pop-up display of various interpretations of the hovered-over decompiler scalar", servicesProvided = { DecompilerHoverService.class } diff --git a/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/plugin/FidDebugPlugin.java b/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/plugin/FidDebugPlugin.java index c8fb5f6712..41662b4994 100644 --- a/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/plugin/FidDebugPlugin.java +++ b/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/plugin/FidDebugPlugin.java @@ -63,7 +63,7 @@ import ghidra.util.task.TaskMonitor; @PluginInfo( status = PluginStatus.STABLE, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.SUPPORT, + category = PluginCategoryNames.DIAGNOSTIC, shortDescription = "Function ID Debug", description = "This plugin is for debugging function identification libraries." ) diff --git a/Ghidra/Features/Python/src/main/java/ghidra/python/PythonPlugin.java b/Ghidra/Features/Python/src/main/java/ghidra/python/PythonPlugin.java index 723fa34452..f1769d9af5 100644 --- a/Ghidra/Features/Python/src/main/java/ghidra/python/PythonPlugin.java +++ b/Ghidra/Features/Python/src/main/java/ghidra/python/PythonPlugin.java @@ -50,7 +50,7 @@ import resources.Icons; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.INTERPRETERS, + category = PluginCategoryNames.COMMON, shortDescription = "Python Interpreter", description = "Provides an interactive Python Interpreter that is tightly integrated with a loaded Ghidra program.", servicesRequired = { InterpreterPanelService.class }, diff --git a/Ghidra/Features/SourceCodeLookup/src/main/java/ghidra/app/plugin/core/scl/SourceCodeLookupPlugin.java b/Ghidra/Features/SourceCodeLookup/src/main/java/ghidra/app/plugin/core/scl/SourceCodeLookupPlugin.java index 529d03f734..f42dbf2209 100644 --- a/Ghidra/Features/SourceCodeLookup/src/main/java/ghidra/app/plugin/core/scl/SourceCodeLookupPlugin.java +++ b/Ghidra/Features/SourceCodeLookup/src/main/java/ghidra/app/plugin/core/scl/SourceCodeLookupPlugin.java @@ -45,7 +45,7 @@ import ghidra.util.Msg; @PluginInfo( status = PluginStatus.RELEASED, packageName = CorePluginPackage.NAME, - category = PluginCategoryNames.MISC, + category = PluginCategoryNames.CODE_VIEWER, shortDescription = "Source Code Lookup Plugin", description = "Plugin to send requests to the development IDE to lookup symbols in source files.", servicesRequired = { EclipseIntegrationService.class }, diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/PluginCategoryNames.java b/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/PluginCategoryNames.java index 798e78db17..c66d40cc19 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/PluginCategoryNames.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/PluginCategoryNames.java @@ -15,26 +15,33 @@ */ package ghidra.app.plugin; +import ghidra.framework.main.ApplicationLevelPlugin; +import ghidra.framework.plugintool.util.PluginDescription; +import ghidra.framework.plugintool.util.PluginStatus; + +/** + * A listing of commonly used {@link PluginDescription} category names. + *

+ * Note - the Front End tool automatically include plugins that: 1) implement + * {@link ApplicationLevelPlugin}, have the {@link PluginStatus#RELEASED}, and do not have the + * {@link #EXAMPLES} category. If you wish to create an {@link ApplicationLevelPlugin} that is not + * automatically included in the Front End, the easiest way to do that is to mark its status as + * {@link PluginStatus#STABLE}. + */ public interface PluginCategoryNames { - String COMMON = GenericPluginCategoryNames.COMMON; - String SUPPORT = GenericPluginCategoryNames.SUPPORT; - String CODE_VIEWER = "Code Viewer"; - String BYTE_VIEWER = "Byte Viewer"; - String GRAPH = "Graph"; - String ANALYSIS = "Analysis"; - String NAVIGATION = "Navigation"; - String SEARCH = "Search"; - String TREE = "Program Tree"; - String TESTING = GenericPluginCategoryNames.TESTING; - String DIAGNOSTIC = "Diagnostic"; - String DIFF = "Code Difference"; - String MISC = GenericPluginCategoryNames.MISC; - String USER_ANNOTATION = "User Annotation"; - String EXAMPLES = GenericPluginCategoryNames.EXAMPLES; - String SELECTION = "Selection"; - String INTERPRETERS = "Interpreters"; - String DEBUGGER = "Debugger"; - String PATCHING = "Patching"; - String DECOMPILER = "Decompiler"; - String UNMANAGED = "Unmanaged"; + + public String ANALYSIS = "Analysis"; + + // common to tools that open programs + public String COMMON = "Common"; + public String CODE_VIEWER = "Code Viewer"; + public String DEBUGGER = "Debugger"; + public String DIAGNOSTIC = "Diagnostic"; + public String EXAMPLES = "Examples"; + public String FRAMEWORK = "Framework"; + public String GRAPH = "Graph"; + public String NAVIGATION = "Navigation"; + public String SEARCH = "Search"; + public String SELECTION = "Selection"; + public String PROGRAM_ORGANIZATION = "Program Organization"; } diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/gui/ThemeManagerPlugin.java b/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/gui/ThemeManagerPlugin.java index 345c82364c..c2239568c6 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/gui/ThemeManagerPlugin.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/gui/ThemeManagerPlugin.java @@ -31,7 +31,7 @@ import ghidra.util.HelpLocation; @PluginInfo( status = PluginStatus.RELEASED, packageName = UtilityPluginPackage.NAME, - category = PluginCategoryNames.SUPPORT, + category = PluginCategoryNames.FRAMEWORK, shortDescription = "Manages themes for the Ghidra GUI", description = "Adds actions and options to manage Themes within Ghidra. " + "This plugin is available only in the Ghidra Project Window." diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndPlugin.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndPlugin.java index a2e6a5c606..085a147eeb 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndPlugin.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndPlugin.java @@ -688,8 +688,8 @@ public class FrontEndPlugin extends Plugin connectionButton.setContentAreaFilled(false); connectionButton.setSelected(isConnected); connectionButton - .setBorder(isConnected ? BorderFactory.createBevelBorder(BevelBorder.LOWERED) - : BorderFactory.createBevelBorder(BevelBorder.RAISED)); + .setBorder(isConnected ? BorderFactory.createBevelBorder(BevelBorder.LOWERED) + : BorderFactory.createBevelBorder(BevelBorder.RAISED)); connectionIconPanel.add(connectionButton); if (isConnected) { @@ -701,7 +701,7 @@ public class FrontEndPlugin extends Plugin } } repositoryLabel - .setText("Project Repository: " + repository.getName() + getAccessString(user)); + .setText("Project Repository: " + repository.getName() + getAccessString(user)); String serverName = repository.getServerInfo().getServerName(); connectionButton.setToolTipText( @@ -973,7 +973,7 @@ public class FrontEndPlugin extends Plugin }; renameToolAction.setPopupMenuData(new MenuData(new String[] { "Rename..." }, "tool")); renameToolAction - .setHelpLocation(new HelpLocation(ToolConstants.TOOL_HELP_TOPIC, "Rename Tool")); + .setHelpLocation(new HelpLocation(ToolConstants.TOOL_HELP_TOPIC, "Rename Tool")); propertiesAction = new ToolButtonAction(PROPERTIES_ACTION_NAME) { @Override @@ -997,7 +997,7 @@ public class FrontEndPlugin extends Plugin new MenuData(new String[] { "Configure Plugins..." }, "zproperties")); propertiesAction - .setHelpLocation(new HelpLocation(ToolConstants.TOOL_HELP_TOPIC, "Configure_Tool")); + .setHelpLocation(new HelpLocation(ToolConstants.TOOL_HELP_TOPIC, "Configure_Tool")); tool.addLocalAction(frontEndProvider, exportToolAction); tool.addLocalAction(frontEndProvider, renameToolAction); diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndTool.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndTool.java index 73caac7e64..8057272720 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndTool.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/FrontEndTool.java @@ -43,7 +43,7 @@ import docking.util.image.ToolIconURL; import docking.widgets.OptionDialog; import generic.jar.ResourceFile; import generic.util.WindowUtilities; -import ghidra.app.plugin.GenericPluginCategoryNames; +import ghidra.app.plugin.PluginCategoryNames; import ghidra.app.util.GenericHelpTopics; import ghidra.framework.Application; import ghidra.framework.LoggingInitialization; @@ -279,7 +279,7 @@ public class FrontEndTool extends PluginTool implements OptionsChangeListener { /** * Add those plugins that implement the ApplicationLevelPlugin interface and have a - * RELEASED status and not (example || testing) category. + * RELEASED status and not example category. */ private void installDefaultApplicationLevelPlugins() { List classNames = new ArrayList<>(); @@ -288,8 +288,7 @@ public class FrontEndTool extends PluginTool implements OptionsChangeListener { PluginDescription pd = PluginDescription.getPluginDescription(pluginClass); String category = pd.getCategory(); - boolean isBadCategory = category.equals(GenericPluginCategoryNames.EXAMPLES) || - category.equals(GenericPluginCategoryNames.TESTING); + boolean isBadCategory = category.equals(PluginCategoryNames.EXAMPLES); if (pd.getStatus() == PluginStatus.RELEASED && !isBadCategory) { classNames.add(pluginClass.getName()); } 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 025dd5ef52..72a2638a62 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 @@ -51,6 +51,7 @@ public class PluginDescription implements Comparable { private static HashMap, PluginDescription> CACHE = new HashMap<>(); private static final String DOTCLASS_EXT = ".class"; + private static final String NO_CATEGORY = "NO_CATEGORY"; private final Class pluginClass; private final String name; @@ -370,7 +371,7 @@ public class PluginDescription implements Comparable { */ private static PluginDescription createDefaultPluginDescription(Class c) { return new PluginDescription(c, MiscellaneousPluginPackage.NAME, - PluginCategoryNames.UNMANAGED, null, null, PluginStatus.UNSTABLE, false, + NO_CATEGORY, null, null, PluginStatus.UNSTABLE, false, Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), Collections.emptyList()); } diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/CircularPluginA.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/CircularPluginA.java index 9adced6e2d..d3ae825f25 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/CircularPluginA.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/CircularPluginA.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -26,7 +25,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin", description = "Test plugin", servicesProvided = { CircularServiceA.class }, diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/CircularPluginB.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/CircularPluginB.java index 69da0edca5..910296edc8 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/CircularPluginB.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/CircularPluginB.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -26,7 +25,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin", description = "Test plugin", servicesProvided = CircularServiceB.class, diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginA.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginA.java index 60c6c91d56..1f4574c159 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginA.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginA.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -33,7 +32,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin", description = "Test plugin", servicesRequired = { DiamondServiceB.class, DiamondServiceC.class} ) diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginB.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginB.java index 14424c1031..09d4ebe388 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginB.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginB.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -33,7 +32,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin", description = "Test plugin", servicesProvided = DiamondServiceB.class, diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginC.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginC.java index f8a86abbfa..d41df6e03a 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginC.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginC.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -33,7 +32,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin", description = "Test plugin", servicesProvided = DiamondServiceC.class, diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginD.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginD.java index c121c9cb48..f06643b823 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginD.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DiamondPluginD.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -33,7 +32,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin", description = "Test plugin", servicesProvided = DiamondServiceD.class) diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DisposeFailPluginA.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DisposeFailPluginA.java index cab4780550..fc2ed7af90 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DisposeFailPluginA.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/DisposeFailPluginA.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -26,7 +25,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin", description = "Test plugin" ) //@formatter:on diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/InitFailPluginA.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/InitFailPluginA.java index a238505872..d9d2981575 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/InitFailPluginA.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/InitFailPluginA.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -26,7 +25,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin", description = "Test plugin", servicesRequired = { InitFailServiceB.class } ) diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/InitFailPluginB.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/InitFailPluginB.java index 44d5c4e081..3bfd86a87f 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/InitFailPluginB.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/InitFailPluginB.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -26,7 +25,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin", description = "Test plugin", servicesProvided = { InitFailServiceB.class } ) diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/IsolatedFailPluginA.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/IsolatedFailPluginA.java index b701c7e984..fe449f8237 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/IsolatedFailPluginA.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/IsolatedFailPluginA.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -26,7 +25,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin", description = "Test plugin") //@formatter:on diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/IsolatedFailPluginB.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/IsolatedFailPluginB.java index 459bf4c102..05aed1481f 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/IsolatedFailPluginB.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/IsolatedFailPluginB.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -26,7 +25,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin", description = "Test plugin") //@formatter:on diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/MissingDepPluginA.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/MissingDepPluginA.java index 0965283993..140a606e49 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/MissingDepPluginA.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/MissingDepPluginA.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -27,7 +26,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin", description = "Test plugin", servicesRequired = { MissingDepServiceB.class } ) diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/MissingDepPluginB.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/MissingDepPluginB.java index bd94be8b07..e574b5fe1b 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/MissingDepPluginB.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/MissingDepPluginB.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -27,7 +26,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin", description = "Test plugin", servicesProvided = MissingDepServiceB.class) diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/NameConflictingPlugin.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/NameConflictingPlugin.java index ff97a0ff06..787ad6aad2 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/NameConflictingPlugin.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/NameConflictingPlugin.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -28,7 +27,7 @@ import ghidra.framework.plugintool.util.PluginStatus; */ @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin name collision", description = "Test plugin name collision.") //@formatter:on diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/secondconflict/NameConflictingPlugin.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/secondconflict/NameConflictingPlugin.java index f30df9b5d3..dde0195324 100644 --- a/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/secondconflict/NameConflictingPlugin.java +++ b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/plugintool/testplugins/secondconflict/NameConflictingPlugin.java @@ -16,7 +16,6 @@ package ghidra.framework.plugintool.testplugins.secondconflict; import ghidra.app.DeveloperPluginPackage; -import ghidra.app.plugin.PluginCategoryNames; import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.util.PluginStatus; @@ -28,7 +27,7 @@ import ghidra.framework.plugintool.util.PluginStatus; //@formatter:off @PluginInfo(status = PluginStatus.HIDDEN, packageName = DeveloperPluginPackage.NAME, - category = PluginCategoryNames.UNMANAGED, + category = "NONE", shortDescription = "Test plugin name collision", description = "Test plugin name collision.") //@formatter:on