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

Merge remote-tracking branch 'origin/GP-3281_ghidragon_fix_to_allow_mulitple_file_archives_with_same_name'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-04-10 07:56:05 -04:00
parent 08ea793ac9 5db99f4167
commit eaf3f32121
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/tree/ArchiveRootNode.java
View File

@@ -222,8 +222,8 @@ public class ArchiveRootNode extends DataTypeTreeNode {
int index = Collections.binarySearch(allChildrenList, node);
if (index < 0) {
index = -index - 1;
addNode(index, node);
}
addNode(index, node);
}
}

12
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/tree/FileArchiveNode.java
View File

@@ -30,10 +30,12 @@ public class FileArchiveNode extends ArchiveNode {
new GIcon("icon.plugin.datatypes.tree.node.archive.file.checked.out.exclusive");
FileArchive fileArchive; // casted reference for easy access
String fullName;
public FileArchiveNode(FileArchive archive, ArrayPointerFilterState filterState) {
super(archive, filterState);
this.fileArchive = archive;
fullName = archive.getName() + ": " + archive.getFile().getAbsolutePath();
}
@Override
@@ -58,6 +60,16 @@ public class FileArchiveNode extends ArchiveNode {
return "[Unsaved New Archive]";
}
@Override
public String getName() {
return fullName;
}
@Override
public String getDisplayText() {
return archive.getName();
}
public boolean hasWriteLock() {
return fileArchive.hasWriteLock();
}