mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 07:56:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Specify parent of organization dialogs

Browse Source
This commit is contained in:
apriestman 2021-02-05 12:18:24 -05:00
parent f6b267b9ac
commit db64faff67
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/AddNewOrganizationDialog.java
View File

@ -52,8 +52,8 @@ class AddNewOrganizationDialog extends javax.swing.JDialog {
* Creates new form AddNewOrganizationDialog * Creates new form AddNewOrganizationDialog
*/ */
@Messages({"AddNewOrganizationDialog.addNewOrg.msg=Add New Organization"}) @Messages({"AddNewOrganizationDialog.addNewOrg.msg=Add New Organization"})
AddNewOrganizationDialog() { AddNewOrganizationDialog(javax.swing.JDialog parent) {
super((JFrame) WindowManager.getDefault().getMainWindow(), super(parent,
Bundle.AddNewOrganizationDialog_addNewOrg_msg(), Bundle.AddNewOrganizationDialog_addNewOrg_msg(),
true); // NON-NLS true); // NON-NLS
textBoxes = new ArrayList<>(); textBoxes = new ArrayList<>();
@ -67,8 +67,8 @@ class AddNewOrganizationDialog extends javax.swing.JDialog {
} }
// populates the dialog with existing case information to edit // populates the dialog with existing case information to edit
public AddNewOrganizationDialog(CentralRepoOrganization orgToEdit) { public AddNewOrganizationDialog(javax.swing.JDialog parent, CentralRepoOrganization orgToEdit) {
super((JFrame) WindowManager.getDefault().getMainWindow(), super(parent,
Bundle.AddNewOrganizationDialog_addNewOrg_msg(), Bundle.AddNewOrganizationDialog_addNewOrg_msg(),
true); // NON-NLS true); // NON-NLS
organizationToEdit = orgToEdit; organizationToEdit = orgToEdit;

6
Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageOrganizationsDialog.java
View File

@ -376,7 +376,7 @@ public final class ManageOrganizationsDialog extends JDialog {
private void deleteButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteButtonActionPerformed private void deleteButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteButtonActionPerformed
CentralRepoOrganization orgToDelete = organizationList.getSelectedValue(); CentralRepoOrganization orgToDelete = organizationList.getSelectedValue();
if (orgToDelete != null) { 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_message(),
Bundle.ManageOrganizationsDialog_confirmDeletion_title(), Bundle.ManageOrganizationsDialog_confirmDeletion_title(),
JOptionPane.YES_NO_OPTION)) { JOptionPane.YES_NO_OPTION)) {
@ -397,7 +397,7 @@ public final class ManageOrganizationsDialog extends JDialog {
}//GEN-LAST:event_closeButtonActionPerformed }//GEN-LAST:event_closeButtonActionPerformed
private void newButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newButtonActionPerformed private void newButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newButtonActionPerformed
AddNewOrganizationDialog dialogO = new AddNewOrganizationDialog(); AddNewOrganizationDialog dialogO = new AddNewOrganizationDialog(this);
if (dialogO.isChanged()) { if (dialogO.isChanged()) {
try { try {
newOrg = dialogO.getNewOrg(); 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 private void editButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editButtonActionPerformed
CentralRepoOrganization orgToEdit = organizationList.getSelectedValue(); CentralRepoOrganization orgToEdit = organizationList.getSelectedValue();
if (orgToEdit != null) { if (orgToEdit != null) {
AddNewOrganizationDialog dialogO = new AddNewOrganizationDialog(orgToEdit); AddNewOrganizationDialog dialogO = new AddNewOrganizationDialog(this, orgToEdit);
if (dialogO.isChanged()) { if (dialogO.isChanged()) {
try { try {
newOrg = dialogO.getNewOrg(); newOrg = dialogO.getNewOrg();