From 7a5a2c76320f65537454574b208d12d3d3824528 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Wed, 01 Aug 2007 09:40:28 +0000
Subject: [PATCH] Use DsframeworkReturnCode enum in a more 'classical' way
---
opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java
index 55766c6..5e87f55 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java
@@ -177,7 +177,7 @@
String message = getMessage(msgID, ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
- return ReturnCode.CANNOT_INITIALIZE_ARGS.getReturnCode();
+ return CANNOT_INITIALIZE_ARGS.getReturnCode();
}
// Parse the command-line arguments provided to this program.
@@ -192,13 +192,13 @@
err.println(wrapText(message, MAX_LINE_WIDTH));
err.println(argParser.getUsage());
- return ReturnCode.ERROR_PARSING_ARGS.getReturnCode();
+ return ERROR_PARSING_ARGS.getReturnCode();
}
// If we should just display usage information, then print it and exit.
if (argParser.usageOrVersionDisplayed())
{
- return ReturnCode.SUCCESSFUL.getReturnCode();
+ return SUCCESSFUL.getReturnCode();
}
if (argParser.getSubCommand() == null)
@@ -209,19 +209,19 @@
err.println(wrapText(message, MAX_LINE_WIDTH));
err.println();
err.println(argParser.getHelpUsageReference());
- return ReturnCode.ERROR_PARSING_ARGS.getReturnCode();
+ return ERROR_PARSING_ARGS.getReturnCode();
}
// Validate args
int ret = argParser.validateGlobalOption(err);
- if (ret != ReturnCode.SUCCESSFUL_NOP.getReturnCode())
+ if (ret != SUCCESSFUL_NOP.getReturnCode())
{
return ret;
}
// Check if we need a connection
- ReturnCode returnCode = ReturnCode.SUCCESSFUL;
+ DsFrameworkCliReturnCode returnCode = SUCCESSFUL;
// Should we initialize the server in client mode?
@@ -238,12 +238,12 @@
catch (InitializationException e)
{
err.println(wrapText(e.getMessage(), MAX_LINE_WIDTH));
- return ReturnCode.ERROR_UNEXPECTED.getReturnCode();
+ return ERROR_UNEXPECTED.getReturnCode();
}
catch (IllegalStateException e)
{
err.println(wrapText(e.getMessage(), MAX_LINE_WIDTH));
- return ReturnCode.ERROR_UNEXPECTED.getReturnCode();
+ return ERROR_UNEXPECTED.getReturnCode();
}
}
@@ -260,7 +260,7 @@
.getError());
if (returnCode == null)
{
- returnCode = ReturnCode.ERROR_UNEXPECTED;
+ returnCode = ERROR_UNEXPECTED;
}
}
catch (ArgumentException ae)
@@ -269,14 +269,14 @@
String message = getMessage(msgID, ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
- return ReturnCode.CANNOT_INITIALIZE_ARGS.getReturnCode();
+ return CANNOT_INITIALIZE_ARGS.getReturnCode();
}
int msgID = returnCode.getMessageId();
String message = "" ;
- if ( (returnCode == ReturnCode.SUCCESSFUL)
+ if ( (returnCode == SUCCESSFUL)
||
- (returnCode == ReturnCode.SUCCESSFUL_NOP))
+ (returnCode == SUCCESSFUL_NOP))
{
if (argParser.isVerbose())
{
--
Gitblit v1.10.0