4792 first batch of codacy fixes

This commit is contained in:
William Schaefer 2019-04-11 16:06:11 -04:00
parent 1301920a4a
commit a6af2924c6
5 changed files with 23 additions and 22 deletions

View File

@ -238,8 +238,8 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi
EamDb dbManager = EamDb.getInstance(); EamDb dbManager = EamDb.getInstance();
int selectedRowModelIdx = filesTable.convertRowIndexToModel(selectedRowViewIdx); int selectedRowModelIdx = filesTable.convertRowIndexToModel(selectedRowViewIdx);
List<OtherOccurrenceNodeData> rowList = filesTableModel.getListOfNodesForFile(selectedRowModelIdx); List<OtherOccurrenceNodeData> rowList = filesTableModel.getListOfNodesForFile(selectedRowModelIdx);
if (rowList.get(0) instanceof OtherOccurrenceNodeInstanceData) {
if (!rowList.isEmpty()) { if (!rowList.isEmpty()) {
if (rowList.get(0) instanceof OtherOccurrenceNodeInstanceData) {
CorrelationCase eamCasePartial = ((OtherOccurrenceNodeInstanceData) rowList.get(0)).getCorrelationAttributeInstance().getCorrelationCase(); CorrelationCase eamCasePartial = ((OtherOccurrenceNodeInstanceData) rowList.get(0)).getCorrelationAttributeInstance().getCorrelationCase();
caseDisplayName = eamCasePartial.getDisplayName(); caseDisplayName = eamCasePartial.getDisplayName();
// query case details // query case details
@ -250,10 +250,10 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi
details = Bundle.DataContentViewerOtherCases_caseDetailsDialog_noDetails(); details = Bundle.DataContentViewerOtherCases_caseDetailsDialog_noDetails();
} }
} else { } else {
details = Bundle.DataContentViewerOtherCases_caseDetailsDialog_noDetailsReference(); details = Bundle.DataContentViewerOtherCases_caseDetailsDialog_notSelected();
} }
} else { } else {
details = Bundle.DataContentViewerOtherCases_caseDetailsDialog_notSelected(); details = Bundle.DataContentViewerOtherCases_caseDetailsDialog_noDetailsReference();
} }
} }
} catch (EamDbException ex) { } catch (EamDbException ex) {
@ -303,13 +303,13 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi
try (BufferedWriter writer = Files.newBufferedWriter(destFile.toPath())) { try (BufferedWriter writer = Files.newBufferedWriter(destFile.toPath())) {
//write headers //write headers
StringBuilder headers = new StringBuilder(""); StringBuilder headers = new StringBuilder("");
headers.append('"').append(Bundle.DataContentViewerOtherCasesModel_csvHeader_case()).append('"').append(','); headers.append('"').append(Bundle.DataContentViewerOtherCasesModel_csvHeader_case()).append("\",\"");
headers.append('"').append(Bundle.DataContentViewerOtherCasesModel_csvHeader_dataSource()).append('"').append(','); headers.append(Bundle.DataContentViewerOtherCasesModel_csvHeader_dataSource()).append("\",\"");
headers.append('"').append(Bundle.DataContentViewerOtherCasesModel_csvHeader_attribute()).append('"').append(','); headers.append(Bundle.DataContentViewerOtherCasesModel_csvHeader_attribute()).append("\",\"");
headers.append('"').append(Bundle.DataContentViewerOtherCasesModel_csvHeader_value()).append('"').append(','); headers.append(Bundle.DataContentViewerOtherCasesModel_csvHeader_value()).append("\",\"");
headers.append('"').append(Bundle.DataContentViewerOtherCasesModel_csvHeader_known()).append('"').append(','); headers.append(Bundle.DataContentViewerOtherCasesModel_csvHeader_known()).append("\",\"");
headers.append('"').append(Bundle.DataContentViewerOtherCasesModel_csvHeader_path()).append('"').append(','); headers.append(Bundle.DataContentViewerOtherCasesModel_csvHeader_path()).append("\",\"");
headers.append('"').append(Bundle.DataContentViewerOtherCasesModel_csvHeader_comment()).append('"').append(System.getProperty("line.separator")); headers.append(Bundle.DataContentViewerOtherCasesModel_csvHeader_comment()).append("\"").append(System.getProperty("line.separator"));
writer.write(headers.toString()); writer.write(headers.toString());
//write content //write content
for (CorrelationAttributeInstance corAttr : correlationAttributes) { for (CorrelationAttributeInstance corAttr : correlationAttributes) {

View File

@ -240,13 +240,13 @@ class OtherOccurrenceNodeInstanceData implements OtherOccurrenceNodeData {
*/ */
String toCsvString() { String toCsvString() {
StringBuilder line = new StringBuilder(""); StringBuilder line = new StringBuilder("");
line.append('"').append(getCaseName()).append('"').append(','); line.append('"').append(getCaseName()).append("\",\"");
line.append('"').append(getDataSourceName()).append('"').append(','); line.append(getDataSourceName()).append("\",\"");
line.append('"').append(getType()).append('"').append(','); line.append(getType()).append("\",\"");
line.append('"').append(getValue()).append('"').append(','); line.append(getValue()).append("\",\"");
line.append('"').append(getKnown().toString()).append('"').append(','); line.append(getKnown().toString()).append("\",\"");
line.append('"').append(getFilePath()).append('"').append(','); line.append(getFilePath()).append("\",\"");
line.append('"').append(getComment()).append('"').append(System.getProperty("line.separator")); line.append(getComment()).append("\"").append(System.getProperty("line.separator"));
return line.toString(); return line.toString();
} }
} }

View File

@ -58,7 +58,7 @@ public class OtherOccurrencesCasesTableModel extends AbstractTableModel {
@Messages({"OtherOccurrencesCasesTableModel.noData=No Data."}) @Messages({"OtherOccurrencesCasesTableModel.noData=No Data."})
@Override @Override
public Object getValueAt(int rowIdx, int colIdx) { public Object getValueAt(int rowIdx, int colIdx) {
if (0 == correlationCaseList.size()) { if (correlationCaseList.isEmpty()) {
return Bundle.OtherOccurrencesCasesTableModel_noData(); return Bundle.OtherOccurrencesCasesTableModel_noData();
} }

View File

@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.centralrepository.contentviewer;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Objects; import java.util.Objects;
import java.util.Set;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
@ -30,7 +31,7 @@ import org.openide.util.NbBundle;
final class OtherOccurrencesDataSourcesTableModel extends AbstractTableModel { final class OtherOccurrencesDataSourcesTableModel extends AbstractTableModel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final LinkedHashSet<DataSourceColumnItem> dataSourceSet = new LinkedHashSet<>(); private final Set<DataSourceColumnItem> dataSourceSet = new LinkedHashSet<>();
/** /**
* Create a table model for displaying data source names * Create a table model for displaying data source names
@ -58,7 +59,7 @@ final class OtherOccurrencesDataSourcesTableModel extends AbstractTableModel {
@Override @Override
public Object getValueAt(int rowIdx, int colIdx) { public Object getValueAt(int rowIdx, int colIdx) {
if (0 == dataSourceSet.size()) { if (dataSourceSet.isEmpty()) {
return Bundle.OtherOccurrencesDataSourcesTableModel_noData(); return Bundle.OtherOccurrencesDataSourcesTableModel_noData();
} }
return ((DataSourceColumnItem) dataSourceSet.toArray()[rowIdx]).getDataSourceName(); return ((DataSourceColumnItem) dataSourceSet.toArray()[rowIdx]).getDataSourceName();

View File

@ -62,7 +62,7 @@ public class OtherOccurrencesFilesTableModel extends AbstractTableModel {
@Override @Override
public Object getValueAt(int rowIdx, int colIdx) { public Object getValueAt(int rowIdx, int colIdx) {
if (0 == nodeKeys.size()) { if (nodeKeys.isEmpty()) {
return Bundle.OtherOccurrencesFilesTableModel_noData(); return Bundle.OtherOccurrencesFilesTableModel_noData();
} }
return FilenameUtils.getName(((OtherOccurrenceNodeInstanceData) nodeMap.get(nodeKeys.get(rowIdx)).get(0)).getFilePath()); return FilenameUtils.getName(((OtherOccurrenceNodeInstanceData) nodeMap.get(nodeKeys.get(rowIdx)).get(0)).getFilePath());