yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +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

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/Constructor.java
View file

@ -215,7 +215,7 @@ public class Constructor implements Comparable<Constructor> {
}
else {
for (int j = 0; j < element.length(); ++j) {
list.add(new Character(element.charAt(j)));
list.add(Character.valueOf(element.charAt(j)));
}
}
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/OpTplWalker.java
View file

@ -131,12 +131,12 @@ public class OpTplWalker {
if (curind >= maxsize)
return null;
if (oparray == null)
return new Integer(curind); // Virtual build directive
return Integer.valueOf(curind); // Virtual build directive
OpTpl op = oparray[curind];
if (op.getOpcode() != PcodeOp.MULTIEQUAL) // if NOT a build directive
return op; // return ordinary OpTpl
curind = (int)op.getInput()[0].getOffset().getReal(); // Get the operand index from the build directive
return new Integer(curind);
return Integer.valueOf(curind);
}
}

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/symbol/NameSymbol.java
View file

@ -93,7 +93,7 @@ public class NameSymbol extends ValueSymbol {
int ind = (int) getPatternValue().getValue(walker);
String token = nametable[ind];
for (int i = 0; i < token.length(); ++i)
list.add(new Character(token.charAt(i)));
list.add(Character.valueOf(token.charAt(i)));
}
@Override

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DataTypeArchiveDB.java
View file

@ -488,7 +488,7 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB
throws CancelledException, IOException {
VersionException versionExc = null;
monitor.checkCanceled();
monitor.checkCancelled();
// try {
checkOldProperties(openMode);
@ -502,14 +502,14 @@ public class DataTypeArchiveDB extends DomainObjectAdapterDB
catch (VersionException e) {
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
return versionExc;
}
private void initManagers(int openMode, TaskMonitor monitor)
throws IOException, CancelledException {
monitor.checkCanceled();
monitor.checkCancelled();
dataTypeManager.archiveReady(openMode, monitor);
}

12
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/DataTypeArchiveDBChangeSet.java
View file

@ -79,7 +79,7 @@ class DataTypeArchiveDBChangeSet implements DataTypeArchiveChangeSet, DomainObje
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
Long lid = new Long(id);
Long lid = Long.valueOf(id);
if (!addedDataTypeIds.contains(lid) && !tmpAddedDataTypeIds.contains(lid)) {
tmpChangedDataTypeIds.add(lid);
}
@ -90,7 +90,7 @@ class DataTypeArchiveDBChangeSet implements DataTypeArchiveChangeSet, DomainObje
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
tmpAddedDataTypeIds.add(new Long(id));
tmpAddedDataTypeIds.add(Long.valueOf(id));
}
@Override
@ -108,7 +108,7 @@ class DataTypeArchiveDBChangeSet implements DataTypeArchiveChangeSet, DomainObje
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
Long lid = new Long(id);
Long lid = Long.valueOf(id);
if (!addedCategoryIds.contains(lid) && !tmpAddedCategoryIds.contains(lid)) {
tmpChangedCategoryIds.add(lid);
}
@ -119,7 +119,7 @@ class DataTypeArchiveDBChangeSet implements DataTypeArchiveChangeSet, DomainObje
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
tmpAddedCategoryIds.add(new Long(id));
tmpAddedCategoryIds.add(Long.valueOf(id));
}
@Override
@ -137,7 +137,7 @@ class DataTypeArchiveDBChangeSet implements DataTypeArchiveChangeSet, DomainObje
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
tmpAddedSourceArchiveIds.add(new Long(id));
tmpAddedSourceArchiveIds.add(Long.valueOf(id));
}
@Override
@ -145,7 +145,7 @@ class DataTypeArchiveDBChangeSet implements DataTypeArchiveChangeSet, DomainObje
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
Long lid = new Long(id);
Long lid = Long.valueOf(id);
if (!addedSourceArchiveIds.contains(lid) && !tmpAddedSourceArchiveIds.contains(lid)) {
tmpChangedSourceArchiveIds.add(lid);
}

46
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramDB.java
View file

@ -1572,7 +1572,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
int cnt = 0;
for (Symbol functionSymbol : symbolTable.getSymbols(memoryManager, SymbolType.FUNCTION,
true)) {
monitor.checkCanceled();
monitor.checkCancelled();
ProgramUtilities.convertFunctionWrappedExternalPointer(functionSymbol);
monitor.setProgress(++cnt);
}
@ -1588,7 +1588,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
VersionException versionExc = null;
overlaySpaceAdapter = new OverlaySpaceAdapterDB(dbh);
overlaySpaceAdapter.initializeOverlaySpaces(addressFactory);
monitor.checkCanceled();
monitor.checkCancelled();
try {
checkOldProperties(openMode, monitor);
@ -1619,7 +1619,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
return versionExc;
}
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
memoryManager =
@ -1629,7 +1629,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
catch (VersionException e) {
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
managers[CODE_MGR] = new CodeManager(dbh, addrMap, openMode, lock, monitor);
@ -1637,7 +1637,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
catch (VersionException e) {
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
managers[FUNCTION_MGR] = new FunctionManagerDB(dbh, addrMap, openMode, lock, monitor);
@ -1666,7 +1666,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
versionExc = e.combine(versionExc);
}
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
managers[EXTERNAL_MGR] = new ExternalManagerDB(dbh, addrMap, openMode, lock, monitor);
@ -1674,7 +1674,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
catch (VersionException e) {
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
managers[SYMBOL_MGR] = new SymbolManager(dbh, addrMap, openMode, this, lock, monitor);
@ -1682,7 +1682,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
catch (VersionException e) {
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
managers[NAMESPACE_MGR] =
@ -1691,7 +1691,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
catch (VersionException e) {
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
managers[REF_MGR] = new ReferenceDBManager(dbh, addrMap, openMode, lock, monitor);
@ -1699,7 +1699,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
catch (VersionException e) {
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
managers[EQUATE_MGR] = new EquateManager(dbh, addrMap, openMode, lock, monitor);
@ -1707,7 +1707,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
catch (VersionException e) {
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
managers[DATA_MGR] =
@ -1716,7 +1716,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
catch (VersionException e) {
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
managers[PROPERTY_MGR] =
@ -1725,7 +1725,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
catch (VersionException e) {
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
managers[BOOKMARK_MGR] = new BookmarkDBManager(dbh, addrMap, openMode, lock, monitor);
@ -1733,7 +1733,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
catch (VersionException e) {
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
managers[TREE_MGR] = new TreeManager(dbh, this, addrMap, openMode, lock, monitor);
@ -1741,7 +1741,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
catch (VersionException e) {
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
managers[RELOC_MGR] = new RelocationManager(dbh, addrMap, openMode, lock, monitor);
@ -1749,7 +1749,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
catch (VersionException e) {
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
try {
managers[CONTEXT_MGR] = new ProgramRegisterContextDB(dbh, this, language, compilerSpec,
@ -1759,7 +1759,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
versionExc = e.combine(versionExc);
}
monitor.checkCanceled();
monitor.checkCancelled();
return versionExc;
}
@ -1768,12 +1768,12 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
throws CancelledException, IOException {
globalNamespace = new GlobalNamespace(getMemory());
for (int i = 0; i < NUM_MANAGERS; i++) {
monitor.checkCanceled();
monitor.checkCancelled();
managers[i].setProgram(this);
}
listing.setProgram(this);
monitor.checkCanceled();
monitor.checkCancelled();
// Upgrade Function Manager
if (openMode == UPGRADE && oldFunctionMgr != null) {
@ -1781,7 +1781,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
}
for (int i = 0; i < NUM_MANAGERS; i++) {
monitor.checkCanceled();
monitor.checkCancelled();
managers[i].programReady(openMode, getStoredVersion(), monitor);
}
@ -1887,14 +1887,14 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
clearCache(false);
Iterator<String> iter = addrSetPropertyMap.keySet().iterator();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
AddressSetPropertyMapDB pm = addrSetPropertyMap.get(iter.next());
pm.remove(startAddr, endAddr);
}
iter = intRangePropertyMap.keySet().iterator();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
IntRangeMap map = intRangePropertyMap.get(iter.next());
map.clearValue(startAddr, endAddr);
}
@ -2156,7 +2156,7 @@ public class ProgramDB extends DomainObjectAdapterDB implements Program, ChangeM
InstructionIterator instructions =
codeManager.getInstructions(memoryManager.getLoadedAndInitializedAddressSet(), true);
while (instructions.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
if (++cnt % 100 == 0) {
monitor.setProgress(cnt);
}

24
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramDBChangeSet.java
View file

@ -185,7 +185,7 @@ class ProgramDBChangeSet implements ProgramChangeSet, DomainObjectDBChangeSet {
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
Long lid = new Long(id);
Long lid = Long.valueOf(id);
if (!addedDataTypeIds.contains(lid) && !tmpAddedDataTypeIds.contains(lid)) {
tmpChangedDataTypeIds.add(lid);
}
@ -196,7 +196,7 @@ class ProgramDBChangeSet implements ProgramChangeSet, DomainObjectDBChangeSet {
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
tmpAddedDataTypeIds.add(new Long(id));
tmpAddedDataTypeIds.add(Long.valueOf(id));
}
@Override
@ -214,7 +214,7 @@ class ProgramDBChangeSet implements ProgramChangeSet, DomainObjectDBChangeSet {
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
Long lid = new Long(id);
Long lid = Long.valueOf(id);
if (!addedCategoryIds.contains(lid) && !tmpAddedCategoryIds.contains(lid)) {
tmpChangedCategoryIds.add(lid);
}
@ -225,7 +225,7 @@ class ProgramDBChangeSet implements ProgramChangeSet, DomainObjectDBChangeSet {
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
tmpAddedCategoryIds.add(new Long(id));
tmpAddedCategoryIds.add(Long.valueOf(id));
}
@Override
@ -243,7 +243,7 @@ class ProgramDBChangeSet implements ProgramChangeSet, DomainObjectDBChangeSet {
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
Long lid = new Long(id);
Long lid = Long.valueOf(id);
if (!addedProgramTreeIds.contains(lid) && !tmpAddedProgramTreeIds.contains(lid)) {
tmpChangedProgramTreeIds.add(lid);
}
@ -254,7 +254,7 @@ class ProgramDBChangeSet implements ProgramChangeSet, DomainObjectDBChangeSet {
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
tmpAddedProgramTreeIds.add(new Long(id));
tmpAddedProgramTreeIds.add(Long.valueOf(id));
}
@Override
@ -272,7 +272,7 @@ class ProgramDBChangeSet implements ProgramChangeSet, DomainObjectDBChangeSet {
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
Long lid = new Long(id);
Long lid = Long.valueOf(id);
if (!addedSymbolIds.contains(lid) && !tmpAddedSymbolIds.contains(lid)) {
tmpChangedSymbolIds.add(lid);
}
@ -283,7 +283,7 @@ class ProgramDBChangeSet implements ProgramChangeSet, DomainObjectDBChangeSet {
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
tmpAddedSymbolIds.add(new Long(id));
tmpAddedSymbolIds.add(Long.valueOf(id));
}
@Override
@ -301,7 +301,7 @@ class ProgramDBChangeSet implements ProgramChangeSet, DomainObjectDBChangeSet {
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
Long lid = new Long(id);
Long lid = Long.valueOf(id);
if (!changedTagIds.contains(lid) && !tmpChangedTagIds.contains(lid)) {
tmpChangedTagIds.add(lid);
}
@ -312,7 +312,7 @@ class ProgramDBChangeSet implements ProgramChangeSet, DomainObjectDBChangeSet {
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
tmpAddedTagIds.add(new Long(id));
tmpAddedTagIds.add(Long.valueOf(id));
}
@Override
@ -330,7 +330,7 @@ class ProgramDBChangeSet implements ProgramChangeSet, DomainObjectDBChangeSet {
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
tmpAddedSourceArchiveIds.add(new Long(id));
tmpAddedSourceArchiveIds.add(Long.valueOf(id));
}
@Override
@ -338,7 +338,7 @@ class ProgramDBChangeSet implements ProgramChangeSet, DomainObjectDBChangeSet {
if (!inTransaction) {
throw new IllegalStateException("Not in a transaction");
}
Long lid = new Long(id);
Long lid = Long.valueOf(id);
if (!addedSourceArchiveIds.contains(lid) && !tmpAddedSourceArchiveIds.contains(lid)) {
tmpChangedSourceArchiveIds.add(lid);
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramUserDataDB.java
View file

@ -384,7 +384,7 @@ class ProgramUserDataDB extends DomainObjectAdapterDB implements ProgramUserData
VersionException versionExc = null;
monitor.checkCanceled();
monitor.checkCancelled();
// the memoryManager should always be created first because it is needed to resolve
// segmented addresses from longs that other manages may need while upgrading.
@ -408,7 +408,7 @@ class ProgramUserDataDB extends DomainObjectAdapterDB implements ProgramUserData
}
}
addressMap.memoryMapChanged(program1.getMemory());
monitor.checkCanceled();
monitor.checkCancelled();
return versionExc;
}

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/SpecExtension.java
View file

@ -526,7 +526,7 @@ public class SpecExtension {
Options specOptions = program.getOptions(SpecExtension.SPEC_EXTENSION);
List<String> optionNames = specOptions.getOptionNames();
for (String name : optionNames) {
monitor.checkCanceled();
monitor.checkCancelled();
specOptions.removeOption(name);
}
}
@ -660,7 +660,7 @@ public class SpecExtension {
FunctionIterator iter = manager.getFunctions(true);
for (int i = 0; i < 2; ++i) {
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
monitor.incrementProgress(1);
Function function = iter.next();
String currentFixup = function.getCallFixup();
@ -715,7 +715,7 @@ public class SpecExtension {
FunctionIterator iter = manager.getFunctions(true);
for (int i = 0; i < 2; i += 1) {
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
monitor.incrementProgress(1);
Function function = iter.next();
PrototypeModel currentModel = function.getCallingConvention();

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/bookmark/BookmarkDBManager.java
View file

@ -423,7 +423,7 @@ public class BookmarkDBManager implements BookmarkManager, ErrorHandler, Manager
DBRecord rec = iter.next();
BookmarkDB bm = getBookmark(rec);
removeBookmark(bm);
monitor.checkCanceled();
monitor.checkCancelled();
}
}
catch (IOException e) {
@ -756,7 +756,7 @@ public class BookmarkDBManager implements BookmarkManager, ErrorHandler, Manager
if (category == null || category.equals(bm.getCategory())) {
doRemoveBookmark(bm);
}
monitor.checkCanceled();
monitor.checkCancelled();
}
if (bookmarkAdapter.getBookmarkCount(typeId) == 0) {
removeBookmarks(bmt.getTypeString());

30
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CodeManager.java
View file

@ -153,7 +153,7 @@ public class CodeManager implements ErrorHandler, ManagerDB {
AddressIterator addrIter = oldFallThroughs.getPropertyIterator();
while (addrIter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
Address addr = addrIter.next();
try {
long offset = oldFallThroughs.getLong(addr);
@ -722,18 +722,18 @@ public class CodeManager implements ErrorHandler, ManagerDB {
boolean success = false;
try {
compositeMgr.removeRange(start, end);
monitor.checkCanceled();
monitor.checkCancelled();
instAdapter.deleteRecords(start, end);
monitor.checkCanceled();
monitor.checkCancelled();
dataAdapter.deleteRecords(start, end);
monitor.checkCanceled();
monitor.checkCancelled();
lengthMgr.removeRange(start, end);
monitor.checkCanceled();
monitor.checkCancelled();
if (!keepComments) {
commentAdapter.deleteRecords(start, end);
monitor.checkCanceled();
monitor.checkCancelled();
historyAdapter.deleteRecords(start, end);
monitor.checkCanceled();
monitor.checkCancelled();
}
cache.delete(addrMap.getKeyRanges(start, end, false));
@ -1593,7 +1593,7 @@ public class CodeManager implements ErrorHandler, ManagerDB {
for (AddressRange range : searchSet.getAddressRanges()) {
monitor.checkCanceled();
monitor.checkCancelled();
Address start = range.getMinAddress();
Address rangeMax = range.getMaxAddress();
@ -2641,7 +2641,7 @@ public class CodeManager implements ErrorHandler, ManagerDB {
List<Address> addrs = new ArrayList<>();
RecordIterator it = dataAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
long id = rec.getLongValue(DataDBAdapter.DATA_TYPE_ID_COL);
for (long dataTypeID : dataTypeIDs) {
@ -2652,7 +2652,7 @@ public class CodeManager implements ErrorHandler, ManagerDB {
}
}
for (Address addr : addrs) {
monitor.checkCanceled();
monitor.checkCancelled();
clearCodeUnits(addr, addr, false, monitor);
}
}
@ -2791,10 +2791,10 @@ public class CodeManager implements ErrorHandler, ManagerDB {
Address endAddr = startAddr.add(length - 1);
compositeMgr.moveRange(startAddr, endAddr, newStartAddr);
monitor.checkCanceled();
monitor.checkCancelled();
lengthMgr.moveRange(startAddr, endAddr, newStartAddr);
monitor.checkCanceled();
monitor.checkCancelled();
instAdapter.moveAddressRange(startAddr, newStartAddr, length, monitor);
dataAdapter.moveAddressRange(startAddr, newStartAddr, length, monitor);
@ -2813,7 +2813,7 @@ public class CodeManager implements ErrorHandler, ManagerDB {
RecordIterator iter = instAdapter.getRecords(start, end, true);
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
InstructionDB inst = getInstructionDB(iter.next());
addReferencesForInstruction(inst);
}
@ -2827,7 +2827,7 @@ public class CodeManager implements ErrorHandler, ManagerDB {
RecordIterator iter = dataAdapter.getRecords(start, end, true);
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
Data data = getDataDB(rec);
addDataReferences(data, new ArrayList<Address>());
@ -3540,7 +3540,7 @@ public class CodeManager implements ErrorHandler, ManagerDB {
}
if ((++count % 1000) == 0) {
monitor.checkCanceled();
monitor.checkCancelled();
monitor.setProgress(count);
}
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentHistoryAdapter.java
View file

@ -101,7 +101,7 @@ abstract class CommentHistoryAdapter {
new CommentHistoryAdapterV0(tmpHandle, addrMap, true);
RecordIterator iter = oldAdapter.getAllRecords();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
Address addr = oldAddrMap.decodeAddress(rec.getLongValue(HISTORY_ADDRESS_COL));
rec.setLongValue(HISTORY_ADDRESS_COL, addrMap.getKey(addr, true));
@ -114,7 +114,7 @@ abstract class CommentHistoryAdapter {
iter = tmpAdapter.getAllRecords();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
newAdapter.updateRecord(rec);
monitor.setProgress(++count);

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/CommentsDBAdapter.java
View file

@ -126,7 +126,7 @@ abstract class CommentsDBAdapter {
CommentsDBAdapter tmpAdapter = new CommentsDBAdapterV1(tmpHandle, addrMap, true);
RecordIterator iter = oldAdapter.getRecords();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
Address addr = oldAddrMap.decodeAddress(rec.getKey());
rec.setKey(addrMap.getKey(addr, true));
@ -139,7 +139,7 @@ abstract class CommentsDBAdapter {
iter = tmpAdapter.getRecords();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
newAdapter.updateRecord(rec);
monitor.setProgress(++count);

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/DataDBAdapter.java
View file

@ -86,7 +86,7 @@ abstract class DataDBAdapter {
DataDBAdapter tmpAdapter = new DataDBAdapterV0(tmpHandle, addrMap, true);
RecordIterator iter = oldAdapter.getRecords();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
Address addr = oldAddrMap.decodeAddress(rec.getKey());
rec.setKey(addrMap.getKey(addr, true));
@ -99,7 +99,7 @@ abstract class DataDBAdapter {
iter = tmpAdapter.getRecords();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
newAdapter.putRecord(rec);
monitor.setProgress(++count);

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/code/InstDBAdapter.java
View file

@ -94,7 +94,7 @@ abstract class InstDBAdapter {
InstDBAdapter tmpAdapter = new InstDBAdapterV1(tmpHandle, addrMap, true);
RecordIterator iter = oldAdapter.getRecords();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
Address addr = oldAddrMap.decodeAddress(rec.getKey());
rec.setKey(addrMap.getKey(addr, true));
@ -107,7 +107,7 @@ abstract class InstDBAdapter {
iter = tmpAdapter.getRecords();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
newAdapter.putRecord(rec);
monitor.setProgress(++count);

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/ArrayDBAdapter.java
View file

@ -81,7 +81,7 @@ abstract class ArrayDBAdapter {
tmpAdapter = new ArrayDBAdapterV1(tmpHandle, tablePrefix, true);
RecordIterator it = oldAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
tmpAdapter.updateRecord(rec);
}
@ -89,7 +89,7 @@ abstract class ArrayDBAdapter {
ArrayDBAdapterV1 newAdapter = new ArrayDBAdapterV1(handle, tablePrefix, true);
it = tmpAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
newAdapter.updateRecord(rec);
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CompositeDBAdapter.java
View file

@ -152,7 +152,7 @@ abstract class CompositeDBAdapter implements DBRecordAdapter {
tmpAdapter = new CompositeDBAdapterV5V6(tmpHandle, DBConstants.CREATE, tablePrefix);
RecordIterator it = oldAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
tmpAdapter.updateRecord(rec, false);
}
@ -164,7 +164,7 @@ abstract class CompositeDBAdapter implements DBRecordAdapter {
}
it = tmpAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
newAdapter.updateRecord(rec, false);
}

8
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeArchiveTransformer.java
View file

@ -177,7 +177,7 @@ public class DataTypeArchiveTransformer implements GhidraLaunchable {
// anonymous data types that matched by matching components.
Iterator<DataType> allDataTypes = newFileArchive.getAllDataTypes();
while (allDataTypes.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DataType newDataType = allDataTypes.next();
if (isAnonymousType(newDataType)) {
// Skip anonymous types, they are matched as components of composites or
@ -213,7 +213,7 @@ public class DataTypeArchiveTransformer implements GhidraLaunchable {
Iterator<DataType> allDataTypes = newFileArchive.getAllDataTypes();
while (allDataTypes.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DataType newDataType = allDataTypes.next();
if (newDataType instanceof DataTypeDB) {
((DataTypeDB) newDataType).setUniversalID(UniversalIdGenerator.nextID());
@ -229,7 +229,7 @@ public class DataTypeArchiveTransformer implements GhidraLaunchable {
// old archive.
Iterator<DataType> allDataTypes = newFileArchive.getAllDataTypes();
while (allDataTypes.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DataType newDataType = allDataTypes.next();
if (newDataType instanceof Enum && isAnonymousType(newDataType)) {
@ -697,7 +697,7 @@ public class DataTypeArchiveTransformer implements GhidraLaunchable {
try {
Iterator<DataType> allDataTypes = newFileArchive.getAllDataTypes();
while (allDataTypes.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DataType newDataType = allDataTypes.next();
fixDataTypeTimestamp(newDataType, oldFileArchive, newFileArchive);
// monitor.incrementProgress(1);

12
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeManagerDB.java
View file

@ -1709,7 +1709,7 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
monitor.setProgress(0);
int i = 0;
for (DataType dt : dataTypes) {
monitor.checkCanceled();
monitor.checkCancelled();
resolve(dt, handler);
if (isResolveCacheOwner) {
flushResolveQueue(false);
@ -4119,7 +4119,7 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
}
List<DBRecord> records = sourceArchiveAdapter.getRecords();
for (DBRecord record : records) {
monitor.checkCanceled();
monitor.checkCancelled();
if (SourceArchiveUpgradeMap.isReplacedSourceArchive(record.getKey())) {
return true;
}
@ -4145,7 +4145,7 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
RecordIterator records = compositeAdapter.getRecords();
while (records.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = records.next();
if (!rec.getBooleanValue(CompositeDBAdapter.COMPOSITE_IS_UNION_COL)) {
// StructureDB instantiation will perform an automatic flex-array
@ -4174,7 +4174,7 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
}
BuiltInDataTypeManager builtInDTM = BuiltInDataTypeManager.getDataTypeManager();
for (String name : SourceArchiveUpgradeMap.getTypedefReplacements()) {
monitor.checkCanceled();
monitor.checkCancelled();
DataType dataType = getDataType(CategoryPath.ROOT, name);
if (dataType instanceof TypeDef) {
DataType builtIn = builtInDTM.getDataType(CategoryPath.ROOT, name);
@ -4234,7 +4234,7 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
int count = 0;
for (CompositeDB c : orderedComposites) {
monitor.checkCanceled();
monitor.checkCancelled();
c.fixupComponents();
monitor.setProgress(++count);
}
@ -4278,7 +4278,7 @@ abstract public class DataTypeManagerDB implements DataTypeManager {
GDirectedGraph<CompositeDB, GEdge<CompositeDB>> graph = GraphFactory.createDirectedGraph();
Iterator<Composite> allComposites = getAllComposites();
while (allComposites.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
CompositeDB c = (CompositeDB) allComposites.next();
graph.addVertex(c);
for (DataTypeComponent m : c.getDefinedComponents()) {

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumDBAdapter.java
View file

@ -114,7 +114,7 @@ abstract class EnumDBAdapter {
tmpAdapter = new EnumDBAdapterV1(tmpHandle, tablePrefix, true);
RecordIterator it = oldAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
tmpAdapter.updateRecord(rec, false);
}
@ -122,7 +122,7 @@ abstract class EnumDBAdapter {
EnumDBAdapterV1 newAdapter = new EnumDBAdapterV1(handle, tablePrefix, true);
it = tmpAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
newAdapter.updateRecord(rec, false);
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/EnumValueDBAdapter.java
View file

@ -107,7 +107,7 @@ abstract class EnumValueDBAdapter implements RecordTranslator {
tmpAdapter = new EnumValueDBAdapterV1(tmpHandle, tablePrefix, true);
RecordIterator it = oldAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
tmpAdapter.updateRecord(rec);
}
@ -115,7 +115,7 @@ abstract class EnumValueDBAdapter implements RecordTranslator {
EnumValueDBAdapter newAdapter = new EnumValueDBAdapterV1(handle, tablePrefix, true);
it = tmpAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
newAdapter.updateRecord(rec);
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/FunctionDefinitionDBAdapter.java
View file

@ -150,7 +150,7 @@ abstract class FunctionDefinitionDBAdapter implements DBRecordAdapter {
tmpAdapter = new FunctionDefinitionDBAdapterV2(tmpHandle, tablePrefix, true);
RecordIterator it = oldAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
tmpAdapter.updateRecord(rec, false);
}
@ -159,7 +159,7 @@ abstract class FunctionDefinitionDBAdapter implements DBRecordAdapter {
new FunctionDefinitionDBAdapterV2(handle, tablePrefix, true);
it = tmpAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
newAdapter.updateRecord(rec, false);
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/FunctionParameterAdapter.java
View file

@ -114,7 +114,7 @@ abstract class FunctionParameterAdapter {
tmpAdapter = new FunctionParameterAdapterV1(tmpHandle, tablePrefix, true);
RecordIterator it = oldAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
tmpAdapter.updateRecord(rec);
}
@ -123,7 +123,7 @@ abstract class FunctionParameterAdapter {
new FunctionParameterAdapterV1(handle, tablePrefix, true);
it = tmpAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
newAdapter.updateRecord(rec);
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/PointerDBAdapter.java
View file

@ -90,7 +90,7 @@ abstract class PointerDBAdapter implements RecordTranslator {
tmpAdapter = new PointerDBAdapterV2(tmpHandle, tablePrefix, true);
RecordIterator it = oldAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
tmpAdapter.updateRecord(rec);
}
@ -98,7 +98,7 @@ abstract class PointerDBAdapter implements RecordTranslator {
PointerDBAdapter newAdapter = new PointerDBAdapterV2(handle, tablePrefix, true);
it = tmpAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
newAdapter.updateRecord(rec);
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/ProgramBasedDataTypeManagerDB.java
View file

@ -249,7 +249,7 @@ public abstract class ProgramBasedDataTypeManagerDB extends DataTypeManagerDB
RecordIterator iter =
instanceSettingsAdapter.getRecords(range.minKey, range.maxKey);
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
tmpTable.putRecord(rec);
iter.delete();
@ -258,7 +258,7 @@ public abstract class ProgramBasedDataTypeManagerDB extends DataTypeManagerDB
RecordIterator iter = tmpTable.iterator();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
// update address key (i.e., settings association ID) and re-introduce into table
Address addr = addrMap

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SettingsDBAdapterV1.java
View file

@ -311,7 +311,7 @@ class SettingsDBAdapterV1 extends SettingsDBAdapter {
DBFieldIterator it = settingsTable.indexKeyIterator(V1_SETTINGS_ASSOCIATION_ID_COL,
new LongField(minAssociationId), new LongField(maxAssociationId), true);
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
settingsTable.deleteRecord(it.next());
}
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/SourceArchiveAdapter.java
View file

@ -114,7 +114,7 @@ abstract class SourceArchiveAdapter {
tmpAdapter = new SourceArchiveAdapterV0(tmpHandle, tablePrefix, true);
Iterator<DBRecord> it = oldAdapter.getRecords().iterator();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
tmpAdapter.updateRecord(rec);
}
@ -122,7 +122,7 @@ abstract class SourceArchiveAdapter {
SourceArchiveAdapter newAdapter = new SourceArchiveAdapterV0(handle, tablePrefix, true);
it = tmpAdapter.getRecords().iterator();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
newAdapter.updateRecord(rec);
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/TypedefDBAdapter.java
View file

@ -116,7 +116,7 @@ abstract class TypedefDBAdapter {
tmpAdapter = new TypedefDBAdapterV2(tmpHandle, tablePrefix, true);
RecordIterator it = oldAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
tmpAdapter.updateRecord(rec, false);
}
@ -124,7 +124,7 @@ abstract class TypedefDBAdapter {
TypedefDBAdapter newAdapter = new TypedefDBAdapterV2(handle, tablePrefix, true);
it = tmpAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
newAdapter.updateRecord(rec, false);
}

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/external/ExternalManagerDB.java vendored
View file

@ -119,7 +119,7 @@ public class ExternalManagerDB implements ManagerDB, ExternalManager {
RecordIterator iter = oldNameAdapter.getRecords();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
String name = rec.getString(OldExtNameAdapter.EXT_NAME_COL);
@ -146,7 +146,7 @@ public class ExternalManagerDB implements ManagerDB, ExternalManager {
iter = oldExtRefAdapter.getRecords();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
Address fromAddr =
@ -882,7 +882,7 @@ public class ExternalManagerDB implements ManagerDB, ExternalManager {
AddressFactory oldAddrFactory = translator.getOldLanguage().getAddressFactory();
SymbolIterator externalSymbols = symbolMgr.getExternalSymbols();
while (externalSymbols.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
SymbolDB s = (SymbolDB) externalSymbols.next();
ExternalData externalData = ExternalLocationDB.getExternalData(s);
String addrStr = externalData.getAddressString();

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/external/OldExtNameAdapter.java vendored
View file

@ -77,7 +77,7 @@ class OldExtNameAdapter {
RecordIterator iter = nameTable.iterator();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
newRefTable.putRecord(iter.next());
monitor.setProgress(++count);
}

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/external/OldExtRefAdapter.java vendored
View file

@ -84,7 +84,7 @@ class OldExtRefAdapter {
RecordIterator iter = refTable.iterator();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
newRefTable.putRecord(iter.next());
monitor.setProgress(++count);
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionAdapter.java
View file

@ -133,7 +133,7 @@ abstract class FunctionAdapter {
FunctionAdapter tmpAdapter = new FunctionAdapterV3(tmpHandle, map, true);
RecordIterator it = oldAdapter.iterateFunctionRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
tmpAdapter.updateFunctionRecord(rec);
monitor.setProgress(++count);
@ -142,7 +142,7 @@ abstract class FunctionAdapter {
FunctionAdapter newAdapter = new FunctionAdapterV3(handle, map, true);
it = tmpAdapter.iterateFunctionRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
newAdapter.updateFunctionRecord(rec);
monitor.setProgress(++count);

12
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionManagerDB.java
View file

@ -618,7 +618,7 @@ public class FunctionManagerDB implements FunctionManager {
// Remove functions which overlap deleted address range
Iterator<Function> iter = getFunctionsOverlapping(new AddressSet(startAddr, endAddr));
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
FunctionDB func = (FunctionDB) iter.next();
removeFunction(func.getEntryPoint());
}
@ -696,7 +696,7 @@ public class FunctionManagerDB implements FunctionManager {
FunctionIterator functions = getFunctions(false);
while (functions.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
// Establish signature source
FunctionDB func = (FunctionDB) functions.next();
@ -776,13 +776,13 @@ public class FunctionManagerDB implements FunctionManager {
throws CancelledException, IOException {
FunctionIterator functions = getFunctions(false);
while (functions.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
FunctionDB func = (FunctionDB) functions.next();
removeExplicitThisParameters(func);
}
functions = getExternalFunctions();
while (functions.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
FunctionDB func = (FunctionDB) functions.next();
removeExplicitThisParameters(func);
}
@ -1077,7 +1077,7 @@ public class FunctionManagerDB implements FunctionManager {
}
AddressIterator iter = decompilerPropertyMap.getPropertyIterator();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
upgradeDotDotDotToVarArgs(iter.next(), decompilerPropertyMap);
}
@ -1327,7 +1327,7 @@ public class FunctionManagerDB implements FunctionManager {
try {
RecordIterator recIter = adapter.iterateFunctionRecords();
while (recIter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = recIter.next();
// NOTE: addrMap has already been switched-over to new language and its address spaces

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/function/FunctionStackFrame.java
View file

@ -415,7 +415,7 @@ class FunctionStackFrame implements StackFrame {
function.manager.lock.acquire();
try {
checkIsValid();
Object key = new Integer(offset);
Object key = Integer.valueOf(offset);
int index = Arrays.binarySearch(variables, key, StackVariableComparator.get());
if (index >= 0) {
return variables[index];

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/map/NormalizedAddressSet.java
View file

@ -118,7 +118,7 @@ public class NormalizedAddressSet implements AddressSetView {
if (set == null) {
set = new SortedRangeList();
baseLists.put(baseKey, set);
bases.add(new Long(baseKey));
bases.add(Long.valueOf(baseKey));
Collections.sort(bases, baseComparator);
}
set.addRange((int) minKey + Integer.MIN_VALUE, (int) maxKey + Integer.MIN_VALUE);
@ -150,7 +150,7 @@ public class NormalizedAddressSet implements AddressSetView {
set.removeRange((int) minKey + Integer.MIN_VALUE, (int) maxKey + Integer.MIN_VALUE);
if (set.isEmpty()) {
baseLists.remove(baseKey);
bases.remove(new Long(baseKey));
bases.remove(Long.valueOf(baseKey));
}
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/module/ModuleDBAdapter.java
View file

@ -68,7 +68,7 @@ abstract class ModuleDBAdapter {
tmpAdapter = new ModuleDBAdapterV1(tmpHandle, true, treeID);
RecordIterator it = oldAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
tmpAdapter.updateModuleRecord(rec);
}
@ -77,7 +77,7 @@ abstract class ModuleDBAdapter {
ModuleDBAdapter newAdapter = new ModuleDBAdapterV1(handle, true, treeID);
it = tmpAdapter.getRecords();
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = it.next();
newAdapter.updateModuleRecord(rec);
}

10
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/module/ModuleManager.java
View file

@ -189,7 +189,7 @@ class ModuleManager {
AddressRangeIterator iter = map.getAddressRanges();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
AddressRange range = iter.next();
Address startAddr = range.getMinAddress();
Address endAddr = range.getMaxAddress();
@ -210,7 +210,7 @@ class ModuleManager {
LongField.INSTANCE, true);
iter = tmpMap.getAddressRanges();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
AddressRange range = iter.next();
map.paintRange(range.getMinAddress(), range.getMaxAddress(),
tmpMap.getValue(range.getMinAddress()));
@ -378,7 +378,7 @@ class ModuleManager {
AddressRangeIterator rangeIter = fragMap.getAddressRanges(fromAddr, rangeEnd);
while (rangeIter.hasNext() && !addrSet.isEmpty()) {
monitor.checkCanceled();
monitor.checkCancelled();
AddressRange range = rangeIter.next();
Field field = fragMap.getValue(range.getMinAddress());
try {
@ -410,11 +410,11 @@ class ModuleManager {
}
monitor.checkCanceled();
monitor.checkCancelled();
fragMap.clearRange(fromAddr, rangeEnd);
for (int i = 0; i < list.size(); i++) {
monitor.checkCanceled();
monitor.checkCancelled();
FragmentHolder fh = list.get(i);
fragMap.paintRange(fh.range.getMinAddress(), fh.range.getMaxAddress(),
new LongField(fh.frag.getKey()));

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/module/TreeManager.java
View file

@ -406,7 +406,7 @@ public class TreeManager implements ManagerDB {
Iterator<String> keys = treeMap.keySet().iterator();
monitor.setMessage("Moving folders/fragments...");
while (keys.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
ModuleManager m = treeMap.get(keys.next());
m.moveAddressRange(fromAddr, toAddr, length, monitor);
m.invalidateCache();

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/oldfunction/OldFunctionManager.java
View file

@ -89,7 +89,7 @@ public class OldFunctionManager implements ErrorHandler {
OldFunctionIteratorDB iter = getFunctions();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
upgradeFunction(iter.next());
monitor.setProgress(++cnt);
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/oldfunction/OldStackFrameDB.java
View file

@ -299,7 +299,7 @@ class OldStackFrameDB implements StackFrame {
// find the first stack variable defined at or after 0
loadStackVariables();
Object key = new Integer(0);
Object key = Integer.valueOf(0);
int loc = Collections.binarySearch(variables, key, StackVariableComparator.get());
loc = (loc < 0 ? -1 - loc : loc);
if (loc < variables.size()) {
@ -345,7 +345,7 @@ class OldStackFrameDB implements StackFrame {
public Variable getVariableContaining(int offset) {
synchronized (function) {
loadStackVariables();
Object key = new Integer(offset);
Object key = Integer.valueOf(offset);
int index = Collections.binarySearch(variables, key, StackVariableComparator.get());
if (index >= 0) {
return variables.get(index);

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/properties/DBPropertyMapManager.java
View file

@ -594,7 +594,7 @@ public class DBPropertyMapManager implements PropertyMapManager, ManagerDB {
try {
Iterator<PropertyMapDB<?>> iter = propertyMapCache.values().iterator();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
PropertyMapDB<?> pm = iter.next();
pm.removeRange(startAddr, endAddr);
}
@ -612,7 +612,7 @@ public class DBPropertyMapManager implements PropertyMapManager, ManagerDB {
try {
Iterator<PropertyMapDB<?>> iter = propertyMapCache.values().iterator();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
PropertyMapDB<?> pm = iter.next();
pm.moveRange(fromAddr, fromAddr.add(length - 1), toAddr);
}

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/OldStackRefDBAdpater.java
View file

@ -83,7 +83,7 @@ class OldStackRefDBAdpater {
RecordIterator iter = refTable.iterator();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
newRefTable.putRecord(iter.next());
monitor.setProgress(++count);
}

10
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ReferenceDBManager.java
View file

@ -167,7 +167,7 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan
int cnt = 0;
while (toIterator.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
Address oldAddr = toIterator.next();
if (!oldAddr.isVariableAddress() && !(oldAddr instanceof OldGenericNamespaceAddress)) {
break;
@ -253,7 +253,7 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan
RecordIterator iter = oldStackRefAdapter.getRecords();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
Address fromAddr =
@ -1390,7 +1390,7 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan
}
for (Reference ref : refs) {
monitor.checkCanceled();
monitor.checkCancelled();
Address fromAddr = ref.getFromAddress();
int opIndex = ref.getOperandIndex();
@ -1437,7 +1437,7 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan
AddressIterator refSourceIter = getReferenceSourceIterator(firstAddr, forward);
while (refSourceIter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
Address oldFromAddr = refSourceIter.next();
if ((forward && oldFromAddr.compareTo(fromEndAddr) > 0) ||
@ -1460,7 +1460,7 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan
Address newRefFromAddr = toAddr.add(offset);
for (Reference ref : refs) {
monitor.checkCanceled();
monitor.checkCancelled();
Address newRefToAddr = ref.getToAddress();
int opIndex = ref.getOperandIndex();

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/AddressRangeObjectMap.java
View file

@ -74,7 +74,7 @@ public class AddressRangeObjectMap<T> {
Address fromEndAddr = fromAddr.add(length - 1);
for (AddressRange range : getAddressRangeIterator(fromAddr, fromEndAddr)) {
monitor.checkCanceled();
monitor.checkCancelled();
Address minAddr = range.getMinAddress();
T value = getObject(minAddr);
@ -89,7 +89,7 @@ public class AddressRangeObjectMap<T> {
}
clearRange(fromAddr, fromEndAddr);
for (AddressRange range : tmpMap.getAddressRangeIterator()) {
monitor.checkCanceled();
monitor.checkCancelled();
T value = tmpMap.getObject(range.getMinAddress());
setObject(range.getMinAddress(), range.getMaxAddress(), value);
}

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/InMemoryRangeMapAdapter.java
View file

@ -129,7 +129,7 @@ public class InMemoryRangeMapAdapter implements RangeMapAdapter {
AddressRangeObjectMap<byte[]> newRangeMap = new AddressRangeObjectMap<byte[]>();
AddressRangeIterator addressRangeIterator = rangeMap.getAddressRangeIterator();
while (addressRangeIterator.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
AddressRange range = addressRangeIterator.next();
byte[] oldBytes = rangeMap.getObject(range.getMinAddress());
RegisterValue regValue = new RegisterValue(mapReg, oldBytes);

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/register/ProgramRegisterContextDB.java
View file

@ -99,7 +99,7 @@ public class ProgramRegisterContextDB extends AbstractStoredProgramContext imple
}
AddressRangeIterator it = oldContext.getRegisterValueAddressRanges(register);
while (it.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
AddressRange range = it.next();
RegisterValue regValue =
oldContext.getNonDefaultValue(register, range.getMinAddress());
@ -324,7 +324,7 @@ public class ProgramRegisterContextDB extends AbstractStoredProgramContext imple
// Map all register stores to new registers
for (Register register : registers) {
monitor.checkCanceled();
monitor.checkCancelled();
if (!register.isBaseRegister()) {
continue; // only consider non-context base registers
}

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/reloc/RelocationDBAdapter.java
View file

@ -298,7 +298,7 @@ abstract class RelocationDBAdapter {
// Update status/length of each relocation record
for (int i = 0; i < list.size(); i++) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = list.get(i);
int byteLength = 0;
Status status;

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/NamespaceManager.java
View file

@ -308,7 +308,7 @@ public class NamespaceManager implements ManagerDB {
AddressRangeIterator rangeIter = namespaceMap.getAddressRanges(fromAddr, rangeEnd);
while (rangeIter.hasNext() && !addrSet.isEmpty()) {
monitor.checkCanceled();
monitor.checkCancelled();
AddressRange range = rangeIter.next();
Field field = namespaceMap.getValue(range.getMinAddress());
long namespaceID = field.getLongValue();
@ -332,11 +332,11 @@ public class NamespaceManager implements ManagerDB {
addrSet = addrSet.subtract(intersection);
}
monitor.checkCanceled();
monitor.checkCancelled();
namespaceMap.clearRange(fromAddr, rangeEnd);
for (int i = 0; i < list.size(); i++) {
monitor.checkCanceled();
monitor.checkCancelled();
NamespaceHolder h = list.get(i);
namespaceMap.paintRange(h.range.getMinAddress(), h.range.getMaxAddress(),
new LongField(h.namespaceID));

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/SymbolDatabaseAdapter.java
View file

@ -168,7 +168,7 @@ abstract class SymbolDatabaseAdapter {
SymbolDatabaseAdapterV3 tmpAdapter = new SymbolDatabaseAdapterV3(tmpHandle, addrMap, true);
RecordIterator iter = oldAdapter.getSymbols();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
Address addr = oldAddrMap.decodeAddress(rec.getLongValue(SYMBOL_ADDR_COL));
rec.setLongValue(SYMBOL_ADDR_COL, addrMap.getKey(addr, true));
@ -192,7 +192,7 @@ abstract class SymbolDatabaseAdapter {
RecordIterator iter = tmpAdapter.getSymbols();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
newAdapter.updateSymbolRecord(iter.next());
monitor.incrementProgress(1);
}

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/SymbolDatabaseAdapterV0.java
View file

@ -93,7 +93,7 @@ class SymbolDatabaseAdapterV0 extends SymbolDatabaseAdapter {
int cnt = 0;
RecordIterator iter = symbolTable.iterator();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
if (rec.getBooleanValue(V0_SYMBOL_LOCAL_COL)) {
SymbolManager.saveLocalSymbol(handle, rec.getKey(),

10
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/SymbolManager.java
View file

@ -243,7 +243,7 @@ public class SymbolManager implements SymbolTable, ManagerDB {
adapter.getSymbols(AddressSpace.EXTERNAL_SPACE.getMinAddress(),
AddressSpace.EXTERNAL_SPACE.getMaxAddress(), true);
while (symbolRecordIterator.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = symbolRecordIterator.next();
rec.setByteValue(SymbolDatabaseAdapter.SYMBOL_TYPE_COL, SymbolType.LABEL.getID());
adapter.updateSymbolRecord(rec);
@ -271,7 +271,7 @@ public class SymbolManager implements SymbolTable, ManagerDB {
RecordIterator symbolRecordIterator = adapter.getSymbols();
while (symbolRecordIterator.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
monitor.setProgress(++cnt);
DBRecord rec = symbolRecordIterator.next();
long addr = rec.getLongValue(SymbolDatabaseAdapter.SYMBOL_ADDR_COL);
@ -333,7 +333,7 @@ public class SymbolManager implements SymbolTable, ManagerDB {
Address curVarAddr = null;
long curDataTypeId = -1;
while (recIter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = recIter.next();
Address addr =
addrMap.decodeAddress(rec.getLongValue(SymbolDatabaseAdapter.SYMBOL_ADDR_COL));
@ -403,7 +403,7 @@ public class SymbolManager implements SymbolTable, ManagerDB {
RecordIterator iter = table.iterator();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
Address addr = oldAddrMap.decodeAddress(rec.getKey());
refManager.addExternalEntryPointRef(addr);
@ -434,7 +434,7 @@ public class SymbolManager implements SymbolTable, ManagerDB {
RecordIterator iter = table.iterator();
while (iter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = iter.next();
Address addr = oldAddrMap.decodeAddress(rec.getLongValue(OLD_SYMBOL_ADDR_COL));
Namespace namespace = namespaceMgr.getNamespaceContaining(addr);

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/symbol/VariableStorageManagerDB.java
View file

@ -330,7 +330,7 @@ public class VariableStorageManagerDB implements VariableStorageManager {
try {
RecordIterator recIter = adapter.getRecords();
while (recIter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
DBRecord rec = recIter.next();
// NOTE: addrMap has already been switched-over to new language and its address spaces

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressRangeMapDB.java
View file

@ -266,7 +266,7 @@ public class AddressRangeMapDB implements DBListener {
Address fromEndAddr = fromAddr.add(length - 1);
for (AddressRange range : getAddressRanges(fromAddr, fromEndAddr)) {
monitor.checkCanceled();
monitor.checkCancelled();
Address minAddr = range.getMinAddress();
Field value = getValue(minAddr);
@ -281,7 +281,7 @@ public class AddressRangeMapDB implements DBListener {
}
clearRange(fromAddr, fromEndAddr);
for (AddressRange range : tmpMap.getAddressRanges()) {
monitor.checkCanceled();
monitor.checkCancelled();
Field value = tmpMap.getValue(range.getMinAddress());
paintRange(range.getMinAddress(), range.getMaxAddress(), value);
}

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/util/AddressSetPropertyMapDB.java
View file

@ -286,7 +286,7 @@ public class AddressSetPropertyMapDB implements AddressSetPropertyMap {
AddressSet currentSet = new AddressSet();
AddressRangeIterator rangeIter = propertyMap.getAddressRanges(fromAddr, rangeEnd);
while (rangeIter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
currentSet.add(rangeIter.next());
}
@ -294,7 +294,7 @@ public class AddressSetPropertyMapDB implements AddressSetPropertyMap {
rangeIter = currentSet.getAddressRanges();
while (rangeIter.hasNext()) {
monitor.checkCanceled();
monitor.checkCancelled();
AddressRange range = rangeIter.next();
Address startAddr = range.getMinAddress();
Address endAddr = range.getMaxAddress();

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressMapImpl.java
View file

@ -85,7 +85,7 @@ public class AddressMapImpl {
addrToIndexMap.clear();
for (int i = 0; i < baseAddrs.length; i++) {
if (!addrToIndexMap.containsKey(baseAddrs[i])) {
addrToIndexMap.put(baseAddrs[i], new Integer(i));
addrToIndexMap.put(baseAddrs[i], Integer.valueOf(i));
}
}
}

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleDestReferenceIterator.java
View file

@ -54,7 +54,7 @@ public class SimpleDestReferenceIterator implements CodeBlockReferenceIterator {
* @see ghidra.program.model.block.CodeBlockReferenceIterator#next()
*/
public CodeBlockReference next() throws CancelledException {
monitor.checkCanceled();
monitor.checkCancelled();
return blockRefQueue.isEmpty() ? null : blockRefQueue.removeFirst();
}
@ -62,7 +62,7 @@ public class SimpleDestReferenceIterator implements CodeBlockReferenceIterator {
* @see ghidra.program.model.block.CodeBlockReferenceIterator#hasNext()
*/
public boolean hasNext() throws CancelledException {
monitor.checkCanceled();
monitor.checkCancelled();
return !blockRefQueue.isEmpty();
}
@ -249,7 +249,7 @@ public class SimpleDestReferenceIterator implements CodeBlockReferenceIterator {
Reference refs[] = primitive.getReferencesFrom();
for (int i = 0; i < refs.length; i++) {
monitor.checkCanceled();
monitor.checkCancelled();
CodeBlock destBlock = null;

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SimpleSourceReferenceIterator.java
View file

@ -54,7 +54,7 @@ public class SimpleSourceReferenceIterator implements CodeBlockReferenceIterator
* @see ghidra.program.model.block.CodeBlockReferenceIterator#next()
*/
public CodeBlockReference next() throws CancelledException {
monitor.checkCanceled();
monitor.checkCancelled();
return (blockRefQueue.isEmpty() ? null : blockRefQueue.removeFirst());
}
@ -62,7 +62,7 @@ public class SimpleSourceReferenceIterator implements CodeBlockReferenceIterator
* @see ghidra.program.model.block.CodeBlockReferenceIterator#hasNext()
*/
public boolean hasNext() throws CancelledException {
monitor.checkCanceled();
monitor.checkCancelled();
return !blockRefQueue.isEmpty();
}

5
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SubroutineDestReferenceIterator.java
View file

@ -1,6 +1,5 @@
/* ###
* IP: GHIDRA
* REVIEWED: YES
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -52,7 +51,7 @@ public class SubroutineDestReferenceIterator implements CodeBlockReferenceIterat
* @see ghidra.program.model.block.CodeBlockReferenceIterator#next()
*/
public CodeBlockReference next() throws CancelledException {
monitor.checkCanceled();
monitor.checkCancelled();
return blockRefQueue.isEmpty() ? null : blockRefQueue.removeFirst();
}
@ -60,7 +59,7 @@ public class SubroutineDestReferenceIterator implements CodeBlockReferenceIterat
* @see ghidra.program.model.block.CodeBlockReferenceIterator#hasNext()
*/
public boolean hasNext() throws CancelledException {
monitor.checkCanceled();
monitor.checkCancelled();
return !blockRefQueue.isEmpty();
}

5
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/block/SubroutineSourceReferenceIterator.java
View file

@ -1,6 +1,5 @@
/* ###
* IP: GHIDRA
* REVIEWED: YES
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -52,7 +51,7 @@ public class SubroutineSourceReferenceIterator implements CodeBlockReferenceIter
* @see ghidra.program.model.block.CodeBlockReferenceIterator#next()
*/
public CodeBlockReference next() throws CancelledException {
monitor.checkCanceled();
monitor.checkCancelled();
return (blockRefQueue.isEmpty() ? null : blockRefQueue.removeFirst());
}
@ -60,7 +59,7 @@ public class SubroutineSourceReferenceIterator implements CodeBlockReferenceIter
* @see ghidra.program.model.block.CodeBlockReferenceIterator#hasNext()
*/
public boolean hasNext() throws CancelledException {
monitor.checkCanceled();
monitor.checkCancelled();
return !blockRefQueue.isEmpty();
}

6
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/DataTypeWriter.java
View file

@ -169,7 +169,7 @@ public class DataTypeWriter {
monitor.initialize(dataTypes.length);
int cnt = 0;
for (DataType dataType : dataTypes) {
monitor.checkCanceled();
monitor.checkCancelled();
write(dataType, monitor);
monitor.setProgress(++cnt);
}
@ -192,7 +192,7 @@ public class DataTypeWriter {
monitor.initialize(dataTypes.size());
int cnt = 0;
for (DataType dataType : dataTypes) {
monitor.checkCanceled();
monitor.checkCancelled();
write(dataType, monitor, throwExceptionOnInvalidType);
monitor.setProgress(++cnt);
}
@ -461,7 +461,7 @@ public class DataTypeWriter {
sb.append(EOL);
for (DataTypeComponent component : composite.getComponents()) {
monitor.checkCanceled();
monitor.checkCancelled();
writeComponent(component, composite, sb, monitor);
}

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/FileTimeDataType.java
View file

@ -97,7 +97,7 @@ public class FileTimeDataType extends BuiltIn {
public Object getValue(MemBuffer buf, Settings settings, int length) {
try {
long numTicks = buf.getLong(0);
return new Long(numTicks);
return Long.valueOf(numTicks);
}
catch (MemoryAccessException e) {
return null;

8
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/IndexedDynamicDataType.java
View file

@ -86,7 +86,7 @@ public abstract class IndexedDynamicDataType extends DynamicDataType {
}
for (int i = 0; i < keys.length; i++) {
table.put(new Long(keys[i]), new Integer(i));
table.put(Long.valueOf(keys[i]), Integer.valueOf(i));
}
if (mask == 0) {
mask = 0xFFFFFFFF;
@ -129,7 +129,7 @@ public abstract class IndexedDynamicDataType extends DynamicDataType {
}
for (int i = 0; i < structs.length; i++) {
table.put(new Long(i), new Integer(i));
table.put(Long.valueOf(i), Integer.valueOf(i));
}
}
@ -145,10 +145,10 @@ public abstract class IndexedDynamicDataType extends DynamicDataType {
long index = getIndex(memory, start.add(indexOffset)) & mask;
Integer structIndex = null;
if (keys.length == 1) {
structIndex = (index == keys[0]) ? new Integer(0) : new Integer(1);
structIndex = (index == keys[0]) ? Integer.valueOf(0) : Integer.valueOf(1);
}
else {
structIndex = table.get(new Long(index));
structIndex = table.get(Long.valueOf(index));
}
if (structIndex == null) {

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/data/StandAloneDataTypeManager.java
View file

@ -850,7 +850,7 @@ public class StandAloneDataTypeManager extends DataTypeManagerDB implements Clos
monitor.setMessage("Clear custom storage use...");
// for (FunctionDefinition def : ImmutableList.copyOf(getAllFunctionDefinitions())) {
monitor.checkCanceled();
monitor.checkCancelled();
// monitor.incrementProgress(1);
//
// // TODO: update function definition

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/util/AcyclicCallGraphBuilder.java
View file

@ -93,7 +93,7 @@ public class AcyclicCallGraphBuilder {
Set<Address> unprocessed = new TreeSet<>(functionSet); // reliable processing order
monitor.initialize(unprocessed.size());
while (!unprocessed.isEmpty()) {
monitor.checkCanceled();
monitor.checkCancelled();
Address functionEntry = getNextStartFunction(startPoints, unprocessed);
processForward(graph, unprocessed, functionEntry, monitor);
}
@ -166,7 +166,7 @@ public class AcyclicCallGraphBuilder {
initializeNode(curnode);
graph.addValue(curnode.address);
while (!stack.isEmpty()) {
monitor.checkCanceled();
monitor.checkCancelled();
curnode = stack.peek();
if (curnode.nextchild >= curnode.children.length) { // Node more to children to traverse for this node

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/VariableStorageConflicts.java
View file

@ -64,7 +64,7 @@ public class VariableStorageConflicts {
AddressSet set2 = null;
for (int i = 0; i < variables1.size(); i++) {
monitor.checkCanceled();
monitor.checkCancelled();
Variable var1 = variables1.get(i);
if (var1 == null) {
continue; // already consumed
@ -145,7 +145,7 @@ public class VariableStorageConflicts {
nonOverlappingVariables2, set1);
}
for (int i = 0; !set2.isEmpty() && i < variables1.size(); i++) {
monitor.checkCanceled();
monitor.checkCancelled();
expanded |=
findOverlaps(firstUseOffset, variables1, i, overlapList1, set1,
nonOverlappingVariables1, set2);

18
Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/program/database/register/AddressRangeObjectMapTest.java
View file

@ -44,7 +44,7 @@ public class AddressRangeObjectMapTest extends AbstractGenericTest {
public void testTwoSpacesWithSecondRangeAt0() throws Exception {
AddressSpace space2 = new GenericAddressSpace("Test2", 32, AddressSpace.TYPE_RAM, 1);
AddressRangeObjectMap<Integer> rangeMap = new AddressRangeObjectMap<Integer>();
Integer one = new Integer(1);
Integer one = Integer.valueOf(1);
rangeMap.setObject(addr(0x1000), addr(0x2000), one);
rangeMap.setObject(space2.getAddress(0), space2.getAddress(10), one);
AddressRangeIterator it = rangeMap.getAddressRangeIterator();
@ -66,7 +66,7 @@ public class AddressRangeObjectMapTest extends AbstractGenericTest {
public void testAddOverlappingRangeWithSameObject() {
AddressRangeObjectMap<Integer> rangeMap = new AddressRangeObjectMap<Integer>();
Integer one = new Integer(1);
Integer one = Integer.valueOf(1);
rangeMap.setObject(addr(0x1000), addr(0x2000), one);
rangeMap.setObject(addr(0x1500), addr(0x3000), one);
@ -85,7 +85,7 @@ public class AddressRangeObjectMapTest extends AbstractGenericTest {
public void testAddAdjoiningRangesWithSameObject() {
AddressRangeObjectMap<Integer> rangeMap = new AddressRangeObjectMap<Integer>();
Integer one = new Integer(1);
Integer one = Integer.valueOf(1);
rangeMap.setObject(addr(0x1000), addr(0x2000), one);
rangeMap.setObject(addr(0x2001), addr(0x3000), one);
@ -104,8 +104,8 @@ public class AddressRangeObjectMapTest extends AbstractGenericTest {
public void testAddAdjoiningRangesWithDifferentObject() {
AddressRangeObjectMap<Integer> rangeMap = new AddressRangeObjectMap<Integer>();
Integer one = new Integer(1);
Integer two = new Integer(2);
Integer one = Integer.valueOf(1);
Integer two = Integer.valueOf(2);
rangeMap.setObject(addr(0x1000), addr(0x2000), one);
rangeMap.setObject(addr(0x2001), addr(0x3000), two);
@ -128,8 +128,8 @@ public class AddressRangeObjectMapTest extends AbstractGenericTest {
public void testAddCompletelyCoveredRangeWithDifferentObject() {
AddressRangeObjectMap<Integer> rangeMap = new AddressRangeObjectMap<Integer>();
Integer one = new Integer(1);
Integer two = new Integer(2);
Integer one = Integer.valueOf(1);
Integer two = Integer.valueOf(2);
rangeMap.setObject(addr(0x1000), addr(0x2000), one);
rangeMap.setObject(addr(0x500), addr(0x3000), two);
@ -147,8 +147,8 @@ public class AddressRangeObjectMapTest extends AbstractGenericTest {
public void testAddSingleAddressRangeInMiddleOfExistingRangeWithDifferentObject() {
AddressRangeObjectMap<Integer> rangeMap = new AddressRangeObjectMap<Integer>();
Integer one = new Integer(1);
Integer two = new Integer(2);
Integer one = Integer.valueOf(1);
Integer two = Integer.valueOf(2);
rangeMap.setObject(addr(0x1000), addr(0x2000), one);

92
Ghidra/Framework/SoftwareModeling/src/test/java/ghidra/util/MultiIteratorTest.java
View file

@ -42,11 +42,11 @@ public class MultiIteratorTest extends AbstractGenericTest {
MultiIterator<Integer> iterator = new MultiIterator<>(list, true);
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(1), iterator.next());
Assert.assertEquals(Integer.valueOf(1), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(2), iterator.next());
Assert.assertEquals(Integer.valueOf(2), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(3), iterator.next());
Assert.assertEquals(Integer.valueOf(3), iterator.next());
assertFalse(iterator.hasNext());
}
@ -58,11 +58,11 @@ public class MultiIteratorTest extends AbstractGenericTest {
MultiIterator<Integer> iterator = new MultiIterator<>(list, false);
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(3), iterator.next());
Assert.assertEquals(Integer.valueOf(3), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(2), iterator.next());
Assert.assertEquals(Integer.valueOf(2), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(1), iterator.next());
Assert.assertEquals(Integer.valueOf(1), iterator.next());
assertFalse(iterator.hasNext());
}
@ -76,25 +76,25 @@ public class MultiIteratorTest extends AbstractGenericTest {
MultiIterator<Integer> iterator = new MultiIterator<>(list, true);
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(1), iterator.next());
Assert.assertEquals(Integer.valueOf(1), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(2), iterator.next());
Assert.assertEquals(Integer.valueOf(2), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(3), iterator.next());
Assert.assertEquals(Integer.valueOf(3), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(4), iterator.next());
Assert.assertEquals(Integer.valueOf(4), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(5), iterator.next());
Assert.assertEquals(Integer.valueOf(5), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(6), iterator.next());
Assert.assertEquals(Integer.valueOf(6), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(7), iterator.next());
Assert.assertEquals(Integer.valueOf(7), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(8), iterator.next());
Assert.assertEquals(Integer.valueOf(8), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(9), iterator.next());
Assert.assertEquals(Integer.valueOf(9), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(10), iterator.next());
Assert.assertEquals(Integer.valueOf(10), iterator.next());
assertFalse(iterator.hasNext());
}
@ -108,25 +108,25 @@ public class MultiIteratorTest extends AbstractGenericTest {
MultiIterator<Integer> iterator = new MultiIterator<>(list, false);
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(10), iterator.next());
Assert.assertEquals(Integer.valueOf(10), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(9), iterator.next());
Assert.assertEquals(Integer.valueOf(9), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(8), iterator.next());
Assert.assertEquals(Integer.valueOf(8), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(7), iterator.next());
Assert.assertEquals(Integer.valueOf(7), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(6), iterator.next());
Assert.assertEquals(Integer.valueOf(6), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(5), iterator.next());
Assert.assertEquals(Integer.valueOf(5), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(4), iterator.next());
Assert.assertEquals(Integer.valueOf(4), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(3), iterator.next());
Assert.assertEquals(Integer.valueOf(3), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(2), iterator.next());
Assert.assertEquals(Integer.valueOf(2), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(1), iterator.next());
Assert.assertEquals(Integer.valueOf(1), iterator.next());
assertFalse(iterator.hasNext());
}
@ -138,15 +138,15 @@ public class MultiIteratorTest extends AbstractGenericTest {
MultiIterator<Integer> iterator = new MultiIterator<>(list, true);
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(1), iterator.next());
Assert.assertEquals(Integer.valueOf(1), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(2), iterator.next());
Assert.assertEquals(Integer.valueOf(2), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(2), iterator.next());
Assert.assertEquals(Integer.valueOf(2), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(2), iterator.next());
Assert.assertEquals(Integer.valueOf(2), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(3), iterator.next());
Assert.assertEquals(Integer.valueOf(3), iterator.next());
assertFalse(iterator.hasNext());
}
@ -160,23 +160,23 @@ public class MultiIteratorTest extends AbstractGenericTest {
MultiIterator<Integer> iterator = new MultiIterator<>(list, true);
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(1), iterator.next());
Assert.assertEquals(Integer.valueOf(1), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(2), iterator.next());
Assert.assertEquals(Integer.valueOf(2), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(2), iterator.next());
Assert.assertEquals(Integer.valueOf(2), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(3), iterator.next());
Assert.assertEquals(Integer.valueOf(3), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(3), iterator.next());
Assert.assertEquals(Integer.valueOf(3), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(4), iterator.next());
Assert.assertEquals(Integer.valueOf(4), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(5), iterator.next());
Assert.assertEquals(Integer.valueOf(5), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(6), iterator.next());
Assert.assertEquals(Integer.valueOf(6), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(7), iterator.next());
Assert.assertEquals(Integer.valueOf(7), iterator.next());
assertFalse(iterator.hasNext());
}
@ -193,11 +193,11 @@ public class MultiIteratorTest extends AbstractGenericTest {
iterator.hasNext();
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(1), iterator.next());
Assert.assertEquals(Integer.valueOf(1), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(2), iterator.next());
Assert.assertEquals(Integer.valueOf(2), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(3), iterator.next());
Assert.assertEquals(Integer.valueOf(3), iterator.next());
assertFalse(iterator.hasNext());
}
@ -214,11 +214,11 @@ public class MultiIteratorTest extends AbstractGenericTest {
iterator.hasNext();
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(3), iterator.next());
Assert.assertEquals(Integer.valueOf(3), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(2), iterator.next());
Assert.assertEquals(Integer.valueOf(2), iterator.next());
assertTrue(iterator.hasNext());
Assert.assertEquals(new Integer(1), iterator.next());
Assert.assertEquals(Integer.valueOf(1), iterator.next());
assertFalse(iterator.hasNext());
}