yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

GP-1288: post-review fixes

Browse source
This commit is contained in:
d-millar 2021-09-30 17:25:25 -04:00
parent 2c3d6704af
commit 09f00348fc
7 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface2/DbgModelTargetExceptionContainer.java
View file

@ -19,7 +19,7 @@ import ghidra.dbg.target.TargetAggregate;
import ghidra.dbg.target.schema.*; import ghidra.dbg.target.schema.*;
@TargetObjectSchemaInfo( @TargetObjectSchemaInfo(
name = "EventContainer", name = "ExceptionContainer",
elements = { elements = {
@TargetElementType(type = DbgModelTargetException.class) }, @TargetElementType(type = DbgModelTargetException.class) },
attributes = { attributes = {

6
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/impl/DbgModelTargetExecutionOptionImpl.java
View file

@ -26,7 +26,7 @@ import agent.dbgeng.model.iface2.*;
import ghidra.dbg.target.schema.*; import ghidra.dbg.target.schema.*;
@TargetObjectSchemaInfo( @TargetObjectSchemaInfo(
name = "ExecutionFilter", name = "ExecutionOption",
elements = { elements = {
@TargetElementType(type = Void.class) }, @TargetElementType(type = Void.class) },
attributes = { attributes = {
@ -39,7 +39,7 @@ public class DbgModelTargetExecutionOptionImpl extends DbgModelTargetObjectImpl
public DbgModelTargetExecutionOptionImpl(DbgModelTargetEvent event, public DbgModelTargetExecutionOptionImpl(DbgModelTargetEvent event,
DebugFilterExecutionOption option) { DebugFilterExecutionOption option) {
super(event.getModel(), event, "Execute", "ExecutionFilter"); super(event.getModel(), event, "Execute", "ExecutionOption");
this.event = event; this.event = event;
this.getModel().addModelObject(option, this); this.getModel().addModelObject(option, this);
this.optionExc = option; this.optionExc = option;
@ -48,7 +48,7 @@ public class DbgModelTargetExecutionOptionImpl extends DbgModelTargetObjectImpl
public DbgModelTargetExecutionOptionImpl(DbgModelTargetException exc, public DbgModelTargetExecutionOptionImpl(DbgModelTargetException exc,
DebugFilterExecutionOption option) { DebugFilterExecutionOption option) {
super(exc.getModel(), exc, "Execute", "ExecutionFilter"); super(exc.getModel(), exc, "Execute", "ExecutionOption");
this.event = exc; this.event = exc;
this.getModel().addModelObject(option, this); this.getModel().addModelObject(option, this);
this.optionExc = option; this.optionExc = option;

2
Ghidra/Debug/Debugger/certification.manifest
View file

@ -148,6 +148,7 @@ src/main/resources/images/breakpoints-enable-all.png||GHIDRA||||END|
src/main/resources/images/breakpoints-make-effective.png||GHIDRA||||END| src/main/resources/images/breakpoints-make-effective.png||GHIDRA||||END|
src/main/resources/images/breakpoints.png||GHIDRA||||END| src/main/resources/images/breakpoints.png||GHIDRA||||END|
src/main/resources/images/closedFolder.png||Modified Nuvola Icons - LGPL 2.1||||END| src/main/resources/images/closedFolder.png||Modified Nuvola Icons - LGPL 2.1||||END|
src/main/resources/images/conf.png||GHIDRA||||END|
src/main/resources/images/connect.png||GHIDRA||||END| src/main/resources/images/connect.png||GHIDRA||||END|
src/main/resources/images/console.png||GHIDRA||||END| src/main/resources/images/console.png||GHIDRA||||END|
src/main/resources/images/continue.png||GHIDRA||||END| src/main/resources/images/continue.png||GHIDRA||||END|
@ -176,6 +177,7 @@ src/main/resources/images/stepout.png||GHIDRA||||END|
src/main/resources/images/stepover.png||GHIDRA||||END| src/main/resources/images/stepover.png||GHIDRA||||END|
src/main/resources/images/stop.png||GHIDRA||||END| src/main/resources/images/stop.png||GHIDRA||||END|
src/main/resources/images/sync_enabled.png||GHIDRA||||END| src/main/resources/images/sync_enabled.png||GHIDRA||||END|
src/main/resources/images/system-switch-user.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
src/main/resources/images/table.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| src/main/resources/images/table.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END|
src/main/resources/images/text-xml.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/text-xml.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
src/main/resources/images/thread.png||GHIDRA||||END| src/main/resources/images/thread.png||GHIDRA||||END|

5
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/DebuggerResources.java
View file

@ -170,6 +170,9 @@ public interface DebuggerResources {
ImageIcon ICON_BLANK = ResourceManager.loadImage("images/blank.png"); ImageIcon ICON_BLANK = ResourceManager.loadImage("images/blank.png");
ImageIcon ICON_PACKAGE = ResourceManager.loadImage("images/debugger32.png"); ImageIcon ICON_PACKAGE = ResourceManager.loadImage("images/debugger32.png");
ImageIcon ICON_CONFIG = ResourceManager.loadImage("images/conf.png");
ImageIcon ICON_TOGGLE = ResourceManager.loadImage("images/system-switch-user.png");
HelpLocation HELP_PACKAGE = new HelpLocation("Debugger", "package"); HelpLocation HELP_PACKAGE = new HelpLocation("Debugger", "package");
String HELP_ANCHOR_PLUGIN = "plugin"; String HELP_ANCHOR_PLUGIN = "plugin";
@ -1212,7 +1215,7 @@ public interface DebuggerResources {
abstract class AbstractToggleAction extends DockingAction { abstract class AbstractToggleAction extends DockingAction {
public static final String NAME = "Toggle"; public static final String NAME = "Toggle";
public static final Icon ICON = ICON_BREAKPOINT_MIXED_ED_MARKER; public static final Icon ICON = ICON_TOGGLE;
public static final String HELP_ANCHOR = "toggle_option"; public static final String HELP_ANCHOR = "toggle_option";
public static HelpLocation help(Plugin owner) { public static HelpLocation help(Plugin owner) {

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsProvider.java
View file

@ -339,7 +339,7 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter
attachDialog = new DebuggerAttachDialog(this); attachDialog = new DebuggerAttachDialog(this);
breakpointDialog = new DebuggerBreakpointDialog(this); breakpointDialog = new DebuggerBreakpointDialog(this);
configDialog = new DebuggerMethodInvocationDialog(tool, "Configuration", "Configure", configDialog = new DebuggerMethodInvocationDialog(tool, "Configuration", "Configure",
DebuggerResources.ICON_LAUNCH); DebuggerResources.ICON_CONFIG);
} }
private void addToPanel(ObjectPane p) throws Exception { private void addToPanel(ObjectPane p) throws Exception {

BIN
Ghidra/Debug/Debugger/src/main/resources/images/conf.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 787 B

BIN
Ghidra/Debug/Debugger/src/main/resources/images/system-switch-user.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 761 B