From 73a7f0d0c650739c667dc965f6ed2cd34756bd1e Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 23 Aug 2013 13:25:33 +0000
Subject: [PATCH] Small cleanup of use of maps, lists and also few typos in comments, and constants in the QuickSetup. Side effect of renaming a constant, the ReplicationCliMain was touched, and I run more cleanup on it.
---
opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 c2f8109..ce9c528 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -34,6 +34,8 @@
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -80,11 +82,11 @@
*
*/
public class WebStartInstaller extends Installer {
- private final HashMap<InstallProgressStep, Integer> hmRatio =
- new HashMap<InstallProgressStep, Integer>();
+ private final Map<ProgressStep, Integer> hmRatio =
+ new HashMap<ProgressStep, Integer>();
- private final HashMap<InstallProgressStep, Message> hmSummary =
- new HashMap<InstallProgressStep, Message>();
+ private final Map<ProgressStep, Message> hmSummary =
+ new HashMap<ProgressStep, Message>();
private static final Logger LOG =
Logger.getLogger(WebStartInstaller.class.getName());
@@ -371,9 +373,9 @@
* extracting, the value for downloading will be the double of the value for
* extracting.
*/
- HashMap<InstallProgressStep, Integer> hmTime =
- new HashMap<InstallProgressStep, Integer>();
- hmTime.put(InstallProgressStep.DOWNLOADING, 15);
+ Map<ProgressStep, Integer> hmTime =
+ new HashMap<ProgressStep, Integer>();
+ hmTime.put(InstallProgressStep.DOWNLOADING, 30);
hmTime.put(InstallProgressStep.EXTRACTING, 15);
hmTime.put(InstallProgressStep.CONFIGURING_SERVER, 5);
hmTime.put(InstallProgressStep.CREATING_BASE_ENTRY, 10);
@@ -387,7 +389,7 @@
hmTime.put(InstallProgressStep.INITIALIZE_REPLICATED_SUFFIXES, 25);
int totalTime = 0;
- ArrayList<InstallProgressStep> steps =
+ List<InstallProgressStep> steps =
new ArrayList<InstallProgressStep>();
totalTime += hmTime.get(InstallProgressStep.DOWNLOADING);
steps.add(InstallProgressStep.DOWNLOADING);
@@ -521,7 +523,7 @@
/**
* This method extracts the zip file.
- * @param is the inputstream with the contents of the zip file.
+ * @param is the input stream with the contents of the zip file.
* @param minRatio the value of the ratio in the install that corresponds to
* the moment where we start extracting the zip files. Used to update
* properly the install progress ratio.
--
Gitblit v1.10.0