From f019f22daf22ebfe3f1d4903d6039a8dae56250a Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 16 Oct 2009 00:27:26 +0000
Subject: [PATCH] Change the interface of ProgressDialog to be able to specify separately the frame of the dialog and the component that must be used as a reference to display the dialog.
---
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 3 +
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java | 5 +-
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java | 3 +
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java | 5 +-
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java | 3 +
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java | 13 ++++--
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java | 3 +
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java | 3 +
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java | 4 +-
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java | 7 ++-
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java | 4 +
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java | 4 +
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java | 3 +
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java | 6 +-
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java | 1
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java | 7 ++-
29 files changed, 60 insertions(+), 27 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
index 2fa964f..457bb46 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
@@ -181,7 +181,8 @@
if (errors.size() == 0)
{
ProgressDialog dlg = new ProgressDialog(
- Utilities.getParentDialog(this), getProgressDialogTitle(), getInfo());
+ Utilities.createFrame(), Utilities.getParentDialog(this),
+ getProgressDialogTitle(), getInfo());
try
{
NewEntryTask newTask =
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
index b655112..38065f7 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
@@ -429,6 +429,7 @@
if (errors.size() == 0)
{
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_ADD_TO_GROUP_TITLE.get(), getInfo());
LinkedHashSet<DN> groupDns = new LinkedHashSet<DN>();
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java
index 7523175..ce42a7b 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java
@@ -545,8 +545,9 @@
if (errors.isEmpty())
{
ProgressDialog progressDialog = new ProgressDialog(
- Utilities.getParentDialog(BackupPanel.this), getTitle(),
- getInfo());
+ Utilities.createFrame(),
+ Utilities.getParentDialog(BackupPanel.this),
+ getTitle(), getInfo());
BackupTask newTask = new BackupTask(getInfo(), progressDialog);
for (Task task : getInfo().getTasks())
{
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
index 440c851..5c0cb4f 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
@@ -918,6 +918,7 @@
if ((paths != null) && (paths.length > 0))
{
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_DELETE_SELECTED_ENTRIES_TITLE.get(), getInfo());
DeleteEntryTask newTask = new DeleteEntryTask(getInfo(), dlg, paths,
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
index a9baf5c..d6cb134 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
@@ -920,6 +920,7 @@
if (errors.isEmpty())
{
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_DELETE_INDEXES_TITLE.get(), getInfo());
DeleteIndexTask newTask = new DeleteIndexTask(getInfo(), dlg,
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
index 7acec30..ad88b1b 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
@@ -1401,6 +1401,7 @@
title = INFO_CTRL_PANEL_DELETE_OBJECTCLASSES_AND_ATTRIBUTES_TITLE.get();
}
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this), title, getInfo());
DeleteSchemaElementsTask newTask =
new DeleteSchemaElementsTask(getInfo(), dlg, orderedObjectClasses,
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
index 2f3abf3..75522d5 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -160,6 +160,7 @@
{
ArrayList<Message> errors = new ArrayList<Message>();
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_DELETE_ATTRIBUTE_TITLE.get(), getInfo());
ArrayList<ObjectClass> ocsToDelete = new ArrayList<ObjectClass>();
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
index 89028af..611c7ae 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
@@ -154,6 +154,7 @@
{
ArrayList<Message> errors = new ArrayList<Message>();
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_DELETE_OBJECTCLASS_TITLE.get(), getInfo());
ArrayList<ObjectClass> ocsToDelete = new ArrayList<ObjectClass>();
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
index ebc1f6c..a7641b6 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
@@ -109,6 +109,7 @@
{
final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this), getTitle(), getInfo());
Object[] backends = list.getSelectedValues();
ArrayList<BackendDescriptor> backendsToDelete =
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
index 63463a9..1b05951 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
@@ -375,6 +375,7 @@
{
final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this), getTitle(), getInfo());
Object[] dns = list.getSelectedValues();
ArrayList<BaseDNDescriptor> baseDNsToDelete =
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
index 1686e71..0dfc1bf 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
@@ -417,6 +417,7 @@
if (errors.isEmpty())
{
ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this), getTitle(), getInfo());
ExportTask newTask = new ExportTask(getInfo(), progressDialog);
for (Task task : getInfo().getTasks())
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
index 82ed462..25ebf7e 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
@@ -632,6 +632,7 @@
if (errors.isEmpty())
{
ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this), getTitle(), getInfo());
ImportTask newTask = new ImportTask(getInfo(), progressDialog);
for (Task task : getInfo().getTasks())
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java
index 11bef95..46129b9 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java
@@ -339,6 +339,7 @@
{
ArrayList<Message> errors = new ArrayList<Message>();
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_DELETE_INDEX_TITLE.get(), getInfo());
ArrayList<AbstractIndexDescriptor> indexesToDelete =
@@ -395,7 +396,8 @@
if (errors.isEmpty())
{
ProgressDialog dlg = new ProgressDialog(
- Utilities.getParentDialog(this),
+ Utilities.getFrame(this),
+ Utilities.getFrame(this),
INFO_CTRL_PANEL_MODIFYING_INDEX_TITLE.get(), getInfo());
dlg.setModal(modal);
newModifyTask = new ModifyIndexTask(getInfo(), dlg);
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
index aff2a3b..a3d07fe 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
@@ -976,9 +976,9 @@
{
ArrayList<Message> errors = new ArrayList<Message>();
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
- INFO_CTRL_PANEL_JAVA_PROPERTIES_TITLE.get(),
- getInfo());
+ INFO_CTRL_PANEL_JAVA_PROPERTIES_TITLE.get(), getInfo());
JavaPropertiesTask newTask = new JavaPropertiesTask(getInfo(), dlg);
for (Task task : getInfo().getTasks())
{
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
index 2b240e9..00ff0ca 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
@@ -555,7 +555,8 @@
try
{
ProgressDialog dlg = new ProgressDialog(
- Utilities.getParentDialog(this),
+ Utilities.getFrame(this),
+ Utilities.getFrame(this),
INFO_CTRL_PANEL_MODIFYING_ENTRY_CHANGES_TITLE.get(), getInfo());
dlg.setModal(modal);
Entry entry = displayedEntryPanel.getEntry();
@@ -617,8 +618,8 @@
Message title = isLeaf ? INFO_CTRL_PANEL_DELETING_ENTRY_TITLE.get() :
INFO_CTRL_PANEL_DELETING_SUBTREE_TITLE.get();
ProgressDialog dlg = new ProgressDialog(
- Utilities.getParentDialog(this),
- title, getInfo());
+ Utilities.createFrame(),
+ Utilities.getParentDialog(this), title, getInfo());
DeleteEntryTask newTask = new DeleteEntryTask(getInfo(), dlg,
new TreePath[]{treePath}, controller);
for (Task task : getInfo().getTasks())
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
index b1e223e..9ff75ba 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
@@ -568,6 +568,7 @@
{
ArrayList<Message> errors = new ArrayList<Message>();
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_CANCEL_TASK_TITLE.get(), getInfo());
List<TaskEntry> tasks = getSelectedTasks(true);
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
index 5a5b63b..c43a8cd 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -442,6 +442,7 @@
}
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_NEW_ATTRIBUTE_PANEL_TITLE.get(), getInfo());
NewAttributeTask newTask = null;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index d3a3c29..cc8781d 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -617,7 +617,8 @@
if (errors.isEmpty())
{
ProgressDialog progressDialog = new ProgressDialog(
- Utilities.getParentDialog(this), getTitle(), getInfo());
+ Utilities.createFrame(), Utilities.getParentDialog(this), getTitle(),
+ getInfo());
NewBaseDNTask newTask = new NewBaseDNTask(getInfo(), progressDialog);
for (Task task : getInfo().getTasks())
{
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
index 7a0749d..661702c 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
@@ -323,8 +323,9 @@
setPrimaryInvalid(lType);
}
ProgressDialog dlg = new ProgressDialog(
- Utilities.getParentDialog(this),
- INFO_CTRL_PANEL_NEW_INDEX_TITLE.get(), getInfo());
+ Utilities.createFrame(),
+ Utilities.getParentDialog(this), INFO_CTRL_PANEL_NEW_INDEX_TITLE.get(),
+ getInfo());
NewIndexTask newTask = new NewIndexTask(getInfo(), dlg);
for (Task task : getInfo().getTasks())
{
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
index 41cd46b..d791df3 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
@@ -329,6 +329,7 @@
}
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_NEW_OBJECTCLASS_PANEL_TITLE.get(), getInfo());
NewObjectClassTask newTask = null;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
index 86ff4bf..3f9dbf2 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
@@ -138,6 +138,7 @@
if (errors.isEmpty())
{
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_NEW_VLV_INDEX_TITLE.get(), getInfo());
NewVLVIndexTask newTask = new NewVLVIndexTask(getInfo(), dlg);
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java
index 419ab9d..bdb8bd7 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java
@@ -44,6 +44,7 @@
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JEditorPane;
+import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
import javax.swing.JScrollPane;
@@ -69,15 +70,17 @@
/**
* Constructor of the dialog.
- * @param parentDialog the parent dialog.
+ * @param parentFrame the parent frame.
+ * @param relativeTo the component to use as reference to set the position
+ * of this dialog.
* @param title the title of the dialog.
* @param info the control panel information.
*/
- public ProgressDialog(Component parentDialog, Message title,
- ControlPanelInfo info)
+ public ProgressDialog(JFrame parentFrame, Component relativeTo,
+ Message title, ControlPanelInfo info)
{
- super(Utilities.getFrame(parentDialog), getPanel(info));
- Utilities.centerGoldenMean(this, parentDialog);
+ super(parentFrame, getPanel(info));
+ Utilities.centerGoldenMean(this, relativeTo);
setTitle(title.toString());
progressPanel = (ProgressPanel)panel;
getRootPane().setDefaultButton(progressPanel.closeButton);
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
index 302a566..77ae9b9 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
@@ -340,7 +340,8 @@
if (errors.isEmpty())
{
ProgressDialog progressDialog = new ProgressDialog(
- Utilities.getParentDialog(this), getTitle(), getInfo());
+ Utilities.createFrame(), Utilities.getParentDialog(this), getTitle(),
+ getInfo());
HashSet<String> baseDNs = new HashSet<String>();
baseDNs.add(getSelectedBaseDN());
RebuildIndexTask newTask = new RebuildIndexTask(getInfo(), progressDialog,
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
index 13999d4..2e15e01 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2009 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -128,9 +128,9 @@
if (errors.size() == 0)
{
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
- INFO_CTRL_PANEL_RESET_USER_PASSWORD_TITLE.get(),
- getInfo());
+ INFO_CTRL_PANEL_RESET_USER_PASSWORD_TITLE.get(), getInfo());
ResetUserPasswordTask newTask =
new ResetUserPasswordTask(getInfo(), dlg, node, controller,
password.getPassword());
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java
index ff55574..151ec3f 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java
@@ -171,9 +171,9 @@
LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
// Launch the task in another progress dialog.
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
- INFO_CTRL_PANEL_VERIFY_BACKUP_TITLE.get(),
- getInfo());
+ INFO_CTRL_PANEL_VERIFY_BACKUP_TITLE.get(), getInfo());
RestoreTask newTask = new RestoreTask(getInfo(), dlg, true);
for (Task task : getInfo().getTasks())
{
@@ -301,7 +301,8 @@
if (errors.isEmpty())
{
ProgressDialog progressDialog = new ProgressDialog(
- Utilities.getParentDialog(this), getTitle(), getInfo());
+ Utilities.createFrame(), Utilities.getParentDialog(this), getTitle(),
+ getInfo());
RestoreTask newTask = new RestoreTask(getInfo(), progressDialog, false);
for (Task task : getInfo().getTasks())
{
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
index 12bf0d2..15dc214 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
@@ -1897,6 +1897,7 @@
{
LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_START_SERVER_PROGRESS_DLG_TITLE.get(), getInfo());
StartServerTask newTask = new StartServerTask(getInfo(), progressDialog);
@@ -1932,6 +1933,7 @@
{
LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_STOP_SERVER_PROGRESS_DLG_TITLE.get(), getInfo());
StopServerTask newTask = new StopServerTask(getInfo(), progressDialog);
@@ -1974,6 +1976,7 @@
{
LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
ProgressDialog progressDialog = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_RESTART_SERVER_PROGRESS_DLG_TITLE.get(), getInfo());
RestartServerTask newTask = new RestartServerTask(getInfo(),
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
index 0a49715..a03deab 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
@@ -398,6 +398,7 @@
{
ArrayList<Message> errors = new ArrayList<Message>();
ProgressDialog dlg = new ProgressDialog(
+ Utilities.createFrame(),
Utilities.getParentDialog(this),
INFO_CTRL_PANEL_DELETE_VLV_INDEX_TITLE.get(), getInfo());
ArrayList<AbstractIndexDescriptor> indexesToDelete =
@@ -448,7 +449,8 @@
if (errors.isEmpty())
{
ProgressDialog dlg = new ProgressDialog(
- Utilities.getParentDialog(this),
+ Utilities.getFrame(this),
+ Utilities.getFrame(this),
INFO_CTRL_PANEL_MODIFYING_INDEX_TITLE.get(), getInfo());
dlg.setModal(modal);
newModifyTask = new ModifyVLVIndexTask(getInfo(), dlg);
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
index 7e29d64..bde2bf6 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
@@ -412,7 +412,8 @@
if (errors.isEmpty())
{
ProgressDialog progressDialog = new ProgressDialog(
- Utilities.getParentDialog(this), getTitle(), getInfo());
+ Utilities.createFrame(), Utilities.getParentDialog(this), getTitle(),
+ getInfo());
VerifyIndexTask newTask = new VerifyIndexTask(getInfo(), progressDialog);
for (Task task : getInfo().getTasks())
{
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
index 57c655e..ce57861 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
@@ -242,7 +242,8 @@
{
LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
ProgressDialog progressDialog = new ProgressDialog(
- Utilities.getParentDialog(this), getTitle(), getInfo());
+ Utilities.createFrame(), Utilities.getParentDialog(this), getTitle(),
+ getInfo());
WindowsServiceTask newTask = new WindowsServiceTask(getInfo(),
progressDialog, !isWindowsServiceEnabled);
for (Task task : getInfo().getTasks())
--
Gitblit v1.10.0