Skip to content
Snippets Groups Projects
Commit db64faff authored by apriestman's avatar apriestman
Browse files

Specify parent of organization dialogs

parent f6b267b9
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment