yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues 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/DB/src/main/java/db/buffers/LocalManagedBufferFile.java
View file

@ -607,7 +607,7 @@ public class LocalManagedBufferFile extends LocalBufferFile implements ManagedBu
@Override
public synchronized ManagedBufferFile getSaveFile() throws IOException {
try {
return getSaveFile(TaskMonitorAdapter.DUMMY_MONITOR);
return getSaveFile(TaskMonitor.DUMMY);
}
catch (CancelledException e) {
// unexpected

4
Ghidra/Framework/DB/src/test/java/db/TableTest.java
View file

@ -25,7 +25,7 @@ import org.junit.Before;
import org.junit.Test;
import generic.test.AbstractGenericTest;
import ghidra.util.task.TaskMonitorAdapter;
import ghidra.util.task.TaskMonitor;
public class TableTest extends AbstractGenericTest {
@ -334,7 +334,7 @@ public class TableTest extends AbstractGenericTest {
verifyRangeDoesNotExist(startKey, endKey);
verifyRecordsBeforeAndAfterExist(startKey, endKey);
assertTrue(table.isConsistent(TaskMonitorAdapter.DUMMY_MONITOR));
assertTrue(table.isConsistent(TaskMonitor.DUMMY));
}
private void verifyRangeDoesNotExist(int startKey, int endKey) throws IOException {

22
Ghidra/Framework/DB/src/test/java/db/buffers/VersionedLocalBufferFileTest.java
View file

@ -23,7 +23,7 @@ import java.util.Arrays;
import org.junit.*;
import generic.test.AbstractGenericTest;
import ghidra.util.task.TaskMonitorAdapter;
import ghidra.util.task.TaskMonitor;
import utilities.util.FileUtilities;
public class VersionedLocalBufferFileTest extends AbstractGenericTest {
@ -205,7 +205,7 @@ public class VersionedLocalBufferFileTest extends AbstractGenericTest {
// Simulate private checkout
pbf = new LocalManagedBufferFile(vbf.getBufferSize(), privateTestFileMgr, PRIVATE);
LocalBufferFile.copyFile(vbf, pbf, null, TaskMonitorAdapter.DUMMY_MONITOR);
LocalBufferFile.copyFile(vbf, pbf, null, TaskMonitor.DUMMY);
assertEquals(indexCnt, pbf.getIndexCount());
assertTrue(Arrays.equals(freeList, pbf.getFreeIndexes()));
@ -392,7 +392,7 @@ public class VersionedLocalBufferFileTest extends AbstractGenericTest {
pbf = new LocalManagedBufferFile(privateTestFileMgr, false, -1, PRIVATE);
// Create version-2 using quick update
pbf.createNewVersion(vbf, null, TaskMonitorAdapter.DUMMY_MONITOR);
pbf.createNewVersion(vbf, null, TaskMonitor.DUMMY);
vbf.close();
vbf = null;
@ -625,7 +625,7 @@ public class VersionedLocalBufferFileTest extends AbstractGenericTest {
privateTestFileMgr = new PrivateTestFileMgr(2);
vbf = new LocalManagedBufferFile(versionedTestFileMgr, 1, -1);
pbf = new LocalManagedBufferFile(vbf.getBufferSize(), privateTestFileMgr, PRIVATE);
LocalBufferFile.copyFile(vbf, pbf, null, TaskMonitorAdapter.DUMMY_MONITOR);
LocalBufferFile.copyFile(vbf, pbf, null, TaskMonitor.DUMMY);
vbf.close();
vbf = null;
@ -690,7 +690,7 @@ public class VersionedLocalBufferFileTest extends AbstractGenericTest {
pbf = new LocalManagedBufferFile(privateTestFileMgr, true, -1, -1);
// Perform quick update of private file to replicate version-2 file - should wipe-out all private changes
pbf.updateFrom(vbf, 1, TaskMonitorAdapter.DUMMY_MONITOR);
pbf.updateFrom(vbf, 1, TaskMonitor.DUMMY);
pbf.close();
pbf = null;
@ -763,7 +763,7 @@ public class VersionedLocalBufferFileTest extends AbstractGenericTest {
privateTestFileMgr = new PrivateTestFileMgr(2);
vbf = new LocalManagedBufferFile(versionedTestFileMgr, 1, -1);
pbf = new LocalManagedBufferFile(vbf.getBufferSize(), privateTestFileMgr, PRIVATE);
LocalBufferFile.copyFile(vbf, pbf, null, TaskMonitorAdapter.DUMMY_MONITOR);
LocalBufferFile.copyFile(vbf, pbf, null, TaskMonitor.DUMMY);
vbf.close();
vbf = null;
@ -833,7 +833,7 @@ public class VersionedLocalBufferFileTest extends AbstractGenericTest {
pbf = new LocalManagedBufferFile(privateTestFileMgr, true, -1, -1);
// Perform quick update of private file to replicate version-2 file - should wipe-out all private changes
pbf.updateFrom(vbf, 1, TaskMonitorAdapter.DUMMY_MONITOR);
pbf.updateFrom(vbf, 1, TaskMonitor.DUMMY);
pbf.close();
pbf = null;
@ -906,7 +906,7 @@ public class VersionedLocalBufferFileTest extends AbstractGenericTest {
privateTestFileMgr = new PrivateTestFileMgr(2);
vbf = new LocalManagedBufferFile(versionedTestFileMgr, 1, -1);
pbf = new LocalManagedBufferFile(vbf.getBufferSize(), privateTestFileMgr, PRIVATE);
LocalBufferFile.copyFile(vbf, pbf, null, TaskMonitorAdapter.DUMMY_MONITOR);
LocalBufferFile.copyFile(vbf, pbf, null, TaskMonitor.DUMMY);
vbf.close();
vbf = null;
@ -966,7 +966,7 @@ public class VersionedLocalBufferFileTest extends AbstractGenericTest {
pbf = new LocalManagedBufferFile(privateTestFileMgr, true, -1, -1);
// Perform quick update of private file to replicate version-2 file - should wipe-out all private changes
pbf.updateFrom(vbf, 1, TaskMonitorAdapter.DUMMY_MONITOR);
pbf.updateFrom(vbf, 1, TaskMonitor.DUMMY);
pbf.close();
pbf = null;
@ -1039,7 +1039,7 @@ public class VersionedLocalBufferFileTest extends AbstractGenericTest {
privateTestFileMgr = new PrivateTestFileMgr(2);
vbf = new LocalManagedBufferFile(versionedTestFileMgr, 1, -1);
pbf = new LocalManagedBufferFile(vbf.getBufferSize(), privateTestFileMgr, PRIVATE);
LocalBufferFile.copyFile(vbf, pbf, null, TaskMonitorAdapter.DUMMY_MONITOR);
LocalBufferFile.copyFile(vbf, pbf, null, TaskMonitor.DUMMY);
vbf.close();
vbf = null;
@ -1101,7 +1101,7 @@ public class VersionedLocalBufferFileTest extends AbstractGenericTest {
pbf = new LocalManagedBufferFile(privateTestFileMgr, true, -1, -1);
// Perform quick update of private file to replicate version-3 file - should wipe-out all private changes
pbf.updateFrom(vbf, 1, TaskMonitorAdapter.DUMMY_MONITOR);
pbf.updateFrom(vbf, 1, TaskMonitor.DUMMY);
pbf.close();
pbf = null;