Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-27 19:45:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-0 GhidraProject cleanup of importProgram methods accepting

Browse Source 
DomainFolder or project folder-path arg
This commit is contained in:
ghidra1
2023-02-16 19:45:35 -05:00
parent 4b50ba28a9
commit 6988976f09
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/base/project/GhidraProject.java
+6 -17
View File
@@ -599,21 +599,15 @@ public class GhidraProject {
AutoAnalysisManager mgr = AutoAnalysisManager.getAnalysisManager(program); AutoAnalysisManager mgr = AutoAnalysisManager.getAnalysisManager(program);
mgr.initializeOptions(); mgr.initializeOptions();
} }
openPrograms.put(program, new Integer(id)); openPrograms.put(program, id);
} }
public Program importProgram(File file, Language language, CompilerSpec compilerSpec) public Program importProgram(File file, Language language,
throws CancelledException, DuplicateNameException, InvalidNameException,
VersionException, IOException {
return importProgram(file, (DomainFolder) null, language, compilerSpec);
}
public Program importProgram(File file, DomainFolder domainFolder, Language language,
CompilerSpec compilerSpec) throws CancelledException, DuplicateNameException, CompilerSpec compilerSpec) throws CancelledException, DuplicateNameException,
InvalidNameException, VersionException, IOException { InvalidNameException, VersionException, IOException {
MessageLog messageLog = new MessageLog(); MessageLog messageLog = new MessageLog();
LoadResults<Program> loadResults = AutoImporter.importByLookingForLcs(file, project, LoadResults<Program> loadResults = AutoImporter.importByLookingForLcs(file, project, null,
domainFolder.getPathname(), language, compilerSpec, this, messageLog, MONITOR); language, compilerSpec, this, messageLog, MONITOR);
Program program = loadResults.getPrimaryDomainObject(); Program program = loadResults.getPrimaryDomainObject();
loadResults.releaseNonPrimary(this); loadResults.releaseNonPrimary(this);
initializeProgram(program, false); initializeProgram(program, false);
@@ -653,16 +647,11 @@ public class GhidraProject {
return loadResults.getPrimaryDomainObject(); return loadResults.getPrimaryDomainObject();
} }
public Program importProgram(File file) throws CancelledException, DuplicateNameException, public Program importProgram(File file) throws CancelledException,
InvalidNameException, VersionException, IOException {
return importProgram(file, (DomainFolder) null);
}
public Program importProgram(File file, DomainFolder domainFolder) throws CancelledException,
DuplicateNameException, InvalidNameException, VersionException, IOException { DuplicateNameException, InvalidNameException, VersionException, IOException {
MessageLog messageLog = new MessageLog(); MessageLog messageLog = new MessageLog();
LoadResults<Program> loadResults = AutoImporter.importByUsingBestGuess(file, project, LoadResults<Program> loadResults = AutoImporter.importByUsingBestGuess(file, project,
domainFolder.getPathname(), this, messageLog, MONITOR); null, this, messageLog, MONITOR);
Program program = loadResults.getPrimaryDomainObject(); Program program = loadResults.getPrimaryDomainObject();
loadResults.releaseNonPrimary(this); loadResults.releaseNonPrimary(this);
initializeProgram(program, false); initializeProgram(program, false);