yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

GP-0 Corrected test issues

Browse source
This commit is contained in:
ghidra1 2025-03-26 10:36:32 -04:00
parent f2e8afff9c
commit 1a80aff30a
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorModel.java
View file

@ -692,7 +692,7 @@ abstract public class CompositeEditorModel extends CompositeViewerModel {
if (!isArrayAllowed()) { if (!isArrayAllowed()) {
throw new UsrException("Array not permitted in current context"); throw new UsrException("Array not permitted in current context");
} }
int min = 0; int min = allowsZeroLengthComponents() ? 0 : 1;
int max = getMaxElements(); int max = getMaxElements();
if (isSingleRowSelection()) { if (isSingleRowSelection()) {
if (max != 0) { if (max != 0) {

9
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/StructureEditorModel.java
View file

@ -20,6 +20,8 @@ import java.util.*;
import javax.swing.table.TableColumn; import javax.swing.table.TableColumn;
import org.apache.commons.lang3.StringUtils;
import docking.widgets.OptionDialog; import docking.widgets.OptionDialog;
import docking.widgets.dialogs.InputDialog; import docking.widgets.dialogs.InputDialog;
import docking.widgets.dialogs.InputDialogListener; import docking.widgets.dialogs.InputDialogListener;
@ -1458,7 +1460,7 @@ class StructureEditorModel extends CompEditorModel {
selection.addRange(rowIndex, rowIndex + numComps); selection.addRange(rowIndex, rowIndex + numComps);
DataTypeComponent comp = getComponent(rowIndex); DataTypeComponent comp = getComponent(rowIndex);
// Set the field name and comment the same as before // Set the field name and comment the same as before if unspecified
try { try {
if (comp.getFieldName() == null) { if (comp.getFieldName() == null) {
comp.setFieldName(fieldName); comp.setFieldName(fieldName);
@ -1467,7 +1469,9 @@ class StructureEditorModel extends CompEditorModel {
catch (DuplicateNameException exc) { catch (DuplicateNameException exc) {
Msg.showError(this, null, null, null); Msg.showError(this, null, null, null);
} }
comp.setComment(comment); if (StringUtils.isBlank(comp.getComment())) {
comp.setComment(comment);
}
}); });
fixSelection(); fixSelection();
componentEdited(); componentEdited();
@ -1488,6 +1492,5 @@ class StructureEditorModel extends CompEditorModel {
zeroDtc.getFieldName(), zeroDtc.getComment()); zeroDtc.getFieldName(), zeroDtc.getComment());
} }
} }
zeroDtcStack.clear();
} }
} }

2
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/StructureEditorLockedEnablementTest.java
View file

@ -361,7 +361,7 @@ public class StructureEditorLockedEnablementTest extends AbstractStructureEditor
setSelection(new int[] { 19 }); setSelection(new int[] { 19 });
assertEquals("simpleStructureTypedef", getDataType(19).getDisplayName()); assertEquals("simpleStructureTypedef", getDataType(19).getDisplayName());
assertTrue(!unpackageAction.isEnabled()); assertTrue(unpackageAction.isEnabled());
setSelection(new int[] { 21 }); setSelection(new int[] { 21 });
assertEquals("simpleStructure", getDataType(21).getDisplayName()); assertEquals("simpleStructure", getDataType(21).getDisplayName());

2
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/compositeeditor/StructureEditorUnlockedEnablementTest.java
View file

@ -341,7 +341,7 @@ public class StructureEditorUnlockedEnablementTest extends AbstractStructureEdit
setSelection(new int[] { 19 }); setSelection(new int[] { 19 });
assertEquals("simpleStructureTypedef", getDataType(19).getDisplayName()); assertEquals("simpleStructureTypedef", getDataType(19).getDisplayName());
assertTrue(!unpackageAction.isEnabled()); assertTrue(unpackageAction.isEnabled());
setSelection(new int[] { 21 }); setSelection(new int[] { 21 });
assertEquals("simpleStructure", getDataType(21).getDisplayName()); assertEquals("simpleStructure", getDataType(21).getDisplayName());