From e003b4333d38d5a1254d020425fda6f62465e3d0 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 03 Mar 2014 15:41:37 +0000
Subject: [PATCH] Minor code cleanup, replaced EOL by com.forgerock.opendj.cli.Utils.LINE_SEPARATOR.
---
opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java | 8 ++++----
opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java | 24 ++++++++----------------
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java | 3 ++-
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java | 5 +++--
4 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
index 0d87259..e788d64 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
@@ -48,6 +48,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.ToolMessages.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
+import static com.forgerock.opendj.cli.Utils.LINE_SEPARATOR;
/**
* Class used to parse and populate the arguments of the Uninstaller.
@@ -379,7 +380,7 @@
"--"+noPromptArg.getLongIdentifier());
if (buf.length() > 0)
{
- buf.append(EOL);
+ buf.append(LINE_SEPARATOR);
}
buf.append(message);
}
@@ -402,7 +403,7 @@
removeArg.getLongIdentifier());
if (buf.length() > 0)
{
- buf.append(EOL);
+ buf.append(LINE_SEPARATOR);
}
buf.append(message);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
index 87654fe..cb7297f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
@@ -184,13 +184,13 @@
*/
private LinkedHashSet<Argument> argList = null;
- // the trust manager.
+ /** The trust manager. */
private ApplicationTrustManager trustManager;
private boolean configurationInitialized = false;
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // Defines if the CLI always use the SSL connection type.
+ /** Defines if the CLI always use the SSL connection type. */
private boolean alwaysSSL = false;
/**
@@ -297,7 +297,7 @@
if (clearArg.isPresent())
{
String bindPasswordValue = clearArg.getValue();
- if(bindPasswordValue != null && bindPasswordValue.equals("-"))
+ if(bindPasswordValue != null && "-".equals(bindPasswordValue))
{
// read the password from the stdin.
try
@@ -665,7 +665,7 @@
*/
public boolean useSSL()
{
- return (useSSLArg.isPresent() || alwaysSSL());
+ return useSSLArg.isPresent() || alwaysSSL();
}
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
index da39098..5d0d57e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
@@ -57,7 +57,12 @@
public abstract class SecureConnectionCliParser extends SubCommandArgumentParser
{
/**
- * The showUsage' global argument.
+ * Logger.
+ */
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+ /**
+ * The 'showUsage' global argument.
*/
protected BooleanArgument showUsageArg = null;
@@ -81,12 +86,6 @@
* look for properties file.
*/
protected BooleanArgument noPropertiesFileArg;
- private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
- /**
- * End Of Line.
- */
- public static String EOL = System.getProperty("line.separator");
/**
* Creates a new instance of this argument parser with no arguments.
@@ -154,7 +153,7 @@
if (clearArg.isPresent())
{
String bindPasswordValue = clearArg.getValue();
- if(bindPasswordValue != null && bindPasswordValue.equals("-"))
+ if(bindPasswordValue != null && "-".equals(bindPasswordValue))
{
// read the password from the stdin.
try
@@ -392,14 +391,7 @@
*/
public boolean isVerbose()
{
- if (verboseArg.isPresent())
- {
- return true;
- }
- else
- {
- return false ;
- }
+ return verboseArg.isPresent();
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
index 5e67774..452a916 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
@@ -32,6 +32,7 @@
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.canWrite;
import static org.opends.quicksetup.util.Utils.isDn;
+import static com.forgerock.opendj.cli.Utils.LINE_SEPARATOR;
import java.io.File;
import java.io.OutputStream;
@@ -2181,7 +2182,7 @@
{
if (buf.length() > 0)
{
- buf.append(EOL);
+ buf.append(LINE_SEPARATOR);
}
buf.append(message);
}
--
Gitblit v1.10.0