From 8a0c7b4a24af390782c917be4f68b45174972b19 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 24 Mar 2014 09:50:32 +0000
Subject: [PATCH] Checkpoint OPENDJ-1343 Migrate dsconfig - Code cleanup on the StatusCli and UnistallCliHelper as they are linked to the LDAPManagementContextFactory.java which is in the dsconfig package.
---
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java | 62 +++++++++---------------------
1 files changed, 19 insertions(+), 43 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
index 9d99e8e..8385a56 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -64,6 +64,8 @@
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.StaticUtils;
+import com.forgerock.opendj.cli.ClientException;
+
import static org.forgerock.util.Utils.*;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
@@ -600,30 +602,22 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
- public UserData createUserData(Launcher launcher)
- throws UserDataException, ApplicationException {
- parser = (UninstallerArgumentParser)launcher.getArgumentParser();
- return cliHelper.createUserData(
- parser,
- launcher.getArguments());
-
+ public UserData createUserData(Launcher launcher) throws UserDataException,
+ ApplicationException, ClientException
+ {
+ parser = (UninstallerArgumentParser) launcher.getArgumentParser();
+ return cliHelper.createUserData(parser, launcher.getArguments());
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getInstallationPath() {
return getInstallPathFromClasspath();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String getInstancePath() {
return getInstancePathFromInstallPath(getInstallPathFromClasspath());
@@ -641,9 +635,7 @@
return ue;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ReturnCode getReturnCode() {
return null;
@@ -1005,9 +997,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ProgressStep getCurrentProgressStep() {
return status;
@@ -1039,9 +1029,7 @@
return hmSummary.get(step);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isFinished() {
return getCurrentProgressStep() ==
@@ -1054,25 +1042,19 @@
UninstallProgressStep.FINISHED_WITH_ERROR_DELETING;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean isCancellable() {
return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void cancel() {
// do nothing; not cancellable
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public void windowClosing(QuickSetupDialog dlg, WindowEvent evt) {
if ((dlg.getDisplayedStep() == PROGRESS) ||
@@ -1085,17 +1067,13 @@
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public ButtonName getInitialFocusButtonName() {
return ButtonName.FINISH;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public Set<? extends WizardStep> getWizardSteps() {
Set<WizardStep> setSteps = new HashSet<WizardStep>();
@@ -1105,9 +1083,7 @@
return Collections.unmodifiableSet(setSteps);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public QuickSetupStepPanel createWizardStepPanel(WizardStep step) {
QuickSetupStepPanel p = null;
--
Gitblit v1.10.0