From 80b9cccecf5e447317e277eba0b734f0af3ddecc Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 24 Mar 2015 14:23:00 +0000
Subject: [PATCH] JavaArguments.java: Rewrote equals(). Autorefactored javadocs.
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java | 53 ++++++++++++++---------------------------------------
1 files changed, 14 insertions(+), 39 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
index 65b4709..b64246a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
@@ -28,6 +28,7 @@
import java.awt.Font;
import java.util.ArrayList;
+import java.util.Arrays;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.quicksetup.ui.UIFactory;
@@ -38,7 +39,6 @@
/**
* A class used to describe the java arguments for a given command-line.
- *
*/
public class JavaArguments
{
@@ -109,48 +109,25 @@
this.additionalArguments = additionalArguments;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public boolean equals(Object o)
{
- boolean equals = o == this;
- if (!equals)
+ if (o == this)
{
- equals = o instanceof JavaArguments;
- if (equals)
- {
- equals = initialMemory == ((JavaArguments)o).initialMemory;
- }
- if (equals)
- {
- equals = maxMemory == ((JavaArguments)o).maxMemory;
- }
- if (equals)
- {
- equals = additionalArguments.length ==
- ((JavaArguments)o).additionalArguments.length;
- }
- if (equals)
- {
- String[] args = ((JavaArguments)o).additionalArguments;
- for (int i=0 ; i<args.length ; i++)
- {
- if (!args[i].equals(additionalArguments[i]))
- {
- equals = false;
- break;
- }
- }
- }
+ return true;
}
- return equals;
+ if (o instanceof JavaArguments)
+ {
+ final JavaArguments that = (JavaArguments) o;
+ return initialMemory == that.initialMemory
+ && maxMemory == that.maxMemory
+ && Arrays.equals(additionalArguments, that.additionalArguments);
+ }
+ return false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public int hashCode()
{
@@ -162,9 +139,7 @@
return hashCode;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public String toString()
{
--
Gitblit v1.10.0