mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-14 17:06:16 +00:00
Convert view indexes to model indexes to fix problem where the wrong case was being opened if the users sorted the table.
This commit is contained in:
parent
c946abbce8
commit
e4a23322c3
@ -234,7 +234,7 @@ public final class AutoIngestCasePanel extends JPanel {
|
|||||||
try {
|
try {
|
||||||
int selectedRow = casesTable.getSelectedRow();
|
int selectedRow = casesTable.getSelectedRow();
|
||||||
if (selectedRow >= 0 && selectedRow < casesTable.getRowCount()) {
|
if (selectedRow >= 0 && selectedRow < casesTable.getRowCount()) {
|
||||||
return Paths.get(caseTableModel.getValueAt(selectedRow, COLUMN_HEADERS.CASE.ordinal()).toString());
|
return Paths.get(caseTableModel.getValueAt(casesTable.convertRowIndexToModel(selectedRow), COLUMN_HEADERS.CASE.ordinal()).toString());
|
||||||
}
|
}
|
||||||
} catch (Exception ignored) {
|
} catch (Exception ignored) {
|
||||||
return null;
|
return null;
|
||||||
@ -251,7 +251,7 @@ public final class AutoIngestCasePanel extends JPanel {
|
|||||||
if (path != null) {
|
if (path != null) {
|
||||||
try {
|
try {
|
||||||
for (int row = 0; row < casesTable.getRowCount(); ++row) {
|
for (int row = 0; row < casesTable.getRowCount(); ++row) {
|
||||||
Path temp = Paths.get(caseTableModel.getValueAt(row, COLUMN_HEADERS.CASE.ordinal()).toString());
|
Path temp = Paths.get(caseTableModel.getValueAt(casesTable.convertRowIndexToModel(row), COLUMN_HEADERS.CASE.ordinal()).toString());
|
||||||
if (temp.compareTo(path) == 0) { // found it
|
if (temp.compareTo(path) == 0) { // found it
|
||||||
casesTable.setRowSelectionInterval(row, row);
|
casesTable.setRowSelectionInterval(row, row);
|
||||||
return;
|
return;
|
||||||
@ -546,9 +546,10 @@ public final class AutoIngestCasePanel extends JPanel {
|
|||||||
* @param evt -- The event that caused this to be called
|
* @param evt -- The event that caused this to be called
|
||||||
*/
|
*/
|
||||||
private void bnOpenActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnOpenActionPerformed
|
private void bnOpenActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnOpenActionPerformed
|
||||||
Path caseMetadataFilePath = Paths.get((String) caseTableModel.getValueAt(casesTable.getSelectedRow(),
|
int modelRow = casesTable.convertRowIndexToModel(casesTable.getSelectedRow());
|
||||||
|
Path caseMetadataFilePath = Paths.get((String) caseTableModel.getValueAt(modelRow,
|
||||||
COLUMN_HEADERS.OUTPUTFOLDER.ordinal()),
|
COLUMN_HEADERS.OUTPUTFOLDER.ordinal()),
|
||||||
caseTableModel.getValueAt(casesTable.getSelectedRow(), COLUMN_HEADERS.CASE.ordinal()) + CaseMetadata.getFileExtension());
|
caseTableModel.getValueAt(modelRow, COLUMN_HEADERS.CASE.ordinal()) + CaseMetadata.getFileExtension());
|
||||||
openCase(caseMetadataFilePath);
|
openCase(caseMetadataFilePath);
|
||||||
}//GEN-LAST:event_bnOpenActionPerformed
|
}//GEN-LAST:event_bnOpenActionPerformed
|
||||||
|
|
||||||
@ -587,7 +588,7 @@ public final class AutoIngestCasePanel extends JPanel {
|
|||||||
}//GEN-LAST:event_rbWeeksItemStateChanged
|
}//GEN-LAST:event_rbWeeksItemStateChanged
|
||||||
|
|
||||||
private void bnShowLogActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnShowLogActionPerformed
|
private void bnShowLogActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnShowLogActionPerformed
|
||||||
int selectedRow = casesTable.getSelectedRow();
|
int selectedRow = casesTable.convertRowIndexToModel(casesTable.getSelectedRow());
|
||||||
int rowCount = casesTable.getRowCount();
|
int rowCount = casesTable.getRowCount();
|
||||||
if (selectedRow >= 0 && selectedRow < rowCount) {
|
if (selectedRow >= 0 && selectedRow < rowCount) {
|
||||||
String thePath = (String) caseTableModel.getValueAt(selectedRow, COLUMN_HEADERS.OUTPUTFOLDER.ordinal());
|
String thePath = (String) caseTableModel.getValueAt(selectedRow, COLUMN_HEADERS.OUTPUTFOLDER.ordinal());
|
||||||
@ -611,9 +612,10 @@ public final class AutoIngestCasePanel extends JPanel {
|
|||||||
|
|
||||||
private void casesTableMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_casesTableMouseClicked
|
private void casesTableMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_casesTableMouseClicked
|
||||||
if (evt.getClickCount() == 2) {
|
if (evt.getClickCount() == 2) {
|
||||||
Path caseMetadataFilePath = Paths.get((String) caseTableModel.getValueAt(casesTable.getSelectedRow(),
|
int modelRow = casesTable.convertRowIndexToModel(casesTable.getSelectedRow());
|
||||||
|
Path caseMetadataFilePath = Paths.get((String) caseTableModel.getValueAt(modelRow,
|
||||||
COLUMN_HEADERS.OUTPUTFOLDER.ordinal()),
|
COLUMN_HEADERS.OUTPUTFOLDER.ordinal()),
|
||||||
caseTableModel.getValueAt(casesTable.getSelectedRow(), COLUMN_HEADERS.CASE.ordinal()) + CaseMetadata.getFileExtension());
|
caseTableModel.getValueAt(modelRow, COLUMN_HEADERS.CASE.ordinal()) + CaseMetadata.getFileExtension());
|
||||||
openCase(caseMetadataFilePath);
|
openCase(caseMetadataFilePath);
|
||||||
}
|
}
|
||||||
}//GEN-LAST:event_casesTableMouseClicked
|
}//GEN-LAST:event_casesTableMouseClicked
|
||||||
|
Loading…
x
Reference in New Issue
Block a user