From 59ba268c8ed7ad58495f98af77a463e06f9f0f00 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 27 Apr 2007 14:51:31 +0000
Subject: [PATCH] Move some of the panels specific of the installer to the package org.opends.quicksetup.installer.ui.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CurrentStepPanel.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CurrentStepPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CurrentStepPanel.java
index c08efbf..189cdaa 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CurrentStepPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/CurrentStepPanel.java
@@ -120,7 +120,6 @@
*/
private void createLayout(GuiApplication app)
{
-
Set<? extends WizardStep> steps = app.getWizardSteps();
if (steps != null) {
for (WizardStep step : steps) {
@@ -194,21 +193,30 @@
{
final CardLayout cl = (CardLayout) (getLayout());
- // Show the 'loading...' panel and invoke begin
- // display in another thread in case the panel
- // taske a while to initialize.
- cl.show(this, LOADING_PANEL);
- new Thread(new Runnable() {
- public void run() {
- getPanel(step).beginDisplay(userData);
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- cl.show(CurrentStepPanel.this, step.toString());
- getPanel(step).endDisplay();
- }
- });
- }
- },"panel begin display thread").start();
+ if (getPanel(step).blockingBeginDisplay())
+ {
+ // Show the 'loading...' panel and invoke begin
+ // display in another thread in case the panel
+ // taske a while to initialize.
+ cl.show(this, LOADING_PANEL);
+ new Thread(new Runnable() {
+ public void run() {
+ getPanel(step).beginDisplay(userData);
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ cl.show(CurrentStepPanel.this, step.toString());
+ getPanel(step).endDisplay();
+ }
+ });
+ }
+ },"panel begin display thread").start();
+ }
+ else
+ {
+ getPanel(step).beginDisplay(userData);
+ cl.show(CurrentStepPanel.this, step.toString());
+ getPanel(step).endDisplay();
+ }
}
/**
--
Gitblit v1.10.0