mirror of
https://github.com/NationalSecurityAgency/ghidra
synced 2024-10-02 16:33:49 +00:00
GP-0 corrected typedef default label deferral when auto-naming is in
use.
This commit is contained in:
parent
3deb67aac4
commit
3d0e5bc882
|
@ -421,6 +421,33 @@ class TypedefDB extends DataTypeDB implements TypeDef {
|
|||
return getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDefaultLabelPrefix(MemBuffer buf, Settings settings, int len,
|
||||
DataTypeDisplayOptions options) {
|
||||
if (isAutoNamed()) {
|
||||
return getDataType().getDefaultLabelPrefix(buf, settings, len, options);
|
||||
}
|
||||
return super.getDefaultLabelPrefix(buf, settings, len, options);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDefaultAbbreviatedLabelPrefix() {
|
||||
if (isAutoNamed()) {
|
||||
return getDataType().getDefaultAbbreviatedLabelPrefix();
|
||||
}
|
||||
return super.getDefaultAbbreviatedLabelPrefix();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDefaultOffcutLabelPrefix(MemBuffer buf, Settings settings, int len,
|
||||
DataTypeDisplayOptions options, int offcutLength) {
|
||||
if (isAutoNamed()) {
|
||||
return getDataType().getDefaultOffcutLabelPrefix(buf, settings, len, options,
|
||||
offcutLength);
|
||||
}
|
||||
return super.getDefaultOffcutLabelPrefix(buf, settings, len, options, offcutLength);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getLastChangeTime() {
|
||||
return record.getLongValue(TypedefDBAdapter.TYPEDEF_LAST_CHANGE_TIME_COL);
|
||||
|
|
|
@ -128,6 +128,33 @@ public class TypedefDataType extends GenericDataType implements TypeDef {
|
|||
return getName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDefaultLabelPrefix(MemBuffer buf, Settings settings, int len,
|
||||
DataTypeDisplayOptions options) {
|
||||
if (isAutoNamed()) {
|
||||
return getDataType().getDefaultLabelPrefix(buf, settings, len, options);
|
||||
}
|
||||
return super.getDefaultLabelPrefix(buf, settings, len, options);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDefaultAbbreviatedLabelPrefix() {
|
||||
if (isAutoNamed()) {
|
||||
return getDataType().getDefaultAbbreviatedLabelPrefix();
|
||||
}
|
||||
return super.getDefaultAbbreviatedLabelPrefix();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDefaultOffcutLabelPrefix(MemBuffer buf, Settings settings, int len,
|
||||
DataTypeDisplayOptions options, int offcutLength) {
|
||||
if (isAutoNamed()) {
|
||||
return getDataType().getDefaultOffcutLabelPrefix(buf, settings, len, options,
|
||||
offcutLength);
|
||||
}
|
||||
return super.getDefaultOffcutLabelPrefix(buf, settings, len, options, offcutLength);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasLanguageDependantLength() {
|
||||
return dataType.hasLanguageDependantLength();
|
||||
|
|
Loading…
Reference in a new issue