github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 22:17:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix additional pluralization issues

Browse Source
This commit is contained in:
Dave Nicolson
2025-12-07 22:04:00 +01:00
parent 2df41bc02c
commit d2ed73f1ea
5 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/scalartable/ScalarSearchProvider.java
View File

@@ -209,8 +209,10 @@ public class ScalarSearchProvider extends ComponentProviderAdapter {
filter.setSecondaryFilter(new ScalarTableSecondaryFilter()); filter.setSecondaryFilter(new ScalarTableSecondaryFilter());
scalarModel.addTableModelListener( scalarModel.addTableModelListener(e -> {
e -> setSubTitle(primarySubTitle + ' ' + scalarModel.getRowCount() + " items")); int rowCount = scalarModel.getRowCount();
setSubTitle(primarySubTitle + ' ' + rowCount + " item" + (rowCount == 1 ? "" : "s"));
});
scalarTable.installNavigation(tool); scalarTable.installNavigation(tool);

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/DWARFImporter.java
View File

@@ -253,7 +253,9 @@ public class DWARFImporter {
} }
monitor.setIndeterminate(true); monitor.setIndeterminate(true);
monitor.setMessage("Sorting " + sourceInfo.size() + " entries"); int sourceInfoSize = sourceInfo.size();
monitor.setMessage("Sorting " + sourceInfoSize + " entr" +
(sourceInfoSize == 1 ? "y" : "ies"));
sourceInfo.sort((i, j) -> Long.compareUnsigned(i.address(), j.address())); sourceInfo.sort((i, j) -> Long.compareUnsigned(i.address(), j.address()));
monitor.setIndeterminate(false); monitor.setIndeterminate(false);
monitor.initialize(sourceInfo.size(), "DWARF: Applying Source Map Info"); monitor.initialize(sourceInfo.size(), "DWARF: Applying Source Map Info");

9
Ghidra/Features/Base/src/main/java/ghidra/plugins/fsbrowser/tasks/GFileSystemExtractAllTask.java
View File

@@ -69,9 +69,12 @@ public class GFileSystemExtractAllTask extends AbstractFileExtractorTask {
catch (UnsupportedOperationException | IOException e) { catch (UnsupportedOperationException | IOException e) {
Msg.showError(this, parentComponent, "Error extracting file", e.getMessage()); Msg.showError(this, parentComponent, "Error extracting file", e.getMessage());
} }
Msg.info(this, long files = getTotalFilesExportedCount();
"Exported " + getTotalFilesExportedCount() + " files, " + getTotalDirsExportedCount() + long dirs = getTotalDirsExportedCount();
" directories, " + getTotalBytesExportedCount() + " bytes"); long bytes = getTotalBytesExportedCount();
Msg.info(this, "Exported " + files + " file" + (files == 1 ? "" : "s") + ", " + dirs +
" director" + (dirs == 1 ? "y" : "ies") + ", " + bytes + " byte" +
(bytes == 1 ? "" : "s"));
long elapsed = System.currentTimeMillis() - start_ts; long elapsed = System.currentTimeMillis() - start_ts;

2
Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/plugin/core/decompiler/taint/TaintLabelsTableProvider.java
View File

@@ -92,7 +92,7 @@ public class TaintLabelsTableProvider extends ComponentProviderAdapter {
int unfilteredCount = model.getUnfilteredRowCount(); int unfilteredCount = model.getUnfilteredRowCount();
model.getDataFrame().dumpTableToDebug(); model.getDataFrame().dumpTableToDebug();
setSubTitle("" + rowCount + " items" + setSubTitle("" + rowCount + " item" + (rowCount == 1 ? "" : "s") +
(rowCount != unfilteredCount ? " (of " + unfilteredCount + ")" : "")); (rowCount != unfilteredCount ? " (of " + unfilteredCount + ")" : ""));
filterTable.repaint(); filterTable.repaint();
}); });

3
Ghidra/Features/GhidraServer/src/main/java/ghidra/server/UserManager.java
View File

@@ -92,7 +92,8 @@ public class UserManager {
try { try {
readUserListIfNeeded(); readUserListIfNeeded();
clearExpiredPasswords(); clearExpiredPasswords();
log.info("User file contains " + userList.size() + " entries"); int size = userList.size();
log.info("User file contains " + size + " entr" + (size == 1 ? "y" : "ies"));
} }
catch (FileNotFoundException e) { catch (FileNotFoundException e) {
log.error("Existing User file not found."); log.error("Existing User file not found.");