From 75fa1207356d3048f707fd0e15ca4a2f9fcaed5c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 03 Aug 2016 16:05:42 +0000
Subject: [PATCH] Code cleanup, added toStrings()
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
index e6fe548..b21242f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
@@ -14,12 +14,10 @@
* Copyright 2008-2011 Sun Microsystems, Inc.
* Portions Copyright 2011-2016 ForgeRock AS.
*/
-
package org.opends.guitools.controlpanel.datamodel;
import org.forgerock.opendj.ldap.DN;
-
/**
* This class is used to represent a Base DN / Replica and is aimed to be
* used by the classes in the BackendTableModel class.
@@ -37,12 +35,12 @@
DISABLED
}
+ private final DN baseDn;
+ private BackendDescriptor backend;
+ private Type type;
private int nEntries;
private int missingChanges;
- private BackendDescriptor backend;
private long ageOfOldestMissingChange;
- private Type type;
- private final DN baseDn;
private int replicaID = -1;
private int hashCode;
@@ -105,9 +103,9 @@
private boolean backendIdEqual(BaseDNDescriptor desc)
{
// Only compare the backend IDs. In this context is enough
- return getBackend() != null
- && desc.getBackend() != null
- && getBackend().getBackendID().equals(desc.getBackend().getBackendID());
+ final BackendDescriptor b1 = getBackend();
+ final BackendDescriptor b2 = desc.getBackend();
+ return b1 != null && b2 != null && b1.getBackendID().equals(b2.getBackendID());
}
@Override
@@ -218,7 +216,6 @@
return backend;
}
-
/**
* Sets the backend of this base DN.
* @param backend the backend for this base DN.
@@ -277,9 +274,9 @@
*/
private void recalculateHashCode()
{
- hashCode = (getType().toString() + getAgeOfOldestMissingChange() +
- getDn() +
- getBackend().getBackendID() + getMissingChanges()).hashCode();
+ String s = ""
+ + getType() + getAgeOfOldestMissingChange() + getDn() + getBackend().getBackendID() + getMissingChanges();
+ hashCode = s.hashCode();
}
private int compare(int i1, int i2)
@@ -313,4 +310,15 @@
return -1;
}
}
+
+ @Override
+ public String toString()
+ {
+ return getClass().getSimpleName()
+ + "(baseDN=" + baseDn
+ + ", nbEntries=" + nEntries
+ + ", missingChanges=" + missingChanges
+ + ", ageOfOldestMissingChange=" + ageOfOldestMissingChange
+ + ")";
+ }
}
--
Gitblit v1.10.0