From be124cd7df8df56616279461f01ef8baea150056 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 15:36:01 +0000
Subject: [PATCH] Use Objects.equals() throughout
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java
index bbfb691..282557b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java
@@ -26,6 +26,7 @@
*/
package org.opends.guitools.controlpanel.datamodel;
+import java.util.Objects;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -95,18 +96,9 @@
if (o instanceof ObjectClassValue)
{
ObjectClassValue oc = (ObjectClassValue)o;
- return equal(structural, oc.getStructural())
+ return Objects.equals(structural, oc.getStructural())
&& auxiliary.equals(oc.getAuxiliary());
}
return false;
}
-
- private boolean equal(String s1, String s2)
- {
- if (s1 == null)
- {
- return s2 == null;
- }
- return s1.equals(s2);
- }
}
--
Gitblit v1.10.0