GP-3896: formatting

GP-3896: going with the trivial solution
This commit is contained in:
d-millar 2023-10-03 09:20:03 -04:00
parent 4b2bc8985b
commit 910525fbc5

View file

@ -37,11 +37,8 @@ import ghidra.dbg.target.TargetMethod.ParameterDescription;
import ghidra.dbg.target.schema.*; import ghidra.dbg.target.schema.*;
import ghidra.dbg.util.PathUtils; import ghidra.dbg.util.PathUtils;
@TargetObjectSchemaInfo( @TargetObjectSchemaInfo(name = "Exception", elements = {
name = "Exception", @TargetElementType(type = Void.class) }, attributes = {
elements = {
@TargetElementType(type = Void.class) },
attributes = {
@TargetAttributeType(type = Object.class) }) @TargetAttributeType(type = Object.class) })
public class DbgModelTargetExceptionImpl extends DbgModelTargetObjectImpl public class DbgModelTargetExceptionImpl extends DbgModelTargetObjectImpl
implements DbgModelTargetException { implements DbgModelTargetException {
@ -102,6 +99,7 @@ public class DbgModelTargetExceptionImpl extends DbgModelTargetObjectImpl
@Override @Override
public void eventSelected(AbstractDbgEvent<?> event, DbgCause cause) { public void eventSelected(AbstractDbgEvent<?> event, DbgCause cause) {
DbgManagerImpl manager = getManager();
changeAttributes(List.of(), List.of(), Map.of( // changeAttributes(List.of(), List.of(), Map.of( //
MODIFIED_ATTRIBUTE_NAME, false), "Refreshed"); MODIFIED_ATTRIBUTE_NAME, false), "Refreshed");
if (event instanceof DbgExceptionEvent) { if (event instanceof DbgExceptionEvent) {
@ -111,6 +109,8 @@ public class DbgModelTargetExceptionImpl extends DbgModelTargetObjectImpl
.setFocus(this); .setFocus(this);
changeAttributes(List.of(), List.of(), Map.of( // changeAttributes(List.of(), List.of(), Map.of( //
MODIFIED_ATTRIBUTE_NAME, true), "Refreshed"); MODIFIED_ATTRIBUTE_NAME, true), "Refreshed");
manager.getEventListeners().fire.consoleOutput(
"Exception " + filter.getExceptionCode() + " : " + filter.getName() + "\n", 0);
} }
} }
} }
@ -129,10 +129,9 @@ public class DbgModelTargetExceptionImpl extends DbgModelTargetObjectImpl
ParameterDescription.create(Integer.class, EXECUTE_OPTION_ATTRIBUTE_NAME, false, ParameterDescription.create(Integer.class, EXECUTE_OPTION_ATTRIBUTE_NAME, false,
execOption.getOption(), EXECUTE_OPTION_ATTRIBUTE_NAME, "filter execution option"); execOption.getOption(), EXECUTE_OPTION_ATTRIBUTE_NAME, "filter execution option");
map.put(EXECUTE_OPTION_ATTRIBUTE_NAME, execDesc); map.put(EXECUTE_OPTION_ATTRIBUTE_NAME, execDesc);
ParameterDescription<Integer> contDesc = ParameterDescription<Integer> contDesc = ParameterDescription.create(Integer.class,
ParameterDescription.create(Integer.class, CONTINUE_OPTION_ATTRIBUTE_NAME, false, CONTINUE_OPTION_ATTRIBUTE_NAME, false, contOption.getOption(),
contOption.getOption(), CONTINUE_OPTION_ATTRIBUTE_NAME, CONTINUE_OPTION_ATTRIBUTE_NAME, "filter continuation option");
"filter continuation option");
map.put(CONTINUE_OPTION_ATTRIBUTE_NAME, contDesc); map.put(CONTINUE_OPTION_ATTRIBUTE_NAME, contDesc);
return map; return map;
} }
@ -146,8 +145,8 @@ public class DbgModelTargetExceptionImpl extends DbgModelTargetObjectImpl
this.changeAttributes(List.of(), Map.of(COMMAND_ATTRIBUTE_NAME, value), this.changeAttributes(List.of(), Map.of(COMMAND_ATTRIBUTE_NAME, value),
"Modified"); "Modified");
String cmd = (String) getCachedAttribute(COMMAND_ATTRIBUTE_NAME); String cmd = (String) getCachedAttribute(COMMAND_ATTRIBUTE_NAME);
return manager.execute( return manager
new DbgSetFilterCommandCommand(manager, getEventIndex(), cmd)); .execute(new DbgSetFilterCommandCommand(manager, getEventIndex(), cmd));
} }
throw new DebuggerIllegalArgumentException("Command should be a string"); throw new DebuggerIllegalArgumentException("Command should be a string");
case COMMAND2_ATTRIBUTE_NAME: case COMMAND2_ATTRIBUTE_NAME: