From c1b05d8a4dd1ab587f6470507b11614b2ec65e0d Mon Sep 17 00:00:00 2001 From: apriestman Date: Thu, 4 Feb 2021 19:15:54 -0500 Subject: [PATCH 1/3] Don't set readyToIngest to false if not using an ingest stream. --- .../autopsy/casemodule/AddImageWizardAddingProgressPanel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java index 2b880093e9..b9ea8f1ae0 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java @@ -329,7 +329,6 @@ class AddImageWizardAddingProgressPanel extends ShortcutWizardDescriptorPanel { final UUID dataSourceId = UUID.randomUUID(); newContents.clear(); cleanupTask = null; - readyToIngest = false; dsProcessor = dsp; // Add a cleanup task to interrupt the background process if the @@ -364,6 +363,8 @@ class AddImageWizardAddingProgressPanel extends ShortcutWizardDescriptorPanel { // Kick off the DSProcessor if (dsProcessor.supportsIngestStream()) { + // Set readyToIngest to false to prevent the wizard from starting ingest a second time. + readyToIngest = false; dsProcessor.runWithIngestStream(ingestJobSettings, getDSPProgressMonitorImpl(), cbObj); } else { dsProcessor.run(getDSPProgressMonitorImpl(), cbObj); From db64faff67657a8f5c0ced8a9e1828d65adb5115 Mon Sep 17 00:00:00 2001 From: apriestman Date: Fri, 5 Feb 2021 12:18:24 -0500 Subject: [PATCH 2/3] Specify parent of organization dialogs --- .../optionspanel/AddNewOrganizationDialog.java | 8 ++++---- .../optionspanel/ManageOrganizationsDialog.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/AddNewOrganizationDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/AddNewOrganizationDialog.java index 6a9aa67c1d..e2eea44ae4 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/AddNewOrganizationDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/AddNewOrganizationDialog.java @@ -52,8 +52,8 @@ class AddNewOrganizationDialog extends javax.swing.JDialog { * Creates new form AddNewOrganizationDialog */ @Messages({"AddNewOrganizationDialog.addNewOrg.msg=Add New Organization"}) - AddNewOrganizationDialog() { - super((JFrame) WindowManager.getDefault().getMainWindow(), + AddNewOrganizationDialog(javax.swing.JDialog parent) { + super(parent, Bundle.AddNewOrganizationDialog_addNewOrg_msg(), true); // NON-NLS textBoxes = new ArrayList<>(); @@ -67,8 +67,8 @@ class AddNewOrganizationDialog extends javax.swing.JDialog { } // populates the dialog with existing case information to edit - public AddNewOrganizationDialog(CentralRepoOrganization orgToEdit) { - super((JFrame) WindowManager.getDefault().getMainWindow(), + public AddNewOrganizationDialog(javax.swing.JDialog parent, CentralRepoOrganization orgToEdit) { + super(parent, Bundle.AddNewOrganizationDialog_addNewOrg_msg(), true); // NON-NLS organizationToEdit = orgToEdit; diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageOrganizationsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageOrganizationsDialog.java index 85373c06d2..6614821f10 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageOrganizationsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageOrganizationsDialog.java @@ -376,7 +376,7 @@ public final class ManageOrganizationsDialog extends JDialog { private void deleteButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteButtonActionPerformed CentralRepoOrganization orgToDelete = organizationList.getSelectedValue(); if (orgToDelete != null) { - if (JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog(WindowManager.getDefault().getMainWindow(), + if (JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog(this, Bundle.ManageOrganizationsDialog_confirmDeletion_message(), Bundle.ManageOrganizationsDialog_confirmDeletion_title(), JOptionPane.YES_NO_OPTION)) { @@ -397,7 +397,7 @@ public final class ManageOrganizationsDialog extends JDialog { }//GEN-LAST:event_closeButtonActionPerformed private void newButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newButtonActionPerformed - AddNewOrganizationDialog dialogO = new AddNewOrganizationDialog(); + AddNewOrganizationDialog dialogO = new AddNewOrganizationDialog(this); if (dialogO.isChanged()) { try { newOrg = dialogO.getNewOrg(); @@ -411,7 +411,7 @@ public final class ManageOrganizationsDialog extends JDialog { private void editButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editButtonActionPerformed CentralRepoOrganization orgToEdit = organizationList.getSelectedValue(); if (orgToEdit != null) { - AddNewOrganizationDialog dialogO = new AddNewOrganizationDialog(orgToEdit); + AddNewOrganizationDialog dialogO = new AddNewOrganizationDialog(this, orgToEdit); if (dialogO.isChanged()) { try { newOrg = dialogO.getNewOrg(); From cb06d049ecbf9996756dc2219cd7372704c17a3b Mon Sep 17 00:00:00 2001 From: apriestman Date: Tue, 9 Feb 2021 11:00:27 -0500 Subject: [PATCH 3/3] Update to JNA 5.7.0 --- CoreLibs/ivy.xml | 2 +- CoreLibs/nbproject/project.properties | 4 ++-- CoreLibs/nbproject/project.xml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 1c83e48a09..7457154839 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -14,7 +14,7 @@ - + diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index fb53508bb4..3d8ebb951a 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -42,8 +42,8 @@ file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.j file.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4.jar file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4.jar file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.jar -file.reference.jna-5.6.0.jar=release/modules/ext/jna-5.6.0.jar -file.reference.jna-platform-5.6.0.jar=release/modules/ext/jna-platform-5.6.0.jar +file.reference.jna-5.7.0.jar=release/modules/ext/jna-5.7.0.jar +file.reference.jna-platform-5.7.0.jar=release/modules/ext/jna-platform-5.7.0.jar file.reference.joda-time-2.4.jar=release/modules/ext/joda-time-2.4.jar file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index f697a317ee..24219c333d 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -923,8 +923,8 @@ release/modules/ext/commons-compress-1.18.jar - ext/jna-platform-5.6.0.jar - release\modules\ext\jna-platform-5.6.0.jar + ext/jna-platform-5.7.0.jar + release\modules\ext\jna-platform-5.7.0.jar ext/opencv-248.jar @@ -951,8 +951,8 @@ release/modules/ext/imageio-bmp-3.2.jar - ext/jna-5.6.0.jar - release\modules\ext\jna-5.6.0.jar + ext/jna-5.7.0.jar + release\modules\ext\jna-5.7.0.jar ext/commons-lang-2.6.jar