Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-5881 Minor Structure editor event handling improvement

ghidra1296778319ea6
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorModel.java
index 8e78310760..de33472064 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorModel.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorModel.java
@@ -75,7 +75,6 @@ public abstract class CompEditorModel<T extends Composite> extends CompositeEdit
endFieldEditing();
}
- FieldSelection saveSelection = new FieldSelection(selection);
T originalDt = getOriginalComposite();
if (originalDt == null || originalDTM == null) {
throw new IllegalStateException(
@@ -94,6 +93,9 @@ public abstract class CompEditorModel<T extends Composite> extends CompositeEdit
}
int transactionID = originalDTM.startTransaction(action + " " + getTypeName());
try {
+ // Disable change listener - will be re-enable during re-load
+ originalDTM.removeDataTypeManagerListener(this);
+
if (originalDtExists) {
// Update the original structure.
if (renamed) {
@@ -115,18 +117,18 @@ public abstract class CompEditorModel<T extends Composite> extends CompositeEdit
originalDt.setDescription(getDescription());
replaceOriginalComponents();
updateOriginalComponentSettings(viewComposite, originalDt);
- load(originalDt);
+ originalDTM.flushEvents();
+ Swing.runLater(() -> load(originalDt));
}
else {
@SuppressWarnings("unchecked")
T dt = (T) originalDTM.resolve(viewComposite, null);
- load(dt);
+ originalDTM.flushEvents();
+ Swing.runLater(() -> load(dt));
}
return true;
}
finally {
- provider.updateTitle();
- setSelection(saveSelection);
originalDTM.endTransaction(transactionID, true);
}
}
@@ -1287,7 +1289,10 @@ public abstract class CompEditorModel<T extends Composite> extends CompositeEdit
}
}
if (reload) {
- load(composite); // reload the structure
+ // reload the structure
+ originalDTM.removeDataTypeManagerListener(this);
+ originalDTM.flushEvents();
+ Swing.runLater(() -> load(composite));
setStatus("Editor reloaded");
return;
}
@@ -1478,14 +1483,18 @@ public abstract class CompEditorModel<T extends Composite> extends CompositeEdit
int response = OptionDialog.showYesNoDialogWithNoAsDefaultButton(
provider.getComponent(), title, message);
if (response == OptionDialog.OPTION_ONE) {
- load(getOriginalComposite());
+ originalDTM.removeDataTypeManagerListener(this);
+ originalDTM.flushEvents();
+ Swing.runLater(() -> load(getOriginalComposite()));
}
}
else {
Composite changedComposite = getOriginalComposite();
if ((changedComposite != null) &&
!viewComposite.isEquivalent(changedComposite)) {
- load(getOriginalComposite());
+ originalDTM.removeDataTypeManagerListener(this);
+ originalDTM.flushEvents();
+ Swing.runLater(() -> load(getOriginalComposite()));
setStatus(viewComposite.getPathName() + " changed outside the editor.",
false);
}