From 5fe8d27253bdca43734b850caaaff574ccc15066 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 13 May 2014 15:41:22 +0000
Subject: [PATCH] Follow up on r10720.
---
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java
index 793a122..bc2a2c7 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java
@@ -24,14 +24,13 @@
* Copyright 2006-2009 Sun Microsystems, Inc.
* Portions Copyright 2013-2014 ForgeRock AS.
*/
-
package org.opends.quicksetup.webstart;
-import org.forgerock.i18n.LocalizableMessage;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.jnlp.DownloadService;
@@ -39,14 +38,12 @@
import javax.jnlp.ServiceManager;
import javax.jnlp.UnavailableServiceException;
-
import org.opends.quicksetup.ApplicationException;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.ReturnCode;
import org.opends.quicksetup.util.Utils;
import org.opends.server.util.SetupUtils;
-import static org.opends.quicksetup.util.Utils.*;
import static org.opends.messages.QuickSetupMessages.*;
import static com.forgerock.opendj.util.OperatingSystem.isWindows;
import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
@@ -124,6 +121,7 @@
isFinished = false;
Thread t = new Thread(new Runnable()
{
+ @Override
public void run()
{
try
@@ -299,7 +297,7 @@
}
else
{
- ratio = (100 / urls.length);
+ ratio = 100 / urls.length;
}
ratios[i] = ratio;
totalRatios += ratio;
@@ -316,7 +314,7 @@
}
- for (int i = 0; i < urls.length && (getException() == null); i++)
+ for (int i = 0; i < urls.length && getException() == null; i++)
{
if (i == 0)
{
@@ -366,9 +364,8 @@
return ex;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void downloadFailed(URL url, String version)
{
ex =
@@ -377,9 +374,8 @@
INFO_DOWNLOADING_ERROR.get(url), null);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void progress(URL url, String version, long readSoFar, long total,
int overallPercent)
{
@@ -390,9 +386,8 @@
status = Status.DOWNLOADING;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void upgradingArchive(URL url, String version, int patchPercent,
int overallPercent)
{
@@ -400,9 +395,8 @@
status = Status.UPGRADING;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void validating(URL url, String version, long entry, long total,
int overallPercent)
{
--
Gitblit v1.10.0