From 672ab71e6a868a65f91df446da587481c8de64ea Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 08 Jan 2010 10:08:58 +0000
Subject: [PATCH] Fix for issue 4466 (provide installer log location in the progress screen) The user is notified of the existence of the log file at the beginning of the 'Details' area in the progress dialog. If an error occurs, the log file is also referenced: the user is asked to provide the log file if (s)he intends to report the error.
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
index 4523404..8c10df1 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2007-2009 Sun Microsystems, Inc.
+ * Copyright 2007-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.upgrader;
@@ -35,7 +35,6 @@
import org.opends.admin.ads.ADSContext;
import org.opends.messages.Message;
-import org.opends.messages.MessageBuilder;
import org.opends.quicksetup.ReturnCode;
import org.opends.quicksetup.WizardStep;
@@ -772,11 +771,15 @@
// for some reason
runError = null;
+ notifyListenersOfLog();
+ notifyListeners(getLineBreak());
+
try {
if (Utils.isWebStart()) {
ZipExtractor extractor;
setCurrentProgressStep(UpgradeProgressStep.DOWNLOADING);
+
try {
LOG.log(Level.INFO, "Waiting for Java Web Start jar download");
waitForLoader(UpgradeProgressStep.EXTRACTING.getProgress());
@@ -1392,12 +1395,9 @@
note);
notifyListeners(getFormattedDoneWithLineBreak());
LOG.log(Level.INFO, "history recorded");
- notifyListeners(
- new MessageBuilder().append(
- INFO_GENERAL_SEE_FOR_HISTORY.get(
- Utils.getPath(getInstallation().getHistoryLogFile())))
- .append(formatter.getLineBreak())
- .toMessage());
+ notifyListeners(getFormattedProgress(INFO_GENERAL_SEE_FOR_HISTORY.get(
+ Utils.getPath(getInstallation().getHistoryLogFile()))));
+ notifyListeners(formatter.getLineBreak());
try {
Stage stage = getStage();
@@ -1441,7 +1441,6 @@
if (abort) {
LOG.log(Level.INFO, "upgrade canceled by user");
if (!Utils.isCli()) {
- notifyListenersOfLog();
this.currentProgressStep = UpgradeProgressStep.FINISHED_CANCELED;
notifyListeners(null);
} else {
@@ -1451,7 +1450,7 @@
} else if (runError != null) {
LOG.log(Level.INFO, "upgrade completed with errors", runError);
if (!Utils.isCli()) {
- notifyListenersOfLog();
+ notifyListenersOfLogAfterError();
this.currentProgressStep = UpgradeProgressStep.FINISHED_WITH_ERRORS;
} else {
setCurrentProgressStep(UpgradeProgressStep.FINISHED_WITH_ERRORS);
@@ -1465,7 +1464,7 @@
// as errors. Warning markup is used surrounding the main message
// at the end of progress.
if (!Utils.isCli()) {
- notifyListenersOfLog();
+ notifyListenersOfLogAfterError();
this.currentProgressStep = UpgradeProgressStep.FINISHED_WITH_WARNINGS;
notifyListeners(getFormattedError(warningText, true));
} else {
@@ -1478,7 +1477,6 @@
} else {
LOG.log(Level.INFO, "upgrade completed successfully");
if (!Utils.isCli()) {
- notifyListenersOfLog();
this.currentProgressStep = UpgradeProgressStep.FINISHED;
notifyListeners(null);
} else {
--
Gitblit v1.10.0