From 49f6afda44400d2ceb9125482638141e4ee6f496 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 23 Oct 2007 21:16:19 +0000
Subject: [PATCH] Fix for issue 2505 (Provide monitoring information about the number of entries on a given base DN)

---
 opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/DatabasesTableModel.java |   22 ++++------------------
 1 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/DatabasesTableModel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/DatabasesTableModel.java
index c028965..35b5372 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/DatabasesTableModel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ui/DatabasesTableModel.java
@@ -413,8 +413,8 @@
 
   private int compareEntries(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
   {
-    int n1 = desc1.getDatabase().getEntries();
-    int n2 = desc2.getDatabase().getEntries();
+    int n1 = desc1.getEntries();
+    int n2 = desc2.getEntries();
     return compareIntegers(n1, n2);
   }
 
@@ -458,27 +458,13 @@
 
   /**
    * Returns the Object describing the number of entries of a given Base DN.
-   * The Object will be an Integer unless the database of the Base DN contains
-   * several Base DNs.  In this case we return a String.
+   * The Object will be an Integer.
    * @param rep the Base DN object to handle.
    * @return the Object describing the number of entries of a given Base DN.
    */
   private Object getValueForEntries(BaseDNDescriptor rep)
   {
-    Object v;
-    int nEntries = rep.getDatabase().getEntries();
-    if ((rep.getDatabase().getBaseDns().size() > 1) &&
-      (nEntries >= 0))
-    {
-      v = INFO_NUMBER_ENTRIES_MULTIPLE_SUFFIXES_IN_DB.get(
-              String.valueOf(nEntries),
-              rep.getDatabase().getBackendID());
-    }
-    else
-    {
-      v = new Integer(nEntries);
-    }
-    return v;
+    return rep.getEntries();
   }
 
   /**

--
Gitblit v1.10.0