From 6acb5680cc685afc071ca5bcc358d31690bb1786 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 13 Feb 2014 10:24:56 +0000
Subject: [PATCH] Code cleanups: - Factorized code - Fixed Sonar violations - Removed duplicated lines reported by Sonar - Applied refactorings suggested by AutoRefactor plugin 

---
 opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/RuntimeOptions.java |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/RuntimeOptions.java b/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/RuntimeOptions.java
index ad7b531..0fbd88d 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/RuntimeOptions.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/RuntimeOptions.java
@@ -109,29 +109,24 @@
      */
     @Override()
     public boolean equals(Object o) {
-        boolean equals = o == this;
-        if (!equals) {
-            equals = o instanceof RuntimeOptions;
-            if (equals) {
-                equals = initialMemory == ((RuntimeOptions) o).initialMemory;
-            }
-            if (equals) {
-                equals = maximumMemory == ((RuntimeOptions) o).maximumMemory;
-            }
-            if (equals) {
-                equals = additionalArguments.length == ((RuntimeOptions) o).additionalArguments.length;
-            }
-            if (equals) {
-                String[] args = ((RuntimeOptions) o).additionalArguments;
-                for (int i = 0; i < args.length; i++) {
-                    if (!args[i].equals(additionalArguments[i])) {
-                        equals = false;
-                        break;
-                    }
+        if (o == this) {
+            return true;
+        }
+        if (!(o instanceof RuntimeOptions)) {
+            return false;
+        }
+        final RuntimeOptions other = (RuntimeOptions) o;
+        if (initialMemory == other.initialMemory
+                && maximumMemory == other.maximumMemory
+                && additionalArguments.length == other.additionalArguments.length) {
+            final String[] args = other.additionalArguments;
+            for (int i = 0; i < args.length; i++) {
+                if (!args[i].equals(additionalArguments[i])) {
+                    return false;
                 }
             }
         }
-        return equals;
+        return true;
     }
 
     /**

--
Gitblit v1.10.0