From 80c58327faaa4873369f6bb949e62792c2f708e0 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java
index f11e1e1..d0200ee 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java
@@ -27,9 +27,12 @@
package org.opends.quicksetup.upgrader;
+import org.opends.messages.Message;
+import static org.opends.messages.QuickSetupMessages.*;
+
import org.opends.quicksetup.*;
import org.opends.quicksetup.event.ProgressUpdateListener;
-import org.opends.quicksetup.i18n.ResourceProvider;
+
import org.opends.quicksetup.util.Utils;
import org.opends.quicksetup.util.ZipExtractor;
import org.opends.quicksetup.util.FileManager;
@@ -69,7 +72,7 @@
QuickSetupLog.LOG_FILE_SUFFIX));
} catch (Throwable t) {
System.err.println(
- ResourceProvider.getInstance().getMsg("error-initializing-log"));
+ INFO_ERROR_INITIALIZING_LOG.get());
t.printStackTrace();
}
new BuildExtractor(args).launch();
@@ -111,7 +114,7 @@
if (!installation.isValid()) {
LOG.log(Level.INFO, "extraction produed an invalid OpenDS" +
"installation: " + installation.getInvalidityReason());
- String invalidMsg = getMsg("build-extractor-file-invalid",
+ Message invalidMsg = INFO_BUILD_EXTRACTOR_FILE_INVALID.get(
Utils.getPath(buildFile),
installation.getInvalidityReason());
error = new ApplicationException(
@@ -124,8 +127,8 @@
LOG.log(Level.INFO, "unexpected error extracting build", t);
String reason = t.getLocalizedMessage();
error = new ApplicationException(
- ApplicationReturnCode.ReturnCode.APPLICATION_ERROR, getMsg(
- "build-extractor-error", reason), t);
+ ApplicationReturnCode.ReturnCode.APPLICATION_ERROR,
+ INFO_BUILD_EXTRACTOR_ERROR.get(reason), t);
System.err.println(reason);
} finally {
finished = true;
@@ -141,7 +144,7 @@
fm.deleteRecursively(stageDir);
}
if (!stageDir.mkdirs()) {
- String msg = getMsg("error-failed-to-create-stage-directory",
+ Message msg = INFO_ERROR_FAILED_TO_CREATE_STAGE_DIRECTORY.get(
Utils.getPath(stageDir));
throw ApplicationException.createFileSystemException(msg, null);
}
@@ -227,8 +230,8 @@
/**
* {@inheritDoc}
*/
- public void notifyListeners(Integer ratio, String currentPhaseSummary,
- String newLogDetail) {
+ public void notifyListeners(Integer ratio, Message currentPhaseSummary,
+ Message newLogDetail) {
// ignored; no progress messages
}
--
Gitblit v1.10.0