yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 10:19:23 +02:00
Code Issues Releases Wiki Activity

GP-2974: Fixing warnings

Browse source
This commit is contained in:
Ryan Kurtz 2023-04-26 08:03:57 -04:00
parent 113156a19f
commit 7fa3389119
662 changed files with 2198 additions and 2216 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Framework/Utility/src/main/java/ghidra/util/task/TaskMonitor.java
View file

@ -120,7 +120,7 @@ public interface TaskMonitor {
* @throws CancelledException if monitor has been cancelled
* @deprecated Use {@link #checkCancelled()} instead
*/
@Deprecated(forRemoval = false, since = "10.3")
@Deprecated(since = "10.3")
public void checkCanceled() throws CancelledException;
/**
@ -128,7 +128,7 @@ public interface TaskMonitor {
* @throws CancelledException if monitor has been cancelled
*/
public default void checkCancelled() throws CancelledException {
// note: call checkCanceled() until it is removed; this produces the least number of changes
// note: call checkCancelled() until it is removed; this produces the least number of changes
checkCanceled();
}
@ -177,14 +177,14 @@ public interface TaskMonitor {
* Clear the cancellation so that this TaskMonitor may be reused
* @deprecated Use {@link #clearCancelled()} instead
*/
@Deprecated(forRemoval = false, since = "10.3")
@Deprecated(since = "10.3")
public void clearCanceled();
/**
* Clear the cancellation so that this TaskMonitor may be reused
*/
public default void clearCancelled() {
// note: call clearCanceled() until it is removed; this produces the least number of changes
// note: call clearCancelled() until it is removed; this produces the least number of changes
clearCanceled();
}
}

8
Ghidra/Framework/Utility/src/main/java/utilities/util/FileUtilities.java
View file

@ -432,7 +432,7 @@ public final class FileUtilities {
monitor.initialize(files.length);
for (int i = 0; i < files.length; i++) {
monitor.checkCanceled();
monitor.checkCancelled();
if (files[i].isDirectory()) {
// use a dummy monitor as not to ruin our progress
if (!doDeleteDir(files[i], monitor)) {
@ -467,7 +467,7 @@ public final class FileUtilities {
}
for (File file : files) {
monitor.checkCanceled();
monitor.checkCancelled();
if (file.isDirectory()) {
// use a dummy monitor as not to ruin our progress
if (!doDeleteDir(file, monitor)) {
@ -534,7 +534,7 @@ public final class FileUtilities {
monitor.initialize(originalDirFiles.length);
for (File file : originalDirFiles) {
monitor.checkCanceled();
monitor.checkCancelled();
monitor.setMessage("Copying " + file.getAbsolutePath());
File destinationFile = new File(copyDir, file.getName());
if (file.isDirectory()) {
@ -571,7 +571,7 @@ public final class FileUtilities {
int copiedFilesCount = 0;
for (File file : originalDirFiles) {
monitor.checkCanceled();
monitor.checkCancelled();
monitor.setMessage("Copying " + file.getAbsolutePath());
File destinationFile = new File(copyDir, file.getName());
if (file.isDirectory()) {