From ca669ae54f86dbeea277280690584d9f591c7571 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 07:26:26 +0000
Subject: [PATCH] AutoRefactor: collapse if statements
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
index 1a391f6..a2a1df7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
@@ -130,30 +130,27 @@
*/
public boolean equals(Object o)
{
- boolean equals = o == this;
- if (!equals)
+ if (o == this)
{
- equals = o instanceof IndexDescriptor;
- if (equals)
- {
- IndexDescriptor index = (IndexDescriptor)o;
- equals = index.getName().equalsIgnoreCase(getName()) &&
- index.isDatabaseIndex() == isDatabaseIndex() &&
- index.getTypes().equals(getTypes()) &&
- index.getEntryLimit() == getEntryLimit();
-
- if (equals)
- {
- if ((getBackend() != null) && (index.getBackend() != null))
- {
- // Only compare the backend IDs. In this context is enough
- equals = getBackend().getBackendID().equals(
- index.getBackend().getBackendID());
- }
- }
- }
+ return true;
}
- return equals;
+ if (!(o instanceof IndexDescriptor))
+ {
+ return false;
+ }
+ IndexDescriptor index = (IndexDescriptor)o;
+ return index.getName().equalsIgnoreCase(getName())
+ && index.isDatabaseIndex() == isDatabaseIndex()
+ && index.getTypes().equals(getTypes())
+ && index.getEntryLimit() == getEntryLimit()
+ && backendIdEqual(index);
+ }
+
+ private boolean backendIdEqual(IndexDescriptor index)
+ {
+ return getBackend() != null
+ && index.getBackend() != null
+ && getBackend().getBackendID().equals(index.getBackend().getBackendID());
}
/**
--
Gitblit v1.10.0