From 096b86189627a7fb9d42454b2f645b61ed278098 Mon Sep 17 00:00:00 2001 From: d-millar <33498836+d-millar@users.noreply.github.com> Date: Fri, 24 Feb 2023 16:46:08 -0500 Subject: [PATCH] GP-1768C: post-review fixes --- .../agent/dbgmodel/dbgmodel/main/ModelObject.java | 3 +++ .../model/impl/DelegateDbgModel2TargetObject.java | 11 ++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/dbgmodel/main/ModelObject.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/dbgmodel/main/ModelObject.java index cde26e90cb..1c860086ce 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/dbgmodel/main/ModelObject.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/dbgmodel/main/ModelObject.java @@ -113,14 +113,17 @@ public interface ModelObject extends UnknownEx { void setIndexer(ModelObject indexer); List getElements(); + ModelObject getElement(String key); ModelObject getChild(DataModelManager1 manager, VARIANT v); Map getKeyValueMap(); + ModelObject getKeyValueByEnum(String key); Map getRawValueMap(); + ModelObject getRawValueByEnum(String key); Object getValue(); diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/model/impl/DelegateDbgModel2TargetObject.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/model/impl/DelegateDbgModel2TargetObject.java index 478c351000..89f298bafe 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/model/impl/DelegateDbgModel2TargetObject.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/model/impl/DelegateDbgModel2TargetObject.java @@ -178,14 +178,6 @@ public class DelegateDbgModel2TargetObject extends DbgModel2TargetObjectImpl imp String lkey = key; String pname = parent.getName(); - /* - * if (object.getKind().equals(ModelObjectKind.OBJECT_METHOD) || - * lkey.contains(")")) { mixins.add(DbgModelTargetMethod.class); // NB: We're - * passing the parent's mixin model to the method on the assumption // the init - * methods will need to know that the method's children have various // - * properties. lkey = pname; pname = ""; } - */ - if (object.getKind().equals(ModelObjectKind.OBJECT_METHOD)) { mixins.add(DbgModelTargetMethod.class); } else { @@ -306,7 +298,8 @@ public class DelegateDbgModel2TargetObject extends DbgModel2TargetObjectImpl imp if (state != DbgState.EXIT) { setExecutionState(exec, "Refreshed"); } - } else { + } + else { TargetExecutionState previous = this.getExecutionState(); if (!previous.equals(TargetExecutionState.INACTIVE)) { setExecutionState(exec, "Refreshed");