mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-10 09:13:58 -09:00
Code Issues Packages Projects Releases Wiki Activity

Tests - fixed for timing issue with tree nodes

Browse Source
This commit is contained in:
dragonmacher
2019-06-12 13:43:59 -04:00
parent 2f1c43fac6
commit 1fa2bd7979
3 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/CreatePointerAction.java
View File

@@ -94,6 +94,11 @@ public class CreatePointerAction extends DockingAction {
}
ArchiveNode archiveNode = node.getArchiveNode();
if (archiveNode == null) {
// this can happen as the tree is changing
return false;
}
boolean enabled = archiveNode.isModifiable();
if (archiveNode instanceof BuiltInArchiveNode) {
// these will be put into the program archive

82
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/PackDataTypeAction.java
View File

@@ -32,46 +32,47 @@ public class PackDataTypeAction extends DockingAction {
private DataTypeManagerPlugin plugin;
public PackDataTypeAction(DataTypeManagerPlugin plugin) {
public PackDataTypeAction(DataTypeManagerPlugin plugin) {
super("Pack Data Type", plugin.getName());
this.plugin = plugin;
setPopupMenuData(new MenuData(new String[] {"Pack"}, "Edit"));
setPopupMenuData(new MenuData(new String[] { "Pack" }, "Edit"));
}
@Override
public boolean isEnabledForContext(ActionContext context) {
Object contextObject = context.getContextObject();
if (!(contextObject instanceof GTree)) {
return false;
}
GTree gTree = (GTree)contextObject;
TreePath[] selectionPaths = gTree.getSelectionPaths();
if (selectionPaths.length != 1) {
return false;
}
DataTypeTreeNode node = (DataTypeTreeNode)selectionPaths[0].getLastPathComponent();
@Override
public boolean isEnabledForContext(ActionContext context) {
Object contextObject = context.getContextObject();
if (!(contextObject instanceof GTree)) {
return false;
}
GTree gTree = (GTree) contextObject;
TreePath[] selectionPaths = gTree.getSelectionPaths();
if (selectionPaths.length != 1) {
return false;
}
DataTypeTreeNode node = (DataTypeTreeNode) selectionPaths[0].getLastPathComponent();
if (!(node instanceof DataTypeNode)) {
return false;
}
setEnabled(node.getArchiveNode().isModifiable());
return true;
}
if (!(node instanceof DataTypeNode)) {
return false;
}
setEnabled(node.isModifiable());
return true;
}
@Override
public void actionPerformed(ActionContext context) {
GTree gTree = (GTree)context.getContextObject();
TreePath[] selectionPaths = gTree.getSelectionPaths();
if (selectionPaths.length != 1) {
Msg.error(this, "Pack is only allowed on an individual data type.");
return;
}
TreePath treePath = selectionPaths[0];
final DataTypeNode dataTypeNode = (DataTypeNode) treePath.getLastPathComponent();
DataType dataType = dataTypeNode.getDataType();
DataTypeManager dataTypeManager = dataType.getDataTypeManager();
@Override
public void actionPerformed(ActionContext context) {
GTree gTree = (GTree) context.getContextObject();
TreePath[] selectionPaths = gTree.getSelectionPaths();
if (selectionPaths.length != 1) {
Msg.error(this, "Pack is only allowed on an individual data type.");
return;
}
TreePath treePath = selectionPaths[0];
final DataTypeNode dataTypeNode = (DataTypeNode) treePath.getLastPathComponent();
DataType dataType = dataTypeNode.getDataType();
DataTypeManager dataTypeManager = dataType.getDataTypeManager();
if (dataTypeManager == null) {
Msg.error(this, "Can't pack data type "+dataType.getName()+" without a data type manager.");
Msg.error(this,
"Can't pack data type " + dataType.getName() + " without a data type manager.");
return;
}
@@ -80,23 +81,26 @@ public class PackDataTypeAction extends DockingAction {
try {
// start a transaction
transactionID = dataTypeManager.startTransaction("pack of " + dataType.getName());
packDataType( dataType );
packDataType(dataType);
commit = true;
} catch (InvalidInputException iie) {
}
catch (InvalidInputException iie) {
// TODO Auto-generated catch block
iie.printStackTrace();
} finally {
}
finally {
// commit the changes
dataTypeManager.endTransaction(transactionID, commit);
}
}
}
private void packDataType(DataType dataType) throws InvalidInputException {
if (!(dataType instanceof Structure)) {
Msg.error(this, "Can't pack data type "+dataType.getName()+". It's not a structure.");
Msg.error(this,
"Can't pack data type " + dataType.getName() + ". It's not a structure.");
return;
}
((Structure)dataType).pack(1);
((Structure) dataType).pack(1);
}
}

10
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/PackSizeDataTypeAction.java
View File

@@ -55,7 +55,7 @@ public class PackSizeDataTypeAction extends DockingAction {
if (!(node instanceof DataTypeNode)) {
return false;
}
setEnabled(node.getArchiveNode().isModifiable());
setEnabled(node.isModifiable());
return true;
}
@@ -68,8 +68,8 @@ public class PackSizeDataTypeAction extends DockingAction {
DataType dataType = dataTypeNode.getDataType();
DataTypeManager dataTypeManager = dataType.getDataTypeManager();
if (dataTypeManager == null) {
Msg.error(this, "Can't pack data type " + dataType.getName() +
" without a data type manager.");
Msg.error(this,
"Can't pack data type " + dataType.getName() + " without a data type manager.");
return;
}
@@ -100,8 +100,8 @@ public class PackSizeDataTypeAction extends DockingAction {
private void packDataType(DataType dataType, int packSize) throws InvalidInputException {
if (!(dataType instanceof Structure)) {
Msg.error(this, "Can't pack data type " + dataType.getName() +
". It's not a structure.");
Msg.error(this,
"Can't pack data type " + dataType.getName() + ". It's not a structure.");
return;
}
((Structure) dataType).pack(packSize);