Skip to content

Commit 5b53b35

Browse files
ryanmkurtzryanmkurtz
committed
Merge remote-tracking branch 'origin/GP-2076_domain_object_events_update--SQUASHED'
2 parents daca354 + 856aa90 commit 5b53b35

File tree

143 files changed

+3190
-3221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+3190
-3221
lines changed

‎Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/breakpoint/DebuggerBreakpointsProvider.java

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import ghidra.debug.api.control.ControlMode;
4444
import ghidra.debug.api.target.Target;
4545
import ghidra.debug.api.tracemgr.DebuggerCoordinates;
46-
import ghidra.framework.model.DomainObject;
46+
import ghidra.framework.model.DomainObjectEvent;
4747
import ghidra.framework.plugintool.*;
4848
import ghidra.framework.plugintool.annotation.AutoServiceConsumed;
4949
import ghidra.pcode.exec.SleighUtils;
@@ -300,8 +300,7 @@ public void actionPerformed(ActionContext context) {
300300

301301
@Override
302302
public boolean isEnabledForContext(ActionContext context) {
303-
return contextHasMatchingBreakpoints(context,
304-
row -> row.getState() != State.ENABLED,
303+
return contextHasMatchingBreakpoints(context, row -> row.getState() != State.ENABLED,
305304
row -> row.getState() != State.ENABLED);
306305
}
307306

@@ -380,8 +379,7 @@ public void actionPerformed(ActionContext context) {
380379

381380
@Override
382381
public boolean isEnabledForContext(ActionContext context) {
383-
return contextHasMatchingBreakpoints(context,
384-
row -> row.getState() != State.DISABLED,
382+
return contextHasMatchingBreakpoints(context, row -> row.getState() != State.DISABLED,
385383
row -> row.getState() != State.DISABLED);
386384
}
387385

@@ -546,8 +544,7 @@ interface SetEmulatedBreakpointConditionAction {
546544

547545
static ActionBuilder builder(Plugin owner) {
548546
String ownerName = owner.getName();
549-
return new ActionBuilder(NAME, ownerName)
550-
.description(DESCRIPTION)
547+
return new ActionBuilder(NAME, ownerName).description(DESCRIPTION)
551548
.popupMenuPath(NAME)
552549
.popupMenuGroup(GROUP)
553550
.helpLocation(new HelpLocation(ownerName, HELP_ANCHOR));
@@ -562,8 +559,7 @@ interface SetEmulatedBreakpointInjectionAction {
562559

563560
static ActionBuilder builder(Plugin owner) {
564561
String ownerName = owner.getName();
565-
return new ActionBuilder(NAME, ownerName)
566-
.description(DESCRIPTION)
562+
return new ActionBuilder(NAME, ownerName).description(DESCRIPTION)
567563
.popupMenuPath(NAME)
568564
.popupMenuGroup(GROUP)
569565
.helpLocation(new HelpLocation(ownerName, HELP_ANCHOR));
@@ -605,7 +601,7 @@ protected class ForBreakpointLocationsTraceListener extends TraceDomainObjectLis
605601

606602
public ForBreakpointLocationsTraceListener(Trace trace) {
607603
this.trace = trace;
608-
listenForUntyped(DomainObject.DO_OBJECT_RESTORED, e -> objectRestored());
604+
listenForUntyped(DomainObjectEvent.RESTORED, e -> objectRestored());
609605
listenFor(TraceBreakpointChangeType.ADDED, this::locationAdded);
610606
listenFor(TraceBreakpointChangeType.CHANGED, this::locationChanged);
611607
listenFor(TraceBreakpointChangeType.LIFESPAN_CHANGED, this::locationLifespanChanged);
@@ -865,9 +861,8 @@ public void breakpointsRemoved(Collection<LogicalBreakpoint> clb) {
865861
}
866862

867863
private void loadBreakpointLocations(Trace trace) {
868-
ControlMode mode = controlService == null
869-
? ControlMode.DEFAULT
870-
: controlService.getCurrentMode(trace);
864+
ControlMode mode =
865+
controlService == null ? ControlMode.DEFAULT : controlService.getCurrentMode(trace);
871866
DebuggerCoordinates currentFor = traceManager.getCurrentFor(trace);
872867
Target target = currentFor.getTarget();
873868
if (!mode.useEmulatedBreakpoints() && target == null) {
@@ -876,8 +871,8 @@ private void loadBreakpointLocations(Trace trace) {
876871
Lifespan span = Lifespan.at(currentFor.getSnap());
877872
Collection<TraceBreakpoint> visible = new ArrayList<>();
878873
for (AddressRange range : trace.getBaseAddressFactory().getAddressSet()) {
879-
Collection<? extends TraceBreakpoint> breaks = trace.getBreakpointManager()
880-
.getBreakpointsIntersecting(span, range);
874+
Collection<? extends TraceBreakpoint> breaks =
875+
trace.getBreakpointManager().getBreakpointsIntersecting(span, range);
881876
if (mode.useEmulatedBreakpoints()) {
882877
visible.addAll(breaks);
883878
}
@@ -1039,21 +1034,19 @@ public void keyPressed(KeyEvent e) {
10391034
});
10401035

10411036
TableColumnModel bptColModel = breakpointTable.getColumnModel();
1042-
TableColumn bptEnCol =
1043-
bptColModel.getColumn(LogicalBreakpointTableColumns.STATE.ordinal());
1037+
TableColumn bptEnCol = bptColModel.getColumn(LogicalBreakpointTableColumns.STATE.ordinal());
10441038
bptEnCol.setCellRenderer(new DebuggerBreakpointStateTableCellRenderer());
1045-
bptEnCol.setCellEditor(
1046-
new DebuggerBreakpointStateTableCellEditor<>(breakpointFilterPanel) {
1047-
@Override
1048-
protected State getToggledState(LogicalBreakpointRow row, State current) {
1049-
boolean mapped = row.isMapped();
1050-
if (!mapped) {
1051-
tool.setStatusInfo(
1052-
"Breakpoint has no locations. Only toggling its bookmark.", true);
1053-
}
1054-
return current.getToggled(mapped);
1039+
bptEnCol.setCellEditor(new DebuggerBreakpointStateTableCellEditor<>(breakpointFilterPanel) {
1040+
@Override
1041+
protected State getToggledState(LogicalBreakpointRow row, State current) {
1042+
boolean mapped = row.isMapped();
1043+
if (!mapped) {
1044+
tool.setStatusInfo("Breakpoint has no locations. Only toggling its bookmark.",
1045+
true);
10551046
}
1056-
});
1047+
return current.getToggled(mapped);
1048+
}
1049+
});
10571050
bptEnCol.setMaxWidth(24);
10581051
bptEnCol.setMinWidth(24);
10591052
TableColumn bptNameCol =

‎Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerLegacyRegionsPanel.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import ghidra.app.plugin.core.debug.utils.DebouncedRowWrappedEnumeratedColumnTableModel;
3535
import ghidra.app.services.DebuggerListingService;
3636
import ghidra.debug.api.tracemgr.DebuggerCoordinates;
37-
import ghidra.framework.model.DomainObject;
37+
import ghidra.framework.model.DomainObjectEvent;
3838
import ghidra.framework.plugintool.AutoService;
3939
import ghidra.framework.plugintool.PluginTool;
4040
import ghidra.framework.plugintool.annotation.AutoServiceConsumed;
@@ -107,9 +107,8 @@ public Object getValueOf(RegionRow row) {
107107
}
108108
}
109109

110-
protected static class RegionTableModel
111-
extends DebouncedRowWrappedEnumeratedColumnTableModel< //
112-
RegionTableColumns, ObjectKey, RegionRow, TraceMemoryRegion> {
110+
protected static class RegionTableModel extends DebouncedRowWrappedEnumeratedColumnTableModel< //
111+
RegionTableColumns, ObjectKey, RegionRow, TraceMemoryRegion> {
113112

114113
public RegionTableModel(PluginTool tool) {
115114
super(tool, "Regions", RegionTableColumns.class, TraceMemoryRegion::getObjectKey,
@@ -142,7 +141,7 @@ protected static Set<TraceMemoryRegion> getSelectedRegions(ActionContext context
142141

143142
private class RegionsListener extends TraceDomainObjectListener {
144143
public RegionsListener() {
145-
listenForUntyped(DomainObject.DO_OBJECT_RESTORED, e -> objectRestored());
144+
listenForUntyped(DomainObjectEvent.RESTORED, e -> objectRestored());
146145

147146
listenFor(TraceMemoryRegionChangeType.ADDED, this::regionAdded);
148147
listenFor(TraceMemoryRegionChangeType.CHANGED, this::regionChanged);

‎Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/AbstractQueryTableModel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import docking.widgets.table.RangeCursorTableHeaderRenderer.SeekListener;
2424
import docking.widgets.table.threaded.ThreadedTableModel;
25+
import ghidra.framework.model.DomainObjectEvent;
2526
import ghidra.framework.model.DomainObjectChangeRecord;
2627
import ghidra.framework.plugintool.Plugin;
2728
import ghidra.trace.model.*;
@@ -38,7 +39,7 @@ public abstract class AbstractQueryTableModel<T> extends ThreadedTableModel<T, T
3839

3940
protected class ListenerForChanges extends TraceDomainObjectListener {
4041
public ListenerForChanges() {
41-
listenForUntyped(Trace.DO_OBJECT_RESTORED, this::objectRestored);
42+
listenForUntyped(DomainObjectEvent.RESTORED, this::objectRestored);
4243
listenFor(TraceObjectChangeType.VALUE_CREATED, this::valueCreated);
4344
listenFor(TraceObjectChangeType.VALUE_DELETED, this::valueDeleted);
4445
listenFor(TraceObjectChangeType.VALUE_LIFESPAN_CHANGED, this::valueLifespanChanged);

‎Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectTreeModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class ObjectTreeModel implements DisplaysModified {
3939
class ListenerForChanges extends TraceDomainObjectListener
4040
implements DomainObjectClosedListener {
4141
public ListenerForChanges() {
42-
listenForUntyped(DomainObject.DO_OBJECT_RESTORED, this::domainObjectRestored);
42+
listenForUntyped(DomainObjectEvent.RESTORED, this::domainObjectRestored);
4343
listenFor(TraceObjectChangeType.CREATED, this::objectCreated);
4444
listenFor(TraceObjectChangeType.VALUE_CREATED, this::valueCreated);
4545
listenFor(TraceObjectChangeType.VALUE_DELETED, this::valueDeleted);

‎Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/modules/DebuggerLegacyModulesPanel.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import ghidra.app.plugin.core.debug.gui.DebuggerResources;
3333
import ghidra.app.plugin.core.debug.utils.DebouncedRowWrappedEnumeratedColumnTableModel;
3434
import ghidra.debug.api.tracemgr.DebuggerCoordinates;
35-
import ghidra.framework.model.DomainObject;
35+
import ghidra.framework.model.DomainObjectEvent;
3636
import ghidra.framework.plugintool.PluginTool;
3737
import ghidra.program.model.address.*;
3838
import ghidra.trace.model.*;
@@ -141,9 +141,8 @@ public Object getValueOf(ModuleRow row) {
141141
}
142142
}
143143

144-
protected static class ModuleTableModel
145-
extends DebouncedRowWrappedEnumeratedColumnTableModel< //
146-
ModuleTableColumns, ObjectKey, ModuleRow, TraceModule> {
144+
protected static class ModuleTableModel extends DebouncedRowWrappedEnumeratedColumnTableModel< //
145+
ModuleTableColumns, ObjectKey, ModuleRow, TraceModule> {
147146

148147
public ModuleTableModel(PluginTool tool, DebuggerModulesProvider provider) {
149148
super(tool, "Modules", ModuleTableColumns.class, TraceModule::getObjectKey,
@@ -158,7 +157,7 @@ public List<ModuleTableColumns> defaultSortOrder() {
158157

159158
private class ModulesListener extends TraceDomainObjectListener {
160159
public ModulesListener() {
161-
listenForUntyped(DomainObject.DO_OBJECT_RESTORED, e -> objectRestored());
160+
listenForUntyped(DomainObjectEvent.RESTORED, e -> objectRestored());
162161

163162
listenFor(TraceModuleChangeType.ADDED, this::moduleAdded);
164163
listenFor(TraceModuleChangeType.CHANGED, this::moduleChanged);

‎Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/modules/DebuggerLegacySectionsPanel.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import ghidra.app.plugin.core.debug.gui.DebuggerResources;
3434
import ghidra.app.plugin.core.debug.utils.DebouncedRowWrappedEnumeratedColumnTableModel;
3535
import ghidra.debug.api.tracemgr.DebuggerCoordinates;
36-
import ghidra.framework.model.DomainObject;
36+
import ghidra.framework.model.DomainObjectEvent;
3737
import ghidra.framework.plugintool.PluginTool;
3838
import ghidra.program.model.address.*;
3939
import ghidra.trace.model.Trace;
@@ -124,9 +124,8 @@ public Object getValueOf(SectionRow row) {
124124
}
125125
}
126126

127-
protected static class SectionTableModel
128-
extends DebouncedRowWrappedEnumeratedColumnTableModel< //
129-
SectionTableColumns, ObjectKey, SectionRow, TraceSection> {
127+
protected static class SectionTableModel extends DebouncedRowWrappedEnumeratedColumnTableModel< //
128+
SectionTableColumns, ObjectKey, SectionRow, TraceSection> {
130129

131130
public SectionTableModel(PluginTool tool) {
132131
super(tool, "Sections", SectionTableColumns.class, TraceSection::getObjectKey,
@@ -141,7 +140,7 @@ public List<SectionTableColumns> defaultSortOrder() {
141140

142141
private class SectionsListener extends TraceDomainObjectListener {
143142
public SectionsListener() {
144-
listenForUntyped(DomainObject.DO_OBJECT_RESTORED, e -> objectRestored());
143+
listenForUntyped(DomainObjectEvent.RESTORED, e -> objectRestored());
145144

146145
/**
147146
* NOTE: No need for Module.ADDED here. A TraceModule is created empty, so when each

‎Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/modules/DebuggerStaticMappingProvider.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import ghidra.app.plugin.core.debug.gui.DebuggerResources.*;
4141
import ghidra.app.plugin.core.debug.utils.DebouncedRowWrappedEnumeratedColumnTableModel;
4242
import ghidra.app.services.*;
43-
import ghidra.framework.model.DomainObject;
43+
import ghidra.framework.model.DomainObjectEvent;
4444
import ghidra.framework.plugintool.*;
4545
import ghidra.framework.plugintool.annotation.AutoServiceConsumed;
4646
import ghidra.program.model.address.*;
@@ -94,9 +94,8 @@ public String getHeader() {
9494
}
9595
}
9696

97-
protected static class MappingTableModel
98-
extends DebouncedRowWrappedEnumeratedColumnTableModel< //
99-
StaticMappingTableColumns, ObjectKey, StaticMappingRow, TraceStaticMapping> {
97+
protected static class MappingTableModel extends DebouncedRowWrappedEnumeratedColumnTableModel< //
98+
StaticMappingTableColumns, ObjectKey, StaticMappingRow, TraceStaticMapping> {
10099

101100
public MappingTableModel(PluginTool tool) {
102101
super(tool, "Mappings", StaticMappingTableColumns.class,
@@ -107,7 +106,7 @@ public MappingTableModel(PluginTool tool) {
107106

108107
protected class ListenerForStaticMappingDisplay extends TraceDomainObjectListener {
109108
public ListenerForStaticMappingDisplay() {
110-
listenForUntyped(DomainObject.DO_OBJECT_RESTORED, e -> objectRestored());
109+
listenForUntyped(DomainObjectEvent.RESTORED, e -> objectRestored());
111110
listenFor(TraceStaticMappingChangeType.ADDED, this::staticMappingAdded);
112111
listenFor(TraceStaticMappingChangeType.DELETED, this::staticMappingDeleted);
113112
}

‎Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/register/DebuggerRegistersProvider.java

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import ghidra.debug.api.target.Target;
5353
import ghidra.debug.api.tracemgr.DebuggerCoordinates;
5454
import ghidra.docking.settings.*;
55-
import ghidra.framework.model.DomainObject;
55+
import ghidra.framework.model.DomainObjectEvent;
5656
import ghidra.framework.model.DomainObjectChangeRecord;
5757
import ghidra.framework.options.AutoOptions;
5858
import ghidra.framework.options.SaveState;
@@ -104,8 +104,7 @@ interface ClearRegisterType {
104104

105105
static ActionBuilder builder(Plugin owner) {
106106
String ownerName = owner.getName();
107-
return new ActionBuilder(NAME, ownerName)
108-
.description(DESCRIPTION);
107+
return new ActionBuilder(NAME, ownerName).description(DESCRIPTION);
109108
}
110109
}
111110

@@ -116,8 +115,7 @@ interface RegisterTypeSettings {
116115

117116
static ActionBuilder builder(Plugin owner) {
118117
String ownerName = owner.getName();
119-
return new ActionBuilder(NAME, ownerName)
120-
.description(DESCRIPTION)
118+
return new ActionBuilder(NAME, ownerName).description(DESCRIPTION)
121119
.popupMenuPath(NAME)
122120
.helpLocation(new HelpLocation(ownerName, HELP_ANCHOR));
123121
}
@@ -152,9 +150,8 @@ protected enum RegisterTableColumns
152150
RegisterRow::isValueEditable, SortDirection.ASCENDING) {
153151
private static final RegisterValueCellRenderer RENDERER =
154152
new RegisterValueCellRenderer();
155-
private static final SettingsDefinition[] DEFS = new SettingsDefinition[] {
156-
FormatSettingsDefinition.DEF_HEX,
157-
};
153+
private static final SettingsDefinition[] DEFS =
154+
new SettingsDefinition[] { FormatSettingsDefinition.DEF_HEX, };
158155

159156
@Override
160157
public GColumnRenderer<BigInteger> getRenderer() {
@@ -186,9 +183,8 @@ <T> RegisterTableColumns(String header, int width, Class<T> cls,
186183

187184
@SuppressWarnings("unchecked")
188185
<T> RegisterTableColumns(String header, int width, Class<T> cls,
189-
Function<RegisterRow, T> getter,
190-
BiConsumer<RegisterRow, T> setter, Predicate<RegisterRow> editable,
191-
SortDirection direction) {
186+
Function<RegisterRow, T> getter, BiConsumer<RegisterRow, T> setter,
187+
Predicate<RegisterRow> editable, SortDirection direction) {
192188
this.header = header;
193189
this.width = width;
194190
this.cls = cls;
@@ -277,7 +273,7 @@ protected static boolean sameCoordinates(DebuggerCoordinates a, DebuggerCoordina
277273

278274
class TraceChangeListener extends TraceDomainObjectListener {
279275
public TraceChangeListener() {
280-
listenForUntyped(DomainObject.DO_OBJECT_RESTORED, e -> objectRestored(e));
276+
listenForUntyped(DomainObjectEvent.RESTORED, e -> objectRestored(e));
281277
listenFor(TraceMemoryBytesChangeType.CHANGED, this::registerValueChanged);
282278
listenFor(TraceMemoryStateChangeType.CHANGED, this::registerStateChanged);
283279
listenFor(TraceCodeChangeType.ADDED, this::registerTypeAdded);
@@ -899,8 +895,7 @@ void writeRegisterDataType(Register register, DataType dataType) {
899895
getRegisterMemorySpace(register.getAddressSpace(), true).getCodeSpace(true);
900896
long snap = current.getViewSnap();
901897
TracePlatform platform = current.getPlatform();
902-
code.definedUnits()
903-
.clear(platform, Lifespan.at(snap), register, TaskMonitor.DUMMY);
898+
code.definedUnits().clear(platform, Lifespan.at(snap), register, TaskMonitor.DUMMY);
904899
if (dataType != null) {
905900
code.definedData().create(platform, Lifespan.nowOn(snap), register, dataType);
906901
}
@@ -936,8 +931,8 @@ void writeRegisterValueRepresentation(Register register, String representation)
936931
return;
937932
}
938933
try {
939-
RegisterValue rv = TraceRegisterUtils.encodeValueRepresentationHackPointer(
940-
register, data, representation);
934+
RegisterValue rv = TraceRegisterUtils.encodeValueRepresentationHackPointer(register,
935+
data, representation);
941936
writeRegisterValue(rv);
942937
}
943938
catch (DataTypeEncodeException e) {
@@ -1109,9 +1104,7 @@ public LinkedHashSet<Register> computeDefaultRegisterFavorites(TracePlatform pla
11091104
protected static TraceMemorySpace getRegisterMemorySpace(DebuggerCoordinates coords,
11101105
AddressSpace space, boolean createIfAbsent) {
11111106
if (!space.isRegisterSpace()) {
1112-
return coords.getTrace()
1113-
.getMemoryManager()
1114-
.getMemorySpace(space, createIfAbsent);
1107+
return coords.getTrace().getMemoryManager().getMemorySpace(space, createIfAbsent);
11151108
}
11161109
TraceThread thread = coords.getThread();
11171110
if (thread == null) {
@@ -1122,17 +1115,14 @@ protected static TraceMemorySpace getRegisterMemorySpace(DebuggerCoordinates coo
11221115
.getMemoryRegisterSpace(thread, coords.getFrame(), createIfAbsent);
11231116
}
11241117

1125-
protected TraceMemorySpace getRegisterMemorySpace(AddressSpace space,
1126-
boolean createIfAbsent) {
1118+
protected TraceMemorySpace getRegisterMemorySpace(AddressSpace space, boolean createIfAbsent) {
11271119
return getRegisterMemorySpace(current, space, createIfAbsent);
11281120
}
11291121

11301122
protected static TraceCodeSpace getRegisterCodeSpace(DebuggerCoordinates coords,
11311123
AddressSpace space, boolean createIfAbsent) {
11321124
if (!space.isRegisterSpace()) {
1133-
return coords.getTrace()
1134-
.getCodeManager()
1135-
.getCodeSpace(space, createIfAbsent);
1125+
return coords.getTrace().getCodeManager().getCodeSpace(space, createIfAbsent);
11361126
}
11371127
TraceThread thread = coords.getThread();
11381128
if (thread == null) {

‎Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/thread/DebuggerLegacyThreadsPanel.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import ghidra.app.services.DebuggerTraceManagerService;
3434
import ghidra.debug.api.tracemgr.DebuggerCoordinates;
3535
import ghidra.docking.settings.Settings;
36-
import ghidra.framework.model.DomainObject;
36+
import ghidra.framework.model.DomainObjectEvent;
3737
import ghidra.framework.model.DomainObjectChangeRecord;
3838
import ghidra.framework.plugintool.AutoService;
3939
import ghidra.framework.plugintool.annotation.AutoServiceConsumed;
@@ -120,14 +120,13 @@ protected static class ThreadTableModel extends RowWrappedEnumeratedColumnTableM
120120

121121
public ThreadTableModel(DebuggerThreadsProvider provider) {
122122
super(provider.getTool(), "Threads", ThreadTableColumns.class,
123-
TraceThread::getObjectKey, t -> new ThreadRow(provider, t),
124-
ThreadRow::getThread);
123+
TraceThread::getObjectKey, t -> new ThreadRow(provider, t), ThreadRow::getThread);
125124
}
126125
}
127126

128127
private class ForThreadsListener extends TraceDomainObjectListener {
129128
public ForThreadsListener() {
130-
listenForUntyped(DomainObject.DO_OBJECT_RESTORED, this::objectRestored);
129+
listenForUntyped(DomainObjectEvent.RESTORED, this::objectRestored);
131130

132131
listenFor(TraceThreadChangeType.ADDED, this::threadAdded);
133132
listenFor(TraceThreadChangeType.CHANGED, this::threadChanged);

0 commit comments

Comments
 (0)