From fb05f309c142d2e520925757e5031786caa8550f Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 03 Jun 2013 07:42:27 +0000
Subject: [PATCH] CR-1777-OPENDJ - Upgrade code cleanup - The upgrade context is now set in the CLI. - The upgrade context contains now the callback handler which simplify all the function (removed all calls to callbackhandler, functions just need the context at this point). - The context contains the CLI user selected options which simplify the code, removed the CheckCLIUserOption, the task have just to check the context for those parameters. - Removed the useless VerificationCallback.java - Added a TaskType in UpgradeTask.java. - Added function verifyTaskType in UpgradeTasks.java which verify user selected options are correct. - Modified tools.properties message numbers
---
opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/AbstractUpgradeTask.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/AbstractUpgradeTask.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/AbstractUpgradeTask.java
index 465b839..062477f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/AbstractUpgradeTask.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/AbstractUpgradeTask.java
@@ -26,8 +26,6 @@
*/
package org.opends.server.tools.upgrade;
-import javax.security.auth.callback.CallbackHandler;
-
import org.opends.server.tools.ClientException;
/**
@@ -47,7 +45,7 @@
* {@inheritDoc}
*/
@Override
- public void end(UpgradeContext context, CallbackHandler handler)
+ public void end(UpgradeContext context)
throws ClientException
{
// Nothing to do.
@@ -57,7 +55,7 @@
* {@inheritDoc}
*/
@Override
- public void interact(UpgradeContext context, CallbackHandler handler)
+ public void interact(UpgradeContext context)
throws ClientException
{
// Nothing to do.
@@ -67,7 +65,7 @@
* {@inheritDoc}
*/
@Override
- public void start(UpgradeContext context, CallbackHandler handler)
+ public void start(UpgradeContext context)
throws ClientException
{
// Nothing to do.
@@ -77,7 +75,7 @@
* {@inheritDoc}
*/
@Override
- public void verify(UpgradeContext context, CallbackHandler handler)
+ public void verify(UpgradeContext context)
throws ClientException
{
// Nothing to do.
--
Gitblit v1.10.0