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

GP-0: Using TaskMonitor.DUMMY instead of deprecated

Browse Source 
TaskMonitorAdapter.DUMMY_MONITOR
This commit is contained in:
Ryan Kurtz
2022-12-28 08:06:16 -05:00
parent c077c60942
commit 70a155cb70
130 changed files with 944 additions and 958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Framework/Project/src/main/java/ghidra/framework/data/DomainObjectAdapterDB.java
View File

@@ -559,7 +559,7 @@ public abstract class DomainObjectAdapterDB extends DomainObjectAdapter
if (userData != null && userData.isChanged() && (getDomainFile() instanceof GhidraFile)) {
try {
userData.prepareToSave();
userData.save(null, TaskMonitorAdapter.DUMMY_MONITOR);
userData.save(null, TaskMonitor.DUMMY);
}
catch (CancelledException e) {
}

4
Ghidra/Framework/Project/src/main/java/ghidra/framework/data/GhidraFileData.java
View File

@@ -1018,7 +1018,7 @@ public class GhidraFileData {
}
verifyRepoUser("checkin");
if (monitor == null) {
monitor = TaskMonitorAdapter.DUMMY_MONITOR;
monitor = TaskMonitor.DUMMY;
}
synchronized (fileSystem) {
if (busy) {
@@ -1405,7 +1405,7 @@ public class GhidraFileData {
}
verifyRepoUser("merge");
if (monitor == null) {
monitor = TaskMonitorAdapter.DUMMY_MONITOR;
monitor = TaskMonitor.DUMMY;
}
synchronized (fileSystem) {
if (busy) {

8
Ghidra/Framework/Project/src/main/java/ghidra/framework/data/GhidraFolder.java
View File

@@ -143,7 +143,7 @@ public class GhidraFolder implements DomainFolder {
* @throws IOException
*/
void refreshFolderData() throws IOException {
getFolderData().refresh(false, true, TaskMonitorAdapter.DUMMY_MONITOR);
getFolderData().refresh(false, true, TaskMonitor.DUMMY);
}
@Override
@@ -295,14 +295,14 @@ public class GhidraFolder implements DomainFolder {
public DomainFile createFile(String fileName, DomainObject obj, TaskMonitor monitor)
throws InvalidNameException, IOException, CancelledException {
return createFolderData().createFile(fileName, obj,
monitor != null ? monitor : TaskMonitorAdapter.DUMMY_MONITOR);
monitor != null ? monitor : TaskMonitor.DUMMY);
}
@Override
public DomainFile createFile(String fileName, File packFile, TaskMonitor monitor)
throws InvalidNameException, IOException, CancelledException {
return createFolderData().createFile(fileName, packFile,
monitor != null ? monitor : TaskMonitorAdapter.DUMMY_MONITOR);
monitor != null ? monitor : TaskMonitor.DUMMY);
}
@Override
@@ -336,7 +336,7 @@ public class GhidraFolder implements DomainFolder {
GhidraFolderData folderData = getFolderData();
GhidraFolder newGhidraParent = (GhidraFolder) newParent; // assumes single implementation
return folderData.copyTo(newGhidraParent.getFolderData(),
monitor != null ? monitor : TaskMonitorAdapter.DUMMY_MONITOR);
monitor != null ? monitor : TaskMonitor.DUMMY);
}
/**