mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-08-08 07:40:39 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-7118 - Updated Structure Editor to reloaded when the description is

Browse Source 
changed outside of the editor
This commit is contained in:
dragonmacher
2026-08-05 14:23:57 -04:00
parent ece613805d
commit 9734de71f9
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompEditorModel.java
View File

@@ -57,7 +57,7 @@ public abstract class CompEditorModel<T extends Composite> extends CompositeEdit
public void load(T dataType) { public void load(T dataType) {
if (dataType.isDeleted()) { if (dataType.isDeleted()) {
// This can occur when mayny events get lumped together and a change event triggers // This can occur when many events get lumped together and a change event triggers
// a delayed reload prior to datatype removal and its event // a delayed reload prior to datatype removal and its event
if (dataType == originalComposite) { if (dataType == originalComposite) {
// Re-route to dataTypeRemoved callback after restoring listener. // Re-route to dataTypeRemoved callback after restoring listener.
@@ -884,7 +884,7 @@ public abstract class CompEditorModel<T extends Composite> extends CompositeEdit
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
// TODO: May need special logic if dtc is zero-length component // Note: May need special logic if dtc is zero-length component
int length = getLength(); int length = getLength();
int nextCompOffset = dtc.getEndOffset() + 1; int nextCompOffset = dtc.getEndOffset() + 1;
if (nextCompOffset >= length) { if (nextCompOffset >= length) {
@@ -1513,8 +1513,7 @@ public abstract class CompEditorModel<T extends Composite> extends CompositeEdit
} }
else { else {
Composite changedComposite = getOriginalComposite(); Composite changedComposite = getOriginalComposite();
if ((changedComposite != null) && if (changedComposite != null) {
!viewComposite.isEquivalent(changedComposite)) {
originalDTM.removeDataTypeManagerListener(this); originalDTM.removeDataTypeManagerListener(this);
originalDTM.flushEvents(); originalDTM.flushEvents();
Swing.runLater(() -> load(getOriginalComposite())); Swing.runLater(() -> load(getOriginalComposite()));