From ad74bf0a2cc09d0036a12793848b975e7b16eaa6 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Fri, 27 Jul 2007 15:26:22 +0000
Subject: [PATCH] modifications to fix issue #2022.
---
opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 35b7b81..a26e9d6 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -37,6 +37,7 @@
import java.util.logging.Logger;
import org.opends.quicksetup.ApplicationException;
+import org.opends.quicksetup.ApplicationReturnCode;
import org.opends.quicksetup.ProgressStep;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.webstart.JnlpProperties;
@@ -215,7 +216,7 @@
} catch (ApplicationException ex)
{
- if (ApplicationException.Type.CANCEL.equals(ex.getType())) {
+ if (ApplicationReturnCode.ReturnCode.CANCELLED.equals(ex.getType())) {
uninstall();
setCurrentProgressStep(InstallProgressStep.FINISHED_CANCELED);
notifyListeners(null);
@@ -254,7 +255,8 @@
updateSummaryWithServerState(hmSummary);
setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
ApplicationException ex = new ApplicationException(
- ApplicationException.Type.BUG, getThrowableMsg("bug-msg", t), t);
+ ApplicationReturnCode.ReturnCode.BUG,
+ getThrowableMsg("bug-msg", t), t);
String msg = getFormattedError(ex, true);
notifyListeners(msg);
LOG.log(Level.SEVERE, "Error installing.", t);
@@ -409,8 +411,9 @@
if (in == null)
{
- throw new ApplicationException(ApplicationException.Type.DOWNLOAD_ERROR,
- getMsg("error-zipinputstreamnull", new String[] {zipName}), null);
+ throw new ApplicationException(
+ ApplicationReturnCode.ReturnCode.DOWNLOAD_ERROR, getMsg(
+ "error-zipinputstreamnull", new String[] { zipName }), null);
}
notifyListeners(getFormattedDone());
@@ -433,7 +436,7 @@
if (!Utils.createDirectory(parent))
{
throw new ApplicationException(
- ApplicationException.Type.FILE_SYSTEM_ERROR,
+ ApplicationReturnCode.ReturnCode.FILE_SYSTEM_ACCESS_ERROR,
getMsg("error-could-not-create-parent-dir",
new String[] {parent}), null);
}
@@ -441,7 +444,7 @@
catch (IOException ioe)
{
throw new ApplicationException(
- ApplicationException.Type.FILE_SYSTEM_ERROR,
+ ApplicationReturnCode.ReturnCode.FILE_SYSTEM_ACCESS_ERROR,
getMsg("error-could-not-create-parent-dir", new String[] {parent}),
ioe);
}
--
Gitblit v1.10.0