GP-4485: Re-configure default Debugger.tool for Trace RMI

NationalSecurityAgency · Apr 15, 2024 · 3b21d0b · 3b21d0b
1 parent 636dc6f
commit 3b21d0b
Show file tree

Hide file tree

Showing 6 changed files with 264 additions and 868 deletions.
diff --git a/...ghidra/app/plugin/core/debug/gui/tracermi/connection/TraceRmiConnectionManagerPlugin.java b/...ghidra/app/plugin/core/debug/gui/tracermi/connection/TraceRmiConnectionManagerPlugin.java
@@ -31,7 +31,7 @@
  """,
  category = PluginCategoryNames.DEBUGGER,
  packageName = DebuggerPluginPackage.NAME,
- status = PluginStatus.STABLE,
+ status = PluginStatus.RELEASED,
  eventsConsumed = {
  TraceActivatedPluginEvent.class,
  TraceInactiveCoordinatesPluginEvent.class,

diff --git a/...ava/ghidra/app/plugin/core/debug/gui/tracermi/launcher/TraceRmiLauncherServicePlugin.java b/...ava/ghidra/app/plugin/core/debug/gui/tracermi/launcher/TraceRmiLauncherServicePlugin.java
@@ -58,7 +58,7 @@
  """,
  category = PluginCategoryNames.DEBUGGER,
  packageName = DebuggerPluginPackage.NAME,
- status = PluginStatus.UNSTABLE,
+ status = PluginStatus.RELEASED,
  eventsConsumed = {
  ProgramActivatedPluginEvent.class,
  ProgramClosedPluginEvent.class,

diff --git a/...ug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelPlugin.java b/...ug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelPlugin.java
@@ -34,7 +34,7 @@
  description = "GUI to browse objects recorded to the trace",
  category = PluginCategoryNames.DEBUGGER,
  packageName = DebuggerPluginPackage.NAME,
- status = PluginStatus.STABLE,
+ status = PluginStatus.RELEASED,
  eventsConsumed = {
  TraceActivatedPluginEvent.class,
  TraceClosedPluginEvent.class,

diff --git a/...ebug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectsTablePanel.java b/...ebug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectsTablePanel.java
@@ -99,7 +99,7 @@ protected String computePreferenceKey() {
  if (rootSchema == null) {
  return DEFAULT_PREF_KEY;
  }
- return rootSchema + ":" + schemas
+ return rootSchema.getName() + ":" + schemas
  .stream()
  .map(s -> s.getName().toString())
  .collect(Collectors.joining(",")) +

diff --git a/...ebugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsPlugin.java b/...ebugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsPlugin.java
@@ -63,7 +63,7 @@
 public class DebuggerObjectsPlugin extends AbstractDebuggerPlugin
  implements ObjectUpdateService, CollectionChangeListener<DebuggerObjectModel> {
 
- static String TITLE_PROVIDER_TARGETS = "Debugger Objects";
+ static final String TITLE_PROVIDER_TARGETS = "Debugger Objects";
 
  @AutoServiceConsumed
  protected DebuggerInterpreterService interpreterService;