From db64faff67657a8f5c0ced8a9e1828d65adb5115 Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Fri, 5 Feb 2021 12:18:24 -0500
Subject: [PATCH] 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 void actionPerformed(java.awt.event.ActionEvent evt) {
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 @@ private void closeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F
}//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 @@ private void newButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
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();
--
GitLab