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

updated parent of ManageOrganizationsDialog when launching from OptionalCasePropertiesPanel

Browse Source
This commit is contained in:
Greg DiCristofaro 2020-04-08 15:47:54 -04:00
parent dea1d5e05f
commit cc46accfa2
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.java
View File

@ -19,8 +19,10 @@
package org.sleuthkit.autopsy.casemodule; package org.sleuthkit.autopsy.casemodule;
import java.awt.Cursor; import java.awt.Cursor;
import java.awt.Dialog;
import java.util.logging.Level; import java.util.logging.Level;
import javax.swing.JComboBox; import javax.swing.JComboBox;
import javax.swing.SwingUtilities;
import org.openide.util.NbBundle.Messages; import org.openide.util.NbBundle.Messages;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase; import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoException; import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoException;
@ -516,7 +518,7 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
}//GEN-LAST:event_comboBoxOrgNameActionPerformed }//GEN-LAST:event_comboBoxOrgNameActionPerformed
private void bnNewOrganizationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnNewOrganizationActionPerformed private void bnNewOrganizationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnNewOrganizationActionPerformed
ManageOrganizationsDialog dialog = new ManageOrganizationsDialog(); ManageOrganizationsDialog dialog = new ManageOrganizationsDialog((Dialog) SwingUtilities.getWindowAncestor(this));
// update the combobox options and org data fields // update the combobox options and org data fields
loadOrganizationData(); loadOrganizationData();
if (dialog.isChanged()) { if (dialog.isChanged()) {

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

@ -19,6 +19,7 @@
package org.sleuthkit.autopsy.centralrepository.optionspanel; package org.sleuthkit.autopsy.centralrepository.optionspanel;
import java.awt.Component; import java.awt.Component;
import java.awt.Dialog;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import javax.swing.DefaultListCellRenderer; import javax.swing.DefaultListCellRenderer;
@ -51,12 +52,41 @@ public final class ManageOrganizationsDialog extends JDialog {
@Messages({"ManageOrganizationsDialog.title.text=Manage Organizations"}) @Messages({"ManageOrganizationsDialog.title.text=Manage Organizations"})
/** /**
* Creates new form ManageOrganizationsPanel * Creates new form ManageOrganizationsPanel.
* @param parent The dialog parent.
*/ */
public ManageOrganizationsDialog() { public ManageOrganizationsDialog(Dialog parent) {
super((JFrame) WindowManager.getDefault().getMainWindow(), super(parent,
Bundle.ManageOrganizationsDialog_title_text(), Bundle.ManageOrganizationsDialog_title_text(),
true); // NON-NLS true); // NON-NLS
init();
}
/**
* Creates new form ManageOrganizationsPanel.
* @param parent The JFrame parent.
*/
public ManageOrganizationsDialog(JFrame parent) {
super(parent,
Bundle.ManageOrganizationsDialog_title_text(),
true); // NON-NLS
init();
}
/**
* Creates new form ManageOrganizationsPanel.
*/
public ManageOrganizationsDialog() {
this((JFrame) WindowManager.getDefault().getMainWindow());
}
/**
* To be run as a part of constructor initialization.
*/
private void init() {
initComponents(); initComponents();
try { try {
this.dbManager = CentralRepository.getInstance(); this.dbManager = CentralRepository.getInstance();
@ -85,6 +115,7 @@ public final class ManageOrganizationsDialog extends JDialog {
private void display() { private void display() {
this.setLocationRelativeTo(WindowManager.getDefault().getMainWindow()); this.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
setVisible(true); setVisible(true);
toFront();
} }
private void populateListAndSelect(CentralRepoOrganization selected) throws CentralRepoException { private void populateListAndSelect(CentralRepoOrganization selected) throws CentralRepoException {