From 69bcc5da5dafd4e5c4af9478f8db2de0fd5af413 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 06 May 2014 09:17:27 +0000
Subject: [PATCH] OPENDJ-1303 "opendj-cli" - Removed && replaced StaticUtils.filterExitCode by com.forgerock.opendj.cli.Utils.filterExitCode; - Removed SetupUtils.getDefaultJMXPort and replaced it by CliConstants.DEFAULT_JMX_PORT. - Removed && replaced Utilities.OBFUSCATED_VALUE by com.forgerock.opendj.cli.Utils.OBFUSCATED_VALUE; - Removed && replaced Utils.getThrowableMsg by com.forgerock.opendj.cli.Utils.getThrowableMsg;
---
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
index 9c0930a..8268efe 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
@@ -27,22 +27,26 @@
package org.opends.quicksetup.util;
-import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.QuickSetupMessages.*;
import static com.forgerock.opendj.util.OperatingSystem.isUnix;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
-import org.opends.quicksetup.ApplicationException;
-import org.opends.quicksetup.Application;
-import org.opends.quicksetup.ReturnCode;
-
-import java.io.*;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipEntry;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.opends.quicksetup.Application;
+import org.opends.quicksetup.ApplicationException;
+import org.opends.quicksetup.ReturnCode;
/**
* Class for extracting the contents of a zip file and managing
@@ -211,7 +215,7 @@
} catch (IOException ioe) {
LocalizableMessage errorMsg =
- Utils.getThrowableMsg(
+ getThrowableMsg(
INFO_ERROR_COPYING.get(entry.getName()), ioe);
throw new ApplicationException(
@@ -248,7 +252,7 @@
} catch (IOException ioe) {
LocalizableMessage errorMsg =
- Utils.getThrowableMsg(
+ getThrowableMsg(
INFO_ERROR_ZIP_STREAM.get(zipFileName), ioe);
throw new ApplicationException(
ReturnCode.FILE_SYSTEM_ACCESS_ERROR,
--
Gitblit v1.10.0