From 8534453de9fa37b94a9c74d06291a8113991f2b2 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 04 Aug 2016 13:25:14 +0000
Subject: [PATCH] Make CustomSearchResult closer to SDK's Entry

---
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
index 1aab352..e196685 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -96,7 +96,7 @@
     this.treePath = path;
 
     DN newDn = newEntry.getName();
-    oldDn = oldEntry.getDN();
+    oldDn = oldEntry.getName();
     for (BackendDescriptor backend : info.getServerDescriptor().getBackends())
     {
       for (BaseDNDescriptor baseDN : backend.getBaseDns())
@@ -153,7 +153,7 @@
   @Override
   public LocalizableMessage getTaskDescription()
   {
-    return INFO_CTRL_PANEL_MODIFY_ENTRY_TASK_DESCRIPTION.get(oldEntry.getDN());
+    return INFO_CTRL_PANEL_MODIFY_ENTRY_TASK_DESCRIPTION.get(oldEntry.getName());
   }
 
   @Override
@@ -223,12 +223,12 @@
                   useAdminCtx);
               getProgressDialog().appendProgressHtml(
                   Utilities.getProgressWithPoints(
-                      INFO_CTRL_PANEL_MODIFYING_ENTRY.get(oldEntry.getDN()),
+                      INFO_CTRL_PANEL_MODIFYING_ENTRY.get(oldEntry.getName()),
                       ColorAndFontConstants.progressFont));
             }
           });
 
-          conn.getLdapContext().modifyAttributes(Utilities.getJNDIName(oldEntry.getDN().toString()), mods);
+          conn.getLdapContext().modifyAttributes(Utilities.getJNDIName(oldEntry.getName().toString()), mods);
 
           SwingUtilities.invokeLater(new Runnable()
           {
@@ -514,7 +514,7 @@
        * modifications.
        */
       ByteString oldRdnValueDeleted = null;
-      RDN oldRDN = oldEntry.getDN().rdn();
+      RDN oldRDN = oldEntry.getName().rdn();
       for (AVA ava : oldRDN)
       {
         if (ava.getAttributeType().equals(attrDesc.getAttributeType()))

--
Gitblit v1.10.0