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/SecureConnectionCliParser.java |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

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();
   }
 
 

--
Gitblit v1.10.0