From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
index ebd9e5f..3a46777 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
@@ -128,8 +128,7 @@
public void setData(Set<BaseDNDescriptor> newData,
ServerDescriptor.ServerStatus status, boolean isAuthenticated)
{
- if (!newData.equals(data) || (serverStatus != status) ||
- (this.isAuthenticated != isAuthenticated))
+ if (!newData.equals(data) || serverStatus != status || this.isAuthenticated != isAuthenticated)
{
serverStatus = status;
this.isAuthenticated = isAuthenticated;
@@ -474,8 +473,9 @@
private int compareRepl(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
{
- return (String.valueOf(desc1.getType()).compareTo(
- String.valueOf(desc2.getType())));
+ String val1 = String.valueOf(desc1.getType());
+ String val2 = String.valueOf(desc2.getType());
+ return val1.compareTo(val2);
}
private int compareMissingChanges(BaseDNDescriptor desc1,
--
Gitblit v1.10.0