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/ui/DuplicateEntryPanel.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
index cc575a0..917ece8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
@@ -43,9 +43,9 @@
import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.Entry;
import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.browser.BrowserController;
-import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.LDAPEntryReader;
@@ -71,7 +71,7 @@
private GenericDialog browseDlg;
private LDAPEntrySelectionPanel browsePanel;
- private CustomSearchResult entryToDuplicate;
+ private Entry entryToDuplicate;
private String rdnAttribute;
/** Default constructor. */
@@ -444,11 +444,10 @@
private void readEntry(final BasicNode node)
{
final long t1 = System.currentTimeMillis();
- BackgroundTask<CustomSearchResult> task =
- new BackgroundTask<CustomSearchResult>()
+ BackgroundTask<Entry> task = new BackgroundTask<Entry>()
{
@Override
- public CustomSearchResult processBackgroundTask() throws Throwable
+ public Entry processBackgroundTask() throws Throwable
{
ConnectionWrapper conn = controller.findConnectionForDisplayedEntry(node);
LDAPEntryReader reader = new LDAPEntryReader(node.getDN(), conn);
@@ -457,8 +456,7 @@
}
@Override
- public void backgroundTaskCompleted(CustomSearchResult sr,
- Throwable throwable)
+ public void backgroundTaskCompleted(Entry sr, Throwable throwable)
{
if (throwable != null)
{
--
Gitblit v1.10.0