From 1adb0cf1e429a5c26ea9a43ab93ed2d131d785d9 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Thu, 11 Apr 2019 17:12:16 -0400 Subject: [PATCH] 4792 more string builder codacy adjustments --- .../contentviewer/DataContentViewerOtherCases.java | 6 +++--- .../contentviewer/OtherOccurrenceNodeInstanceData.java | 4 ++-- .../contentviewer/OtherOccurrencesFilesTableModel.java | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java index 4989fae1e4..31f0bf5861 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java @@ -302,8 +302,8 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi private void writeOtherOccurrencesToFileAsCSV(File destFile) { try (BufferedWriter writer = Files.newBufferedWriter(destFile.toPath())) { //write headers - StringBuilder headers = new StringBuilder(""); - headers.append('"').append(Bundle.DataContentViewerOtherCasesModel_csvHeader_case()) + StringBuilder headers = new StringBuilder("\""); + headers.append(Bundle.DataContentViewerOtherCasesModel_csvHeader_case()) .append("\",\"").append(Bundle.DataContentViewerOtherCasesModel_csvHeader_dataSource()) .append("\",\"").append(Bundle.DataContentViewerOtherCasesModel_csvHeader_attribute()) .append("\",\"").append(Bundle.DataContentViewerOtherCasesModel_csvHeader_value()) @@ -1097,7 +1097,7 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi if (EamDb.isEnabled() && filesTable.getSelectedRowCount() == 1) { int rowIndex = filesTable.getSelectedRow(); List selectedFile = filesTableModel.getListOfNodesForFile(rowIndex); - if (selectedFile.get(0) instanceof OtherOccurrenceNodeInstanceData) { + if (!selectedFile.isEmpty() && selectedFile.get(0) instanceof OtherOccurrenceNodeInstanceData) { OtherOccurrenceNodeInstanceData instanceData = (OtherOccurrenceNodeInstanceData) selectedFile.get(0); enableCentralRepoActions = instanceData.isCentralRepoNode(); } diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeInstanceData.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeInstanceData.java index 2c07bb08ab..1ac298fc45 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeInstanceData.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeInstanceData.java @@ -239,8 +239,8 @@ class OtherOccurrenceNodeInstanceData implements OtherOccurrenceNodeData { * @return a comma separated string representation of the node's data */ String toCsvString() { - StringBuilder line = new StringBuilder(""); - line.append('"').append(getCaseName()).append("\",\"") + StringBuilder line = new StringBuilder("\""); + line.append(getCaseName()).append("\",\"") .append(getDataSourceName()).append("\",\"") .append(getType()).append("\",\"") .append(getValue()).append("\",\"") diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrencesFilesTableModel.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrencesFilesTableModel.java index 08464eddd6..28dcb8214d 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrencesFilesTableModel.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrencesFilesTableModel.java @@ -62,9 +62,10 @@ public class OtherOccurrencesFilesTableModel extends AbstractTableModel { @Override public Object getValueAt(int rowIdx, int colIdx) { - if (nodeKeys.isEmpty()) { + if (nodeKeys.isEmpty() || nodeMap.get(nodeKeys.get(rowIdx)).isEmpty()) { return Bundle.OtherOccurrencesFilesTableModel_noData(); } + return FilenameUtils.getName(((OtherOccurrenceNodeInstanceData) nodeMap.get(nodeKeys.get(rowIdx)).get(0)).getFilePath()); }