From 310df200f78f7d98cc52e4ab97d8a5feb744fa52 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 28 Apr 2016 09:04:35 +0000
Subject: [PATCH] UCDetector and AutoRefactor code cleanup
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
index 0f7373b..9898cbe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
@@ -14,7 +14,6 @@
* Copyright 2009 Sun Microsystems, Inc.
* Portions Copyright 2014-2016 ForgeRock AS.
*/
-
package org.opends.guitools.controlpanel.task;
import static org.opends.messages.AdminToolMessages.*;
@@ -26,12 +25,13 @@
import java.util.Set;
import java.util.TreeSet;
+import javax.swing.JProgressBar;
import javax.swing.SwingUtilities;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
import org.opends.guitools.controlpanel.ui.ProgressDialog;
-import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.tools.ManageTasks;
import org.opends.server.tools.tasks.TaskEntry;
@@ -174,30 +174,27 @@
arguments.toArray(args);
- returnCode = ManageTasks.mainTaskInfo(args, System.in,
- outPrintStream, errorPrintStream, false);
+ returnCode = ManageTasks.mainTaskInfo(args, outPrintStream, errorPrintStream, false);
if (returnCode != 0)
{
break;
}
- else
+
+ numberCanceled++;
+ final int fNumberCanceled = numberCanceled;
+ SwingUtilities.invokeLater(new Runnable()
{
- numberCanceled ++;
- final int fNumberCanceled = numberCanceled;
- SwingUtilities.invokeLater(new Runnable()
+ @Override
+ public void run()
{
- @Override
- public void run()
+ JProgressBar progressBar = getProgressDialog().getProgressBar();
+ if (fNumberCanceled == 1)
{
- if (fNumberCanceled == 1)
- {
- getProgressDialog().getProgressBar().setIndeterminate(false);
- }
- getProgressDialog().getProgressBar().setValue(
- (fNumberCanceled * 100) / totalNumber);
+ progressBar.setIndeterminate(false);
}
- });
- }
+ progressBar.setValue((fNumberCanceled * 100) / totalNumber);
+ }
+ });
}
if (returnCode != 0)
{
--
Gitblit v1.10.0