From ceef7ba098240a8b10aee4f36d1653795652481c 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.

---
 opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java |   43 ++++++++++++++-----------------------------
 1 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java b/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
index 412ae0e..bb9cf9a 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -83,7 +83,7 @@
   public WebStartInstaller()
   {
     initLoader();
-    status = InstallProgressStep.NOT_STARTED;
+    setStatus(InstallProgressStep.NOT_STARTED);
   }
 
   /**
@@ -102,13 +102,13 @@
       System.setErr(err);
       System.setOut(out);
 
-      status = InstallProgressStep.DOWNLOADING;
+      setStatus(InstallProgressStep.DOWNLOADING);
 
       InputStream in =
           getZipInputStream(getRatio(InstallProgressStep.EXTRACTING));
       notifyListeners(getTaskSeparator());
 
-      status = InstallProgressStep.EXTRACTING;
+      setStatus(InstallProgressStep.EXTRACTING);
       createParentDirectoryIfRequired();
       extractZipFiles(in, getRatio(InstallProgressStep.EXTRACTING),
           getRatio(InstallProgressStep.CONFIGURING_SERVER));
@@ -116,56 +116,41 @@
 
       setInstallation(new Installation(getUserData().getServerLocation()));
 
-      status = InstallProgressStep.CONFIGURING_SERVER;
+      setStatus(InstallProgressStep.CONFIGURING_SERVER);
       configureServer();
 
-      switch (getUserData().getDataOptions().getType())
-      {
-      case CREATE_BASE_ENTRY:
-        status = InstallProgressStep.CREATING_BASE_ENTRY;
-        notifyListeners(getTaskSeparator());
-        createBaseEntry();
-        break;
-      case IMPORT_FROM_LDIF_FILE:
-        status = InstallProgressStep.IMPORTING_LDIF;
-        notifyListeners(getTaskSeparator());
-        importLDIF();
-        break;
-      case IMPORT_AUTOMATICALLY_GENERATED_DATA:
-        status = InstallProgressStep.IMPORTING_AUTOMATICALLY_GENERATED;
-        notifyListeners(getTaskSeparator());
-        importAutomaticallyGenerated();
-        break;
-      }
+      createData();
+
+      updateADS();
 
       writeJavaHome();
 
       if (Utils.isWindows())
       {
           notifyListeners(getTaskSeparator());
-          status = InstallProgressStep.ENABLING_WINDOWS_SERVICE;
+          setStatus(InstallProgressStep.ENABLING_WINDOWS_SERVICE);
           enableWindowsService();
       }
 
       if (getUserData().getStartServer())
       {
         notifyListeners(getTaskSeparator());
-        status = InstallProgressStep.STARTING_SERVER;
+        setStatus(InstallProgressStep.STARTING_SERVER);
         new ServerController(this).startServer();
       }
 
-      status = InstallProgressStep.FINISHED_SUCCESSFULLY;
+      setStatus(InstallProgressStep.FINISHED_SUCCESSFULLY);
       notifyListeners(null);
 
     } catch (QuickSetupException ex)
     {
-      status = InstallProgressStep.FINISHED_WITH_ERROR;
+      setStatus(InstallProgressStep.FINISHED_WITH_ERROR);
       String html = getFormattedError(ex, true);
       notifyListeners(html);
     }
     catch (Throwable t)
     {
-      status = InstallProgressStep.FINISHED_WITH_ERROR;
+      setStatus(InstallProgressStep.FINISHED_WITH_ERROR);
       QuickSetupException ex = new QuickSetupException(
           QuickSetupException.Type.BUG, getThrowableMsg("bug-msg", t), t);
       String msg = getFormattedError(ex, true);
@@ -233,7 +218,7 @@
     totalTime += hmTime.get(InstallProgressStep.CONFIGURING_SERVER);
     steps.add(InstallProgressStep.CONFIGURING_SERVER);
 
-    switch (getUserData().getDataOptions().getType())
+    switch (getUserData().getNewSuffixOptions().getType())
     {
     case CREATE_BASE_ENTRY:
       steps.add(InstallProgressStep.CREATING_BASE_ENTRY);
@@ -354,7 +339,7 @@
    */
   protected String getOpenDSClassPath()
   {
-    StringBuffer buf = new StringBuffer();
+    StringBuilder buf = new StringBuilder();
     String[] jars = getOpenDSJarPaths();
     for (int i = 0; i < jars.length; i++)
     {

--
Gitblit v1.10.0