From 9d0cd2315ad10d4afce13c8865bd2e16a68b2b71 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 04 Aug 2016 15:06:12 +0000
Subject: [PATCH] remove CustomSearchResult, replaced by SDK's Entry
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 4b5a030..7b87777 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
@@ -47,7 +47,6 @@
import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
import org.opends.guitools.controlpanel.datamodel.CannotRenameException;
import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
-import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
import org.opends.guitools.controlpanel.ui.ProgressDialog;
import org.opends.guitools.controlpanel.ui.StatusGenericPanel;
@@ -64,7 +63,7 @@
private Set<String> backendSet;
private boolean mustRename;
private boolean hasModifications;
- private CustomSearchResult oldEntry;
+ private org.forgerock.opendj.ldap.Entry oldEntry;
private DN oldDn;
private ArrayList<ModificationItem> modifications;
private ModificationItem passwordModification;
@@ -84,7 +83,7 @@
* want to modify.
*/
public ModifyEntryTask(ControlPanelInfo info, ProgressDialog dlg,
- Entry newEntry, CustomSearchResult oldEntry,
+ Entry newEntry, org.forgerock.opendj.ldap.Entry oldEntry,
BrowserController controller, TreePath path)
{
super(info, dlg);
@@ -323,9 +322,9 @@
* @throws NamingException if an error performing the modification occurs.
*/
private void modifyAndRename(ConnectionWrapper conn, final DN oldDN,
- CustomSearchResult originalEntry, final Entry newEntry,
- final ArrayList<ModificationItem> originalMods)
- throws CannotRenameException, NamingException
+ org.forgerock.opendj.ldap.Entry originalEntry,
+ final Entry newEntry, final ArrayList<ModificationItem> originalMods)
+ throws CannotRenameException, NamingException
{
RDN oldRDN = oldDN.rdn();
RDN newRDN = newEntry.getName().rdn();
@@ -450,7 +449,7 @@
return false;
}
- private boolean entryContainsRdnTypes(CustomSearchResult entry, RDN rdn)
+ private boolean entryContainsRdnTypes(org.forgerock.opendj.ldap.Entry entry, RDN rdn)
{
for (AVA ava : rdn)
{
@@ -471,7 +470,7 @@
* @return the modifications to apply between two entries.
*/
public static ArrayList<ModificationItem> getModifications(Entry newEntry,
- CustomSearchResult oldEntry, ControlPanelInfo info) {
+ org.forgerock.opendj.ldap.Entry oldEntry, ControlPanelInfo info) {
ArrayList<ModificationItem> modifications = new ArrayList<>();
Schema schema = info.getServerDescriptor().getSchema();
--
Gitblit v1.10.0